aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/app.rs58
-rw-r--r--src/bibiman.rs71
-rw-r--r--src/bibiman/bibisetup.rs2
-rw-r--r--src/cliargs.rs34
-rw-r--r--src/config.rs166
-rw-r--r--src/main.rs18
-rw-r--r--src/tui.rs6
-rw-r--r--src/tui/popup.rs18
-rw-r--r--src/tui/ui.rs321
9 files changed, 418 insertions, 276 deletions
diff --git a/src/app.rs b/src/app.rs
index 977cb6c..e41defc 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -16,6 +16,7 @@
/////
use crate::bibiman::{CurrentArea, FormerArea};
+use crate::config::BibiConfig;
use color_eyre::eyre::{Context, Ok, Result};
// use super::Event;
use crate::cliargs::CLIArgs;
@@ -23,7 +24,6 @@ use crate::tui::commands::InputCmdAction;
use crate::tui::popup::PopupKind;
use crate::tui::{self, Tui};
use crate::{bibiman::Bibiman, tui::commands::CmdAction};
-use core::panic;
use std::ffi::OsStr;
use std::path::PathBuf;
use std::process::{Command, Stdio};
@@ -46,11 +46,11 @@ pub struct App {
impl App {
// Constructs a new instance of [`App`].
- pub fn new(args: &CLIArgs) -> Result<Self> {
+ pub fn new(args: &mut CLIArgs, cfg: &mut BibiConfig) -> Result<Self> {
// Self::default()
let running = true;
let input = Input::default();
- let bibiman = Bibiman::new(args)?;
+ let bibiman = Bibiman::new(args, cfg)?;
Ok(Self {
running,
bibiman,
@@ -59,14 +59,14 @@ impl App {
})
}
- pub async fn run(&mut self, args: &mut CLIArgs) -> Result<()> {
+ pub async fn run(&mut self, cfg: &BibiConfig) -> Result<()> {
let mut tui = tui::Tui::new()?;
tui.enter()?;
// Start the main loop.
while self.running {
// Render the user interface.
- tui.draw(self, args)?;
+ tui.draw(self, cfg)?;
// Handle events.
match tui.next().await? {
Event::Tick => self.tick(),
@@ -85,10 +85,10 @@ impl App {
} else {
CmdAction::from(key_event)
};
- self.run_command(command, args, &mut tui)?
+ self.run_command(command, cfg, &mut tui)?
}
Event::Mouse(mouse_event) => {
- self.run_command(CmdAction::from(mouse_event), args, &mut tui)?
+ self.run_command(CmdAction::from(mouse_event), cfg, &mut tui)?
}
Event::Resize(_, _) => {}
@@ -110,7 +110,7 @@ impl App {
self.running = false;
}
- pub fn run_command(&mut self, cmd: CmdAction, args: &mut CLIArgs, tui: &mut Tui) -> Result<()> {
+ pub fn run_command(&mut self, cmd: CmdAction, cfg: &BibiConfig, tui: &mut Tui) -> Result<()> {
match cmd {
CmdAction::Input(cmd) => match cmd {
InputCmdAction::Nothing => {}
@@ -142,7 +142,7 @@ impl App {
|| doi.starts_with("http://doi.org")
|| doi.starts_with("http://dx.doi.org")
{
- self.bibiman.handle_new_entry_submission(args, doi);
+ self.bibiman.handle_new_entry_submission(doi);
} else {
self.bibiman.popup_area.popup_message(
"No valid DOI pattern: ",
@@ -268,10 +268,10 @@ impl App {
if let Some(PopupKind::Help) = self.bibiman.popup_area.popup_kind {
self.bibiman.close_popup();
} else if let Some(PopupKind::OpenRes) = self.bibiman.popup_area.popup_kind {
- self.bibiman.open_connected_res()?;
+ self.bibiman.open_connected_res(cfg)?;
} else if let Some(PopupKind::AppendToFile) = self.bibiman.popup_area.popup_kind
{
- self.bibiman.append_entry_to_file(args)?
+ self.bibiman.append_entry_to_file()?
}
}
}
@@ -303,7 +303,7 @@ impl App {
}
CmdAction::EditFile => {
if let CurrentArea::EntryArea = self.bibiman.current_area {
- self.bibiman.run_editor(args, tui)?;
+ self.bibiman.run_editor(cfg, tui)?;
}
}
CmdAction::Open => {
@@ -355,18 +355,9 @@ impl App {
}
}
-pub fn open_connected_file(file: &OsStr) -> Result<()> {
+pub fn open_connected_file(cfg: &BibiConfig, file: &OsStr) -> Result<()> {
// Build command to execute pdf-reader. 'xdg-open' is Linux standard
- // TODO: make custom opener command possible through config
- let cmd = {
- match std::env::consts::OS {
- "linux" => String::from("xdg-open"),
- "macos" => String::from("open"),
- "windows" => String::from("start"),
- _ => panic!("Couldn't detect OS for setting correct opener"),
- }
- };
-
+ let cmd = &cfg.general.pdf_opener;
// If necessary, replace ~ with /home dir
let file = PathBuf::from(file);
@@ -374,7 +365,7 @@ pub fn open_connected_file(file: &OsStr) -> Result<()> {
// Pass filepath as argument, pipe stdout and stderr to /dev/null
// to keep the TUI clean (where is it piped on Windows???)
- let _ = Command::new(&cmd)
+ let _ = Command::new(cmd)
.arg(file)
.stdout(Stdio::null())
.stderr(Stdio::null())
@@ -384,21 +375,12 @@ pub fn open_connected_file(file: &OsStr) -> Result<()> {
Ok(())
}
-pub fn open_connected_link(link: &str) -> Result<()> {
+pub fn open_connected_link(cfg: &BibiConfig, link: &str) -> Result<()> {
// Build command to execute pdf-reader. 'xdg-open' is Linux standard
- // TODO: make custom opener command possible through config
- let cmd = {
- match std::env::consts::OS {
- "linux" => String::from("xdg-open"),
- "macos" => String::from("open"),
- "windows" => String::from("start"),
- _ => panic!("Couldn't detect OS for setting correct opener"),
- }
- };
-
+ let cmd = &cfg.general.url_opener;
// Pass filepath as argument, pipe stdout and stderr to /dev/null
// to keep the TUI clean (where is it piped on Windows???)
- let _ = Command::new(&cmd)
+ let _ = Command::new(cmd)
.arg(link)
.stdout(Stdio::null())
.stderr(Stdio::null())
@@ -418,8 +400,8 @@ pub fn prepare_weblink(url: &str) -> String {
}
}
-fn expand_home(path: &PathBuf) -> PathBuf {
- // let path = PathBuf::from(path);
+/// Expand leading tilde (`~`) to `/home/user`
+pub fn expand_home(path: &PathBuf) -> PathBuf {
if path.starts_with("~") {
let mut home = dirs::home_dir().unwrap();
let path = path.strip_prefix("~").unwrap();
diff --git a/src/bibiman.rs b/src/bibiman.rs
index 71288ce..e36d268 100644
--- a/src/bibiman.rs
+++ b/src/bibiman.rs
@@ -15,12 +15,13 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.
/////
-use crate::app;
use crate::bibiman::entries::EntryTableColumn;
use crate::bibiman::{bibisetup::*, search::BibiSearch};
use crate::cliargs::CLIArgs;
+use crate::config::BibiConfig;
use crate::tui::popup::{PopupArea, PopupKind};
use crate::tui::Tui;
+use crate::{app, cliargs};
use crate::{bibiman::entries::EntryTable, bibiman::keywords::TagList};
use arboard::Clipboard;
use color_eyre::eyre::Result;
@@ -61,7 +62,7 @@ pub enum FormerArea {
#[derive(Debug)]
pub struct Bibiman {
// main bib file
- // pub main_bibfiles: Vec<PathBuf>,
+ pub main_bibfiles: Vec<PathBuf>,
// main bibliography
pub main_biblio: BibiSetup,
// search struct:
@@ -82,15 +83,19 @@ pub struct Bibiman {
impl Bibiman {
// Constructs a new instance of [`App`].
- pub fn new(args: &CLIArgs) -> Result<Self> {
- // let main_bibfiles = args.fileargs.clone();
- let main_biblio = BibiSetup::new(&args.files);
+ pub fn new(args: &mut CLIArgs, cfg: &mut BibiConfig) -> Result<Self> {
+ let mut main_bibfiles: Vec<PathBuf> = args.pos_args.clone();
+ if cfg.general.bibfiles.is_some() {
+ main_bibfiles.append(cfg.general.bibfiles.as_mut().unwrap())
+ };
+ let main_bibfiles = cliargs::parse_files(main_bibfiles);
+ let main_biblio = BibiSetup::new(&main_bibfiles);
let tag_list = TagList::new(main_biblio.keyword_list.clone());
let search_struct = BibiSearch::default();
let entry_table = EntryTable::new(main_biblio.entry_list.clone());
let current_area = CurrentArea::EntryArea;
Ok(Self {
- // main_bibfiles,
+ main_bibfiles,
main_biblio,
tag_list,
search_struct,
@@ -128,8 +133,8 @@ impl Bibiman {
self.former_area = None;
}
- pub fn update_lists(&mut self, args: &CLIArgs) {
- self.main_biblio = BibiSetup::new(&args.files);
+ pub fn update_lists(&mut self) {
+ self.main_biblio = BibiSetup::new(&self.main_bibfiles);
self.tag_list = TagList::new(self.main_biblio.keyword_list.clone());
self.entry_table = EntryTable::new(self.main_biblio.entry_list.clone());
}
@@ -325,7 +330,7 @@ impl Bibiman {
self.entry_table.entry_table_state.select(Some(idx_count));
}
- pub fn run_editor(&mut self, args: &CLIArgs, tui: &mut Tui) -> Result<()> {
+ pub fn run_editor(&mut self, cfg: &BibiConfig, tui: &mut Tui) -> Result<()> {
// get filecontent and citekey for calculating line number
let citekey: &str = &self.entry_table.entry_table_items
[self.entry_table.entry_table_state.selected().unwrap()]
@@ -338,17 +343,17 @@ impl Bibiman {
// Check if multiple files were passed to bibiman and
// return the correct file path
- let filepath = if args.files.len() == 1 {
- args.files.first().unwrap().as_os_str()
+ let filepath = if self.main_bibfiles.len() == 1 {
+ self.main_bibfiles.first().unwrap().as_os_str()
} else {
let mut idx = 0;
- for f in &args.files {
+ for f in &self.main_bibfiles {
if search::search_pattern_in_file(&citekey_pattern, &f).is_some() {
break;
}
idx += 1;
}
- args.files[idx].as_os_str()
+ self.main_bibfiles[idx].as_os_str()
};
let filecontent = fs::read_to_string(&filepath).unwrap();
@@ -376,6 +381,7 @@ impl Bibiman {
tui.exit()?;
// Use VISUAL or EDITOR. Set "vi" as last fallback
let mut cmd: Command = EditorBuilder::new()
+ .source(cfg.general.editor.as_ref())
.environment()
.source(Some("vi"))
.build()
@@ -391,7 +397,7 @@ impl Bibiman {
tui.terminal.clear()?;
// Update the database and the lists to show changes
- Self::update_lists(self, args);
+ Self::update_lists(self);
// Select entry which was selected before entering editor
self.select_entry_by_citekey(citekey);
@@ -412,7 +418,7 @@ impl Bibiman {
///the new entry via `append_to_file()` function. If not, show error popup
///
///The method needs two arguments: the CLIArgs struct and the `str` containing the DOI
- pub fn handle_new_entry_submission(&mut self, args: &CLIArgs, doi_string: &str) {
+ pub fn handle_new_entry_submission(&mut self, doi_string: &str) {
let doi_string = if doi_string.starts_with("10.") {
"https://doi.org/".to_string() + doi_string
} else {
@@ -431,7 +437,7 @@ impl Bibiman {
.expect("Couldn't parse fetched entry into string");
self.popup_area.popup_sel_item = entry;
self.popup_area.popup_kind = Some(PopupKind::AppendToFile);
- self.append_to_file(args);
+ self.append_to_file();
self.former_area = Some(FormerArea::EntryArea);
self.current_area = CurrentArea::PopupArea;
self.popup_area.popup_state.select(Some(0))
@@ -441,19 +447,26 @@ impl Bibiman {
}
}
- pub fn append_to_file(&mut self, args: &CLIArgs) {
+ pub fn append_to_file(&mut self) {
let mut items = vec!["Create new file".to_owned()];
- if args.files.len() > 1 {
- for f in args.files.clone() {
+ if self.main_bibfiles.len() > 1 {
+ for f in self.main_bibfiles.clone() {
items.push(f.to_str().unwrap().to_owned());
}
} else {
- items.push(args.files.first().unwrap().to_str().unwrap().to_owned());
+ items.push(
+ self.main_bibfiles
+ .first()
+ .unwrap()
+ .to_str()
+ .unwrap()
+ .to_owned(),
+ );
}
self.popup_area.popup_selection(items);
}
- pub fn append_entry_to_file(&mut self, args: &mut CLIArgs) -> Result<()> {
+ pub fn append_entry_to_file(&mut self) -> Result<()> {
// Index of selected popup field
let popup_idx = self.popup_area.popup_state.selected().unwrap();
@@ -472,8 +485,8 @@ impl Bibiman {
let mut file = if self.popup_area.popup_list[popup_idx].contains("Create new file") {
let citekey = PathBuf::from(&citekey);
// Get path of current files
- let path: PathBuf = if args.files[0].is_file() {
- args.files[0].parent().unwrap().to_owned()
+ let path: PathBuf = if self.main_bibfiles[0].is_file() {
+ self.main_bibfiles[0].parent().unwrap().to_owned()
} else {
dirs::home_dir().unwrap() // home dir as fallback
};
@@ -482,11 +495,11 @@ impl Bibiman {
let newfile = path.join(citekey);
- args.files.push(newfile.clone());
+ self.main_bibfiles.push(newfile.clone());
File::create_new(newfile).unwrap()
} else {
- let file_path = &args.files[popup_idx - 1];
+ let file_path = &self.main_bibfiles[popup_idx - 1];
// Check if similar citekey already exists
let file_string = read_to_string(&file_path).unwrap();
@@ -522,7 +535,7 @@ impl Bibiman {
// Write content to file
file.write_all(self.popup_area.popup_sel_item.as_bytes())?;
// Update the database and the lists to reflect the new content
- self.update_lists(args);
+ self.update_lists();
self.close_popup();
// Select newly created entry
@@ -531,7 +544,7 @@ impl Bibiman {
Ok(())
}
- pub fn open_connected_res(&mut self) -> Result<()> {
+ pub fn open_connected_res(&mut self, cfg: &BibiConfig) -> Result<()> {
// Index of selected entry
let entry_idx = self.entry_table.entry_table_state.selected().unwrap();
@@ -542,10 +555,10 @@ impl Bibiman {
if self.popup_area.popup_list[popup_idx].contains("Weblink") {
let object = self.entry_table.entry_table_items[entry_idx].doi_url();
let url = app::prepare_weblink(object);
- app::open_connected_link(&url)?;
+ app::open_connected_link(cfg, &url)?;
} else if self.popup_area.popup_list[popup_idx].contains("File") {
let object = self.entry_table.entry_table_items[entry_idx].filepath();
- app::open_connected_file(object)?;
+ app::open_connected_file(cfg, object)?;
} else {
eprintln!("Unable to find ressource to open");
};
diff --git a/src/bibiman/bibisetup.rs b/src/bibiman/bibisetup.rs
index 21b3c4b..3f64d9c 100644
--- a/src/bibiman/bibisetup.rs
+++ b/src/bibiman/bibisetup.rs
@@ -144,7 +144,7 @@ impl BibiSetup {
if main_bibfiles.is_empty() {
println!(
"{}",
- "No bibfile passed as argument. Please select a valid file."
+ "No bibfile passed as argument or through config file. Please select a valid file."
.red()
.bold()
);
diff --git a/src/cliargs.rs b/src/cliargs.rs
index 71ba38c..3c302f4 100644
--- a/src/cliargs.rs
+++ b/src/cliargs.rs
@@ -17,12 +17,13 @@
use color_eyre::eyre::Result;
use color_eyre::owo_colors::OwoColorize;
+use dirs::{config_dir, home_dir};
use lexopt::prelude::*;
use std::env;
use std::path::PathBuf;
use walkdir::WalkDir;
-use crate::tui::colors::AppColors;
+use crate::app;
// struct for CLIArgs
#[derive(Debug, Default, Clone)]
@@ -30,10 +31,8 @@ pub struct CLIArgs {
pub helparg: bool,
pub versionarg: bool,
pub pos_args: Vec<PathBuf>,
- pub files: Vec<PathBuf>,
- // INFO: AppColors struct later should be moved to config/app struct
- // when config file is implemented
- pub colors: AppColors,
+ pub cfg_path: PathBuf,
+ pub light_theme: bool,
}
impl CLIArgs {
@@ -41,22 +40,25 @@ impl CLIArgs {
let mut args = CLIArgs::default();
let mut parser = lexopt::Parser::from_env();
+ // Default config
+ args.cfg_path = if config_dir().is_some() {
+ config_dir().unwrap().join("bibiman/bibiman.toml")
+ } else {
+ home_dir().unwrap().join(".config/bibiman/bibiman.toml")
+ };
+
while let Some(arg) = parser.next()? {
match arg {
Short('h') | Long("help") => args.helparg = true,
Short('v') | Long("version") => args.versionarg = true,
- Long("light-terminal") => {
- args.colors.light_colors();
- args.colors.toggle_color_scheme()
- }
+ Short('c') | Long("config-file") => args.cfg_path = parser.value()?.parse()?,
+ Long("light-terminal") => args.light_theme = true,
// Value(pos_arg) => parse_files(&mut args, pos_arg),
Value(pos_arg) => args.pos_args.push(pos_arg.into()),
_ => return Err(arg.unexpected()),
}
}
- args.files = parse_files(args.pos_args.clone());
-
Ok(args)
}
}
@@ -64,10 +66,16 @@ impl CLIArgs {
/// This function maps a vector containing paths to another vector containing paths.
/// But it will walk all entries of the first vec which are directories
/// and put only valid file paths with `.bib` ending to the resulting vec.
-fn parse_files(args: Vec<PathBuf>) -> Vec<PathBuf> {
+pub fn parse_files(args: Vec<PathBuf>) -> Vec<PathBuf> {
let mut files: Vec<PathBuf> = Vec::new();
// If pos arg is file, just push it to path vec
for i in args {
+ // Expand tilde to /home/user
+ let i = if i.starts_with("~") {
+ app::expand_home(&i)
+ } else {
+ i
+ };
if i.is_file() {
files.push(i);
// If pos arg is dir, walk dir and collect bibfiles
@@ -114,6 +122,8 @@ POSITIONAL ARGS:
FLAGS:
-h, --help Show this help and exit
-v, --version Show the version and exit
+ -c, --config-file Path to config file used for current session.
+ Takes precedence over standard config file.
--light-terminal Enable color mode for light terminal background",
env!("CARGO_PKG_NAME"),
env!("CARGO_PKG_VERSION"),
diff --git a/src/config.rs b/src/config.rs
new file mode 100644
index 0000000..956b724
--- /dev/null
+++ b/src/config.rs
@@ -0,0 +1,166 @@
+// bibiman - a TUI for managing BibLaTeX databases
+// Copyright (C) 2024 lukeflo
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+/////
+
+use std::path::PathBuf;
+
+use color_eyre::eyre::Result;
+use figment::{
+ providers::{Format, Serialized, Toml},
+ Figment,
+};
+use ratatui::style::Color;
+use serde::{Deserialize, Serialize};
+
+use crate::cliargs::CLIArgs;
+
+/// Main struct of the config file. Contains substructs/headings in toml
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub struct BibiConfig {
+ pub general: General,
+ pub colors: Colors,
+}
+
+/// Substruct [general] in config.toml
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
+pub struct General {
+ pub bibfiles: Option<Vec<PathBuf>>,
+ pub editor: Option<String>,
+ pub pdf_opener: String,
+ pub url_opener: String,
+}
+
+/// Substruct [colors] in config.toml
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
+pub struct Colors {
+ pub main_text_color: Color,
+ pub highlight_text_color: Color,
+ pub entry_color: Color,
+ pub keyword_color: Color,
+ pub info_color: Color,
+ pub confirm_color: Color,
+ pub warn_color: Color,
+ pub bar_bg_color: Color,
+ pub popup_bg_color: Color,
+ pub selected_row_bg_color: Color,
+}
+
+impl Default for BibiConfig {
+ fn default() -> Self {
+ Self {
+ general: General {
+ bibfiles: None,
+ editor: None,
+ pdf_opener: select_opener(),
+ url_opener: select_opener(),
+ },
+ colors: Colors {
+ main_text_color: Color::Indexed(250),
+ highlight_text_color: Color::Indexed(254),
+ entry_color: Color::Indexed(36),
+ keyword_color: Color::Indexed(101),
+ info_color: Color::Indexed(99),
+ confirm_color: Color::Indexed(47),
+ warn_color: Color::Indexed(124),
+ bar_bg_color: Color::Indexed(235),
+ popup_bg_color: Color::Indexed(234),
+ selected_row_bg_color: Color::Indexed(237),
+ },
+ }
+ }
+}
+
+impl BibiConfig {
+ pub fn parse_config(args: &CLIArgs) -> Result<BibiConfig> {
+ let cfg_file: BibiConfig = if args.cfg_path.is_file() {
+ Figment::from(Serialized::defaults(BibiConfig::default()))
+ .merge(Toml::file(&args.cfg_path))
+ .extract()?
+ } else {
+ BibiConfig::default()
+ };
+
+ Ok(cfg_file)
+ }
+
+ /// Activates the default color scheme for light background terminals
+ pub fn light_colors(&mut self) {
+ self.colors.main_text_color = Color::Indexed(235);
+ self.colors.highlight_text_color = Color::Indexed(232);
+ self.colors.entry_color = Color::Indexed(23);
+ self.colors.keyword_color = Color::Indexed(58);
+ self.colors.info_color = Color::Indexed(57);
+ self.colors.bar_bg_color = Color::Indexed(144);
+ self.colors.popup_bg_color = Color::Indexed(187);
+ self.colors.confirm_color = Color::Indexed(22);
+ self.colors.selected_row_bg_color = Color::Indexed(107);
+ }
+}
+
+fn select_opener() -> String {
+ match std::env::consts::OS {
+ "linux" => String::from("xdg-open"),
+ "macos" => String::from("open"),
+ "windows" => String::from("start"),
+ _ => panic!("Couldn't detect OS for setting correct opener"),
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use figment::{
+ providers::{Format, Toml},
+ Figment,
+ };
+
+ use super::BibiConfig;
+
+ #[test]
+ fn parse_default_config() {
+ figment::Jail::expect_with(|jail| {
+ jail.create_file(
+ "bibiman.toml",
+ r#"
+ [general]
+ pdf_opener = "xdg-open"
+ url_opener = "xdg-open"
+
+ [colors]
+ main_text_color = "250"
+ highlight_text_color = "254"
+ entry_color = "36"
+ keyword_color = "101"
+ info_color = "99"
+ confirm_color = "47"
+ warn_color = "124"
+ bar_bg_color = "235"
+ popup_bg_color = "234"
+ selected_row_bg_color = "237"
+ "#,
+ )?;
+
+ let config: BibiConfig = Figment::new().merge(Toml::file("bibiman.toml")).extract()?;
+
+ let default_config: BibiConfig = BibiConfig::default();
+
+ assert_eq!(config, default_config);
+ assert_eq!(config.general.bibfiles, None);
+ assert_eq!(config.general.editor, None);
+
+ Ok(())
+ });
+ }
+}
diff --git a/src/main.rs b/src/main.rs
index 78c5075..302ba7a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,18 +18,20 @@
use app::App;
use cliargs::CLIArgs;
use color_eyre::eyre::Result;
+use config::BibiConfig;
use errorsetup::init_error_hooks;
pub mod app;
pub mod bibiman;
pub mod cliargs;
+pub mod config;
pub mod errorsetup;
pub mod tui;
#[tokio::main]
async fn main() -> Result<()> {
// Parse CLI arguments
- let mut parsed_args = CLIArgs::parse_args().unwrap();
+ let mut parsed_args = CLIArgs::parse_args()?;
// Print help if -h/--help flag is passed and exit
if parsed_args.helparg {
@@ -43,11 +45,21 @@ async fn main() -> Result<()> {
std::process::exit(0);
}
+ // Build default config
+ // let mut cfg = BibiConfig::default();
+
+ // if parsed_args.light_theme {
+ // cfg.light_colors();
+ // }
+ // // Merge values from config file if present
+ // cfg.parse_config(&parsed_args)?;
+
+ let mut cfg = BibiConfig::parse_config(&parsed_args)?;
init_error_hooks()?;
// Create an application.
- let mut app = App::new(&parsed_args)?;
+ let mut app = App::new(&mut parsed_args, &mut cfg)?;
- app.run(&mut parsed_args).await?;
+ app.run(&cfg).await?;
Ok(())
}
diff --git a/src/tui.rs b/src/tui.rs
index b39b5c4..1e3061f 100644
--- a/src/tui.rs
+++ b/src/tui.rs
@@ -20,7 +20,7 @@ pub mod commands;
pub mod popup;
pub mod ui;
-use crate::{cliargs::CLIArgs, App};
+use crate::{config::BibiConfig, App};
use crossterm::{
cursor,
event::{
@@ -195,11 +195,11 @@ impl Tui {
//
// [`Draw`]: ratatui::Terminal::draw
// [`rendering`]: crate::ui::render
- pub fn draw(&mut self, app: &mut App, args: &CLIArgs) -> Result<()> {
+ pub fn draw(&mut self, app: &mut App, cfg: &BibiConfig) -> Result<()> {
// self.terminal.draw(|frame| ui::render(app, frame))?;
self.terminal
// .draw(|frame| frame.render_widget(app, frame.area()))?;
- .draw(|frame| ui::render_ui(app, args, frame))?;
+ .draw(|frame| ui::render_ui(app, cfg, frame))?;
Ok(())
}
diff --git a/src/tui/popup.rs b/src/tui/popup.rs
index 4ef9fc3..f226429 100644
--- a/src/tui/popup.rs
+++ b/src/tui/popup.rs
@@ -16,12 +16,12 @@
/////
use ratatui::{
- style::{Color, Stylize},
+ style::Stylize,
text::{Line, Span, Text},
widgets::ListState,
};
-use crate::cliargs::CLIArgs;
+use crate::config::BibiConfig;
#[derive(Debug)]
pub enum PopupKind {
@@ -47,7 +47,7 @@ pub struct PopupArea {
}
impl PopupArea {
- pub fn popup_help<'a>(args: &CLIArgs) -> Text<'a> {
+ pub fn popup_help<'a>(cfg: &BibiConfig) -> Text<'a> {
let help = [
("General", "first"),
("TAB: ", "Toggle areas (Entries, Keywords)"),
@@ -89,22 +89,16 @@ impl PopupArea {
for (keys, help) in help {
if help == "first" {
helptext.push(Line::from(
- Span::raw(keys)
- .bold()
- .fg(Color::Indexed(args.colors.main_text_color)),
+ Span::raw(keys).bold().fg(cfg.colors.main_text_color),
))
} else if help == "sub" {
helptext.push(Line::from(""));
helptext.push(Line::from(
- Span::raw(keys)
- .bold()
- .fg(Color::Indexed(args.colors.main_text_color)),
+ Span::raw(keys).bold().fg(cfg.colors.main_text_color),
))
} else {
helptext.push(Line::from(vec![
- Span::raw(keys)
- .bold()
- .fg(Color::Indexed(args.colors.keyword_color)),
+ Span::raw(keys).bold().fg(cfg.colors.main_text_color),
Span::raw(help),
]))
}
diff --git a/src/tui/ui.rs b/src/tui/ui.rs
index d85f318..2d58aec 100644
--- a/src/tui/ui.rs
+++ b/src/tui/ui.rs
@@ -17,11 +17,11 @@
use std::path::PathBuf;
-use super::colors::AppColorScheme;
use super::popup::PopupArea;
use crate::bibiman::entries::EntryTableColumn;
use crate::bibiman::{CurrentArea, FormerArea};
use crate::cliargs::CLIArgs;
+use crate::config::BibiConfig;
use crate::tui::popup::PopupKind;
use crate::App;
use ratatui::layout::{Direction, Position};
@@ -52,8 +52,8 @@ pub fn color_list(
highlight: u8,
max_diff: i32,
) -> Color {
- match args.colors.color_scheme {
- AppColorScheme::Dark => {
+ match args.light_theme {
+ false => {
if list_item == sel_item {
Color::Indexed(highlight)
} else if (list_item - sel_item) > max_diff
@@ -68,7 +68,7 @@ pub fn color_list(
Color::Indexed(highlight - (list_item - sel_item) as u8)
}
}
- AppColorScheme::Light => {
+ true => {
if list_item == sel_item {
Color::Indexed(highlight)
} else if (list_item - sel_item) > max_diff
@@ -103,7 +103,7 @@ fn count_files(files: &[PathBuf]) -> u16 {
count
}
-pub fn render_ui(app: &mut App, args: &CLIArgs, frame: &mut Frame) {
+pub fn render_ui(app: &mut App, cfg: &BibiConfig, frame: &mut Frame) {
let [header_area, main_area, footer_area] = Layout::new(
Direction::Vertical,
[
@@ -128,20 +128,20 @@ pub fn render_ui(app: &mut App, args: &CLIArgs, frame: &mut Frame) {
let [tag_area, info_area] =
Layout::horizontal([Constraint::Max(25), Constraint::Min(35)]).areas(item_area);
- render_header(args, frame, header_area);
+ render_header(cfg, frame, header_area);
if let CurrentArea::SearchArea = app.bibiman.current_area {
- render_footer(app, args, frame, footer_area);
+ render_footer(app, cfg, frame, footer_area);
}
- render_entrytable(app, args, frame, entry_area);
- render_selected_item(app, args, frame, info_area);
- render_taglist(app, args, frame, tag_area);
- render_file_info(app, args, frame, entry_info_area);
+ render_entrytable(app, cfg, frame, entry_area);
+ render_selected_item(app, cfg, frame, info_area);
+ render_taglist(app, cfg, frame, tag_area);
+ render_file_info(app, cfg, frame, entry_info_area);
if app.bibiman.popup_area.is_popup {
- render_popup(app, args, frame);
+ render_popup(app, cfg, frame);
}
}
-pub fn render_popup(app: &mut App, args: &CLIArgs, frame: &mut Frame) {
+pub fn render_popup(app: &mut App, cfg: &BibiConfig, frame: &mut Frame) {
match app.bibiman.popup_area.popup_kind {
Some(PopupKind::Help) => {
let block = Block::bordered()
@@ -150,13 +150,13 @@ pub fn render_popup(app: &mut App, args: &CLIArgs, frame: &mut Frame) {
.title_alignment(Alignment::Center)
.style(
Style::new()
- .fg(Color::Indexed(args.colors.main_text_color))
- .bg(Color::Indexed(args.colors.popup_bg_color)),
+ .fg(cfg.colors.main_text_color)
+ .bg(cfg.colors.popup_bg_color),
)
.border_set(symbols::border::THICK)
- .border_style(Style::new().fg(Color::Indexed(args.colors.entry_color)));
+ .border_style(Style::new().fg(cfg.colors.entry_color));
- let text: Text = PopupArea::popup_help(args);
+ let text: Text = PopupArea::popup_help(cfg);
// Calculate max scroll position depending on hight of terminal window
// Needed length is number of text lines plus two for borders at bottom and top
@@ -191,23 +191,20 @@ pub fn render_popup(app: &mut App, args: &CLIArgs, frame: &mut Frame) {
.title_alignment(Alignment::Center)
.style(
Style::new()
- .fg(Color::Indexed(args.colors.main_text_color))
- .bg(Color::Indexed(args.colors.popup_bg_color)),
+ .fg(cfg.colors.main_text_color)
+ .bg(cfg.colors.popup_bg_color),
)
.border_set(symbols::border::THICK)
- .border_style(Style::new().fg(Color::Indexed(args.colors.entry_color)));
+ .border_style(Style::new().fg(cfg.colors.entry_color));
// Prepare the input fields
let content = vec![Line::from(vec![
- Span::styled(
- "DOI: ",
- Style::new().fg(Color::Indexed(args.colors.entry_color)),
- ),
+ Span::styled("DOI: ", Style::new().fg(cfg.colors.entry_color)),
Span::raw(app.input.value().to_string().clone()),
])];
let paragraph = Paragraph::new(content)
.block(block.clone())
- .style(Style::new().fg(Color::Indexed(args.colors.main_text_color)))
+ .style(Style::new().fg(cfg.colors.main_text_color))
.wrap(Wrap { trim: false });
let doi_lines = paragraph.line_count(area.width / 2);
@@ -225,21 +222,17 @@ pub fn render_popup(app: &mut App, args: &CLIArgs, frame: &mut Frame) {
let area = frame.area();
let block = Block::bordered()
- .title_top(
- " Message "
- .bold()
- .fg(Color::Indexed(args.colors.confirm_color)),
- )
- .border_style(Style::new().fg(Color::Indexed(args.colors.confirm_color)))
+ .title_top(" Message ".bold().fg(cfg.colors.confirm_color))
+ .border_style(Style::new().fg(cfg.colors.confirm_color))
.style(
Style::new()
- .fg(Color::Indexed(args.colors.main_text_color))
- .bg(Color::Indexed(args.colors.popup_bg_color)),
+ .fg(cfg.colors.main_text_color)
+ .bg(cfg.colors.popup_bg_color),
);
let content = Paragraph::new(app.bibiman.popup_area.popup_message.clone())
.block(block)
- .style(Style::new().fg(Color::Indexed(args.colors.confirm_color)));
+ .style(Style::new().fg(cfg.colors.confirm_color));
// Calculate popup size. Width is number of string chars plus 2 for border
let popup_area = popup_area(
@@ -256,21 +249,17 @@ pub fn render_popup(app: &mut App, args: &CLIArgs, frame: &mut Frame) {
let area = frame.area();
let block = Block::bordered()
- .title_top(
- " Warning "
- .bold()
- .fg(Color::Indexed(args.colors.warn_color)),
- )
+ .title_top(" Warning ".bold().fg(cfg.colors.warn_color))
.border_style(Style::new().fg(Color::Red))
.style(
Style::new()
- .fg(Color::Indexed(args.colors.main_text_color))
- .bg(Color::Indexed(args.colors.popup_bg_color)),
+ .fg(cfg.colors.main_text_color)
+ .bg(cfg.colors.popup_bg_color),
);
let content = Paragraph::new(app.bibiman.popup_area.popup_message.clone())
.block(block)
- .style(Style::new().fg(Color::Indexed(args.colors.warn_color)));
+ .style(Style::new().fg(cfg.colors.warn_color));
// Calculate popup size. Width is number of string chars plus 2 for border
let popup_area = popup_area(
@@ -306,15 +295,15 @@ pub fn render_popup(app: &mut App, args: &CLIArgs, frame: &mut Frame) {
.title_alignment(Alignment::Center)
.style(
Style::new()
- .fg(Color::Indexed(args.colors.main_text_color))
- .bg(Color::Indexed(args.colors.popup_bg_color)),
+ .fg(cfg.colors.main_text_color)
+ .bg(cfg.colors.popup_bg_color),
)
.border_set(symbols::border::THICK)
- .border_style(Style::new().fg(Color::Indexed(args.colors.keyword_color)));
+ .border_style(Style::new().fg(cfg.colors.keyword_color));
let list = List::new(list_items).block(block).highlight_style(
Style::new()
- // .fg(Color::Indexed(args.colors.entry_color))
+ // .fg(cfg.colors.entry_color)
.add_modifier(Modifier::BOLD)
.add_modifier(Modifier::REVERSED),
);
@@ -330,15 +319,15 @@ pub fn render_popup(app: &mut App, args: &CLIArgs, frame: &mut Frame) {
}
}
-pub fn render_header(args: &CLIArgs, frame: &mut Frame, rect: Rect) {
+pub fn render_header(cfg: &BibiConfig, frame: &mut Frame, rect: Rect) {
let main_header = Paragraph::new("BIBIMAN – BibLaTeX manager TUI")
.bold()
- .fg(Color::Indexed(args.colors.entry_color))
+ .fg(cfg.colors.entry_color)
.centered();
frame.render_widget(main_header, rect)
}
-pub fn render_footer(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect: Rect) {
+pub fn render_footer(app: &mut App, cfg: &BibiConfig, frame: &mut Frame, rect: Rect) {
let search_title = {
match app.bibiman.former_area {
Some(FormerArea::EntryArea) => "Search Entries: ".to_string(),
@@ -351,27 +340,27 @@ pub fn render_footer(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect: Rec
let block = Block::new()
.padding(Padding::horizontal(1))
- .bg(Color::Indexed(args.colors.bar_bg_color));
+ .bg(cfg.colors.bar_bg_color);
let search_string = Paragraph::new(Line::from(vec![
Span::styled(
search_title,
if let Some(FormerArea::EntryArea) = app.bibiman.former_area {
Style::new()
- .fg(Color::Indexed(args.colors.entry_color))
+ .fg(cfg.colors.entry_color)
.add_modifier(Modifier::BOLD)
} else if let Some(FormerArea::TagArea) = app.bibiman.former_area {
Style::new()
- .fg(Color::Indexed(args.colors.keyword_color))
+ .fg(cfg.colors.keyword_color)
.add_modifier(Modifier::BOLD)
} else {
Style::new()
- .fg(Color::Indexed(args.colors.highlight_text_color))
+ .fg(cfg.colors.highlight_text_color)
.add_modifier(Modifier::BOLD)
},
),
Span::raw(app.bibiman.search_struct.search_string.clone())
- .fg(Color::Indexed(args.colors.highlight_text_color)),
+ .fg(cfg.colors.highlight_text_color),
]))
.block(block);
@@ -383,7 +372,7 @@ pub fn render_footer(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect: Rec
// 1. Basename of the currently loaded file
// 2. Keyword by which the entries are filtered at the moment
// 3. Currently selected entry and total count of entries
-pub fn render_file_info(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect: Rect) {
+pub fn render_file_info(app: &mut App, cfg: &BibiConfig, frame: &mut Frame, rect: Rect) {
let block = Block::new() // can also be Block::new
// Leave Top empty to simulate one large box with borders of entry list
.borders(Borders::LEFT | Borders::RIGHT | Borders::BOTTOM)
@@ -393,10 +382,10 @@ pub fn render_file_info(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect:
symbols::border::PLAIN
})
.border_style(if let CurrentArea::EntryArea = app.bibiman.current_area {
- Style::new().fg(Color::Indexed(args.colors.highlight_text_color))
+ Style::new().fg(cfg.colors.highlight_text_color)
} else {
Style::new()
- .fg(Color::Indexed(args.colors.entry_color))
+ .fg(cfg.colors.entry_color)
.add_modifier(Modifier::BOLD)
});
@@ -410,47 +399,37 @@ pub fn render_file_info(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect:
.horizontal_margin(1)
.areas(rect);
- let file_info = if args.pos_args.len() == 1 && args.pos_args.first().unwrap().is_file() {
+ let file_info = if app.bibiman.main_bibfiles.len() == 1
+ && app.bibiman.main_bibfiles.first().unwrap().is_file()
+ {
Line::from(vec![
- Span::raw("File: ")
- .fg(Color::Indexed(args.colors.main_text_color))
- .bold(),
- Span::raw(args.pos_args[0].file_name().unwrap().to_string_lossy())
- .fg(Color::Indexed(args.colors.main_text_color))
- .bold(),
- ])
- .bg(Color::Indexed(args.colors.bar_bg_color))
- } else if args.pos_args.len() == 1 && args.pos_args.first().unwrap().is_dir() {
- Line::from(vec![
- Span::raw("Directory: ")
- .bold()
- .fg(Color::Indexed(args.colors.main_text_color)),
- Span::raw(args.pos_args[0].file_name().unwrap().to_string_lossy())
- .fg(Color::Indexed(args.colors.main_text_color))
- .bold(),
- Span::raw("/*.bib")
- .fg(Color::Indexed(args.colors.main_text_color))
- .bold(),
+ Span::raw("File: ").fg(cfg.colors.main_text_color).bold(),
+ Span::raw(
+ app.bibiman.main_bibfiles[0]
+ .file_name()
+ .unwrap()
+ .to_string_lossy(),
+ )
+ .fg(cfg.colors.main_text_color)
+ .bold(),
])
- .bg(Color::Indexed(args.colors.bar_bg_color))
+ .bg(cfg.colors.bar_bg_color)
} else {
Line::from(vec![
Span::raw("Multiple files (")
- .fg(Color::Indexed(args.colors.main_text_color))
- .bold(),
- Span::raw(count_files(&args.files).to_string())
- .fg(Color::Indexed(args.colors.main_text_color))
+ .fg(cfg.colors.main_text_color)
.bold(),
- Span::raw(")")
- .fg(Color::Indexed(args.colors.main_text_color))
+ Span::raw(count_files(&app.bibiman.main_bibfiles).to_string())
+ .fg(cfg.colors.main_text_color)
.bold(),
+ Span::raw(")").fg(cfg.colors.main_text_color).bold(),
])
- .bg(Color::Indexed(args.colors.bar_bg_color))
+ .bg(cfg.colors.bar_bg_color)
};
let cur_keywords = Line::from(if !app.bibiman.tag_list.selected_keywords.is_empty() {
vec![
- Span::raw("Selected keywords: ").fg(Color::Indexed(args.colors.main_text_color)),
+ Span::raw("Selected keywords: ").fg(cfg.colors.main_text_color),
// Show all keywords in correct order if list is filtered
// successively by multiple keywords
Span::raw(app.bibiman.tag_list.selected_keywords.join(" → "))
@@ -460,7 +439,7 @@ pub fn render_file_info(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect:
} else {
vec![Span::raw(" ")]
})
- .bg(Color::Indexed(args.colors.bar_bg_color));
+ .bg(cfg.colors.bar_bg_color);
// .render(keyword_area, buf);
let item_count = Line::from(
@@ -496,38 +475,36 @@ pub fn render_file_info(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect:
.to_string()
},
)
- .fg(Color::Indexed(args.colors.main_text_color))
+ .fg(cfg.colors.main_text_color)
.bold(),
- Span::raw("/").fg(Color::Indexed(args.colors.main_text_color)),
+ Span::raw("/").fg(cfg.colors.main_text_color),
Span::raw(app.bibiman.entry_table.entry_table_items.len().to_string())
- .fg(Color::Indexed(args.colors.main_text_color)),
+ .fg(cfg.colors.main_text_color),
]
} else {
vec![Span::raw("No entries")]
},
)
.right_aligned()
- .bg(Color::Indexed(args.colors.bar_bg_color));
+ .bg(cfg.colors.bar_bg_color);
frame.render_widget(file_info, file_area);
frame.render_widget(cur_keywords, keyword_area);
frame.render_widget(item_count, count_area);
}
-pub fn render_entrytable(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect: Rect) {
- let entry_box_selected_border_style: Style =
- Style::new().fg(Color::Indexed(args.colors.highlight_text_color));
+pub fn render_entrytable(app: &mut App, cfg: &BibiConfig, frame: &mut Frame, rect: Rect) {
+ let entry_box_selected_border_style: Style = Style::new().fg(cfg.colors.highlight_text_color);
let entry_box_selected_title_style: Style = Style::new()
- .fg(Color::Indexed(args.colors.entry_color))
+ .fg(cfg.colors.entry_color)
.add_modifier(Modifier::BOLD);
- let entry_box_unselected_border_style: Style =
- Style::new().fg(Color::Indexed(args.colors.main_text_color));
+ let entry_box_unselected_border_style: Style = Style::new().fg(cfg.colors.main_text_color);
let entry_box_unselected_title_style: Style = Style::new()
- .fg(Color::Indexed(args.colors.entry_color))
+ .fg(cfg.colors.entry_color)
.add_modifier(Modifier::BOLD);
let selected_table_col_style: Style = Style::new().add_modifier(Modifier::BOLD);
let selectec_table_cell_style: Style = Style::new().add_modifier(Modifier::REVERSED);
let entry_selected_row_style: Style = Style::new()
- .fg(Color::Indexed(args.colors.entry_color))
+ .fg(cfg.colors.entry_color)
.add_modifier(Modifier::BOLD)
.add_modifier(Modifier::REVERSED);
@@ -557,8 +534,8 @@ pub fn render_entrytable(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect:
let header_style = Style::default()
.bold()
- .fg(Color::Indexed(args.colors.main_text_color))
- .bg(Color::Indexed(args.colors.bar_bg_color));
+ .fg(cfg.colors.main_text_color)
+ .bg(cfg.colors.bar_bg_color);
let header = Row::new(vec![
Cell::from(
@@ -582,9 +559,9 @@ pub fn render_entrytable(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect:
if let EntryTableColumn::Authors =
app.bibiman.entry_table.entry_table_selected_column
{
- Color::Indexed(args.colors.selected_row_bg_color)
+ cfg.colors.selected_row_bg_color
} else {
- Color::Indexed(args.colors.bar_bg_color)
+ cfg.colors.bar_bg_color
},
),
),
@@ -608,9 +585,9 @@ pub fn render_entrytable(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect:
.bg(
if let EntryTableColumn::Title = app.bibiman.entry_table.entry_table_selected_column
{
- Color::Indexed(args.colors.selected_row_bg_color)
+ cfg.colors.selected_row_bg_color
} else {
- Color::Indexed(args.colors.bar_bg_color)
+ cfg.colors.bar_bg_color
},
),
),
@@ -634,9 +611,9 @@ pub fn render_entrytable(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect:
.bg(
if let EntryTableColumn::Year = app.bibiman.entry_table.entry_table_selected_column
{
- Color::Indexed(args.colors.selected_row_bg_color)
+ cfg.colors.selected_row_bg_color
} else {
- Color::Indexed(args.colors.bar_bg_color)
+ cfg.colors.bar_bg_color
},
),
),
@@ -661,9 +638,9 @@ pub fn render_entrytable(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect:
if let EntryTableColumn::Pubtype =
app.bibiman.entry_table.entry_table_selected_column
{
- Color::Indexed(args.colors.selected_row_bg_color)
+ cfg.colors.selected_row_bg_color
} else {
- Color::Indexed(args.colors.bar_bg_color)
+ cfg.colors.bar_bg_color
},
),
),
@@ -678,23 +655,24 @@ pub fn render_entrytable(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect:
.entry_table_items
.iter_mut()
.enumerate()
- .map(|(i, data)| {
+ .map(|(_i, data)| {
let item = data.ref_vec();
item.into_iter()
.map(|content| Cell::from(Text::from(content.to_string())))
.collect::<Row>()
.style(
- Style::new().fg(color_list(
- args,
- i as i32,
- app.bibiman
- .entry_table
- .entry_table_state
- .selected()
- .unwrap_or(0) as i32,
- args.colors.highlight_text_color,
- 20,
- )),
+ // Style::new().fg(color_list(
+ // args,
+ // i as i32,
+ // app.bibiman
+ // .entry_table
+ // .entry_table_state
+ // .selected()
+ // .unwrap_or(0) as i32,
+ // args.colors.highlight_text_color,
+ // 20,
+ // )),
+ Style::new().fg(cfg.colors.highlight_text_color),
)
.height(1)
});
@@ -747,11 +725,9 @@ pub fn render_entrytable(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect:
}
}
-pub fn render_selected_item(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect: Rect) {
+pub fn render_selected_item(app: &mut App, cfg: &BibiConfig, frame: &mut Frame, rect: Rect) {
// We get the info depending on the item's state.
- let style_value = Style::new()
- .bold()
- .fg(Color::Indexed(args.colors.main_text_color));
+ let style_value = Style::new().bold().fg(cfg.colors.main_text_color);
let lines = {
if app
.bibiman
@@ -771,10 +747,7 @@ pub fn render_selected_item(app: &mut App, args: &CLIArgs, frame: &mut Frame, re
lines.push(Line::from(vec![
Span::styled("Authors: ", style_value),
// Span::styled(cur_entry.authors.clone(), Style::new().green()),
- Span::styled(
- cur_entry.authors(),
- Style::new().fg(Color::Indexed(args.colors.info_color)),
- ),
+ Span::styled(cur_entry.authors(), Style::new().fg(cfg.colors.info_color)),
]));
if cur_entry.subtitle.is_some() {
lines.push(Line::from(vec![
@@ -782,19 +755,19 @@ pub fn render_selected_item(app: &mut App, args: &CLIArgs, frame: &mut Frame, re
Span::styled(
cur_entry.title(),
Style::new()
- .fg(Color::Indexed(args.colors.entry_color))
+ .fg(cfg.colors.entry_color)
.add_modifier(Modifier::ITALIC),
),
Span::styled(
": ",
Style::new()
- .fg(Color::Indexed(args.colors.entry_color))
+ .fg(cfg.colors.entry_color)
.add_modifier(Modifier::ITALIC),
),
Span::styled(
cur_entry.subtitle(),
Style::new()
- .fg(Color::Indexed(args.colors.entry_color))
+ .fg(cfg.colors.entry_color)
.add_modifier(Modifier::ITALIC),
),
]));
@@ -804,17 +777,14 @@ pub fn render_selected_item(app: &mut App, args: &CLIArgs, frame: &mut Frame, re
Span::styled(
cur_entry.title(),
Style::new()
- .fg(Color::Indexed(args.colors.entry_color))
+ .fg(cfg.colors.entry_color)
.add_modifier(Modifier::ITALIC),
),
]));
}
lines.push(Line::from(vec![
Span::styled("Year: ", style_value),
- Span::styled(
- cur_entry.year(),
- Style::new().fg(Color::Indexed(args.colors.keyword_color)),
- ),
+ Span::styled(cur_entry.year(), Style::new().fg(cfg.colors.keyword_color)),
]));
// Render keywords in info box in Markdown code style
if !cur_entry.keywords.is_empty() {
@@ -827,27 +797,25 @@ pub fn render_selected_item(app: &mut App, args: &CLIArgs, frame: &mut Frame, re
let mut content = vec![Span::styled("Keywords: ", style_value)];
for k in kw {
// Add half block highlighted in bg color to enlarge block
- content.push(Span::raw("▐").fg(Color::Indexed(args.colors.bar_bg_color)));
+ content.push(Span::raw("▐").fg(cfg.colors.bar_bg_color));
content.push(Span::styled(
k,
- Style::default()
- .bg(Color::Indexed(args.colors.bar_bg_color))
- .fg(
- // Highlight selected keyword green
- if app
- .bibiman
- .tag_list
- .selected_keywords
- .iter()
- .any(|e| e == k)
- {
- Color::Green
- } else {
- Color::Indexed(args.colors.main_text_color)
- },
- ),
+ Style::default().bg(cfg.colors.bar_bg_color).fg(
+ // Highlight selected keyword green
+ if app
+ .bibiman
+ .tag_list
+ .selected_keywords
+ .iter()
+ .any(|e| e == k)
+ {
+ Color::Green
+ } else {
+ cfg.colors.main_text_color
+ },
+ ),
));
- content.push(Span::raw("▌").fg(Color::Indexed(args.colors.bar_bg_color)));
+ content.push(Span::raw("▌").fg(cfg.colors.bar_bg_color));
}
lines.push(Line::from(content))
}
@@ -859,9 +827,7 @@ pub fn render_selected_item(app: &mut App, args: &CLIArgs, frame: &mut Frame, re
Span::styled("DOI/URL: ", style_value),
Span::styled(
cur_entry.doi_url(),
- Style::new()
- .fg(Color::Indexed(args.colors.main_text_color))
- .underlined(),
+ Style::new().fg(cfg.colors.main_text_color).underlined(),
),
]));
}
@@ -870,14 +836,14 @@ pub fn render_selected_item(app: &mut App, args: &CLIArgs, frame: &mut Frame, re
Span::styled("File: ", style_value),
Span::styled(
cur_entry.filepath().to_string_lossy(),
- Style::new().fg(Color::Indexed(args.colors.main_text_color)),
+ Style::new().fg(cfg.colors.main_text_color),
),
]));
}
lines.push(Line::from(""));
lines.push(Line::from(vec![Span::styled(
cur_entry.abstract_text.clone(),
- Style::new().fg(Color::Indexed(args.colors.main_text_color)),
+ Style::new().fg(cfg.colors.main_text_color),
)]));
lines
} else {
@@ -894,7 +860,7 @@ pub fn render_selected_item(app: &mut App, args: &CLIArgs, frame: &mut Frame, re
let block = Block::bordered()
.title(Line::raw(" Entry Information ").centered().bold())
.border_set(symbols::border::PLAIN)
- .border_style(Style::new().fg(Color::Indexed(args.colors.main_text_color)))
+ .border_style(Style::new().fg(cfg.colors.main_text_color))
.padding(Padding::horizontal(1));
// INFO: '.line_count' method only possible with unstable-rendered-line-info feature -> API might change: https://github.com/ratatui/ratatui/issues/293#ref-pullrequest-2027056434
@@ -947,19 +913,17 @@ pub fn render_selected_item(app: &mut App, args: &CLIArgs, frame: &mut Frame, re
frame.render_widget(item_info, rect);
}
-pub fn render_taglist(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect: Rect) {
- let keyword_box_selected_border_style: Style =
- Style::new().fg(Color::Indexed(args.colors.highlight_text_color));
+pub fn render_taglist(app: &mut App, cfg: &BibiConfig, frame: &mut Frame, rect: Rect) {
+ let keyword_box_selected_border_style: Style = Style::new().fg(cfg.colors.highlight_text_color);
let keyword_box_selected_title_style: Style = Style::new()
- .fg(Color::Indexed(args.colors.keyword_color))
+ .fg(cfg.colors.keyword_color)
.add_modifier(Modifier::BOLD);
- let keyword_box_unselected_border_style: Style =
- Style::new().fg(Color::Indexed(args.colors.main_text_color));
+ let keyword_box_unselected_border_style: Style = Style::new().fg(cfg.colors.main_text_color);
let keyword_box_unselected_title_style: Style = Style::new()
- .fg(Color::Indexed(args.colors.keyword_color))
+ .fg(cfg.colors.keyword_color)
.add_modifier(Modifier::BOLD);
let keyword_selected_row_style: Style = Style::new()
- .fg(Color::Indexed(args.colors.keyword_color))
+ .fg(cfg.colors.keyword_color)
.add_modifier(Modifier::BOLD)
.add_modifier(Modifier::REVERSED);
@@ -993,18 +957,19 @@ pub fn render_taglist(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect: Re
.tag_list_items
.iter()
.enumerate()
- .map(|(i, keyword)| {
+ .map(|(_i, keyword)| {
ListItem::from(keyword.to_owned()).style(Style::new().fg(
if app.bibiman.tag_list.tag_list_state.selected().is_some() {
- color_list(
- args,
- i as i32,
- app.bibiman.tag_list.tag_list_state.selected().unwrap() as i32,
- args.colors.highlight_text_color,
- 20,
- )
+ // color_list(
+ // args,
+ // i as i32,
+ // app.bibiman.tag_list.tag_list_state.selected().unwrap() as i32,
+ // args.colors.highlight_text_color,
+ // 20,
+ // )
+ cfg.colors.highlight_text_color
} else {
- Color::Indexed(args.colors.main_text_color)
+ cfg.colors.main_text_color
},
)) //.bg(color)
})
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-14 09:41:16 +0000