From ddb6326c1896b82b759d930fb08ea46a820e275a Mon Sep 17 00:00:00 2001
From: lukeflo
Date: Fri, 21 Feb 2025 20:17:27 +0100
Subject: parse config file

+ set default values for config fields
+ merge fields named in the config file with default values
+ values from file take precedence over default values
+ to accomplish this, all config values are wrapped in `Option<T>`
---
 src/app.rs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/app.rs')

diff --git a/src/app.rs b/src/app.rs
index 55f49de..b3778af 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -364,11 +364,7 @@ impl App {
 
 pub fn open_connected_file(cfg: &BibiConfig, file: &OsStr) -> Result<()> {
     // Build command to execute pdf-reader. 'xdg-open' is Linux standard
-    let cmd = match &cfg.general.pdf_opener {
-        Some(c) => c,
-        None => &select_opener(),
-    };
-
+    let cmd = cfg.general.as_ref().unwrap().pdf_opener.as_ref().unwrap();
     // If necessary, replace ~ with /home dir
     let file = PathBuf::from(file);
 
@@ -388,11 +384,7 @@ pub fn open_connected_file(cfg: &BibiConfig, file: &OsStr) -> Result<()> {
 
 pub fn open_connected_link(cfg: &BibiConfig, link: &str) -> Result<()> {
     // Build command to execute pdf-reader. 'xdg-open' is Linux standard
-    let cmd = match &cfg.general.url_opener {
-        Some(c) => c,
-        None => &select_opener(),
-    };
-
+    let cmd = cfg.general.as_ref().unwrap().url_opener.as_ref().unwrap();
     // 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)
-- 
cgit v1.2.3