Ok

Author: Mcdostone

crates/app/src/configuration/global_config.rs

@@ -57,6 +57,7 @@ pub struct GlobalConfig {
     pub show_shortcuts: bool,
     #[serde(default = "default_export_directory")]
     pub export_directory: PathBuf,
+    pub log_file: Option<PathBuf>
 }
 
 fn default_url_template() -> String {
@@ -99,6 +100,7 @@ impl TryFrom<&PathBuf> for GlobalConfig {
             show_shortcuts: true,
             export_directory: default_export_directory(),
             consumer: ConsumerConfig::default(),
+            log_file: None,
         })
     }
 }

crates/app/src/configuration/workspace.rs

@@ -19,6 +19,8 @@ pub struct Workspace {
     pub path: PathBuf,
     /// Specific config file of Yozefu
     config_file: PathBuf,
+    /// Specific log file of Yozefu
+    log_file: PathBuf,
 }
 
 impl Default for Workspace {
@@ -28,6 +30,9 @@ impl Default for Workspace {
             config_file: Self::yozefu_directory()
                 .unwrap()
                 .join(Self::CONFIG_FILENAME),
+            log_file: Self::yozefu_directory()
+                .unwrap()
+                .join(Self::LOGS_FILENAME),
         }
     }
 }
@@ -38,10 +43,11 @@ impl Workspace {
     pub const THEMES_FILENAME: &str = "themes.json";
     pub const FILTERS_DIRECTORY: &str = "filters";
 
-    pub fn new(directory: &Path, config_file: &Path) -> Self {
+    pub fn new(directory: &Path, config_file: &Path, log_file: PathBuf) -> Self {
         Self {
             path: directory.to_path_buf(),
             config_file: config_file.to_path_buf(),
+            log_file,
         }
     }
 
@@ -61,7 +67,7 @@ impl Workspace {
 
     /// Returns the name of the logs file
     pub fn logs_file(&self) -> PathBuf {
-        self.path.join(Self::LOGS_FILENAME)
+        self.log_file.clone()
     }
 
     /// Returns the name of the logs file

crates/app/tests/global_config.rs

@@ -19,6 +19,7 @@ fn check_backwards_compatibility() {
         export_directory: PathBuf::from("./yozefu-exports"),
         consumer: ConsumerConfig::default(),
         highlighter_theme: None,
+        log_file: None,
     };
 
     let json = serde_json::to_string_pretty(&config).unwrap();

crates/command/src/global_args.rs

@@ -1,6 +1,7 @@
-use app::configuration::Workspace;
+use app::configuration::{GlobalConfig, Workspace};
+use chrono::naive::serde;
 use clap::Args;
-use std::path::PathBuf;
+use std::{fs, path::PathBuf};
 use tracing::debug;
 
 #[derive(Args, Clone, Debug, Default)]
@@ -11,18 +12,35 @@ pub struct GlobalArgs {
     #[arg(long, env = "YOZEFU_CONFIG_DIR", global = true)]
     /// Use a specific config directory to store the configuration, logs, search filters.
     pub config_dir: Option<PathBuf>,
+    #[arg(long, env = "YOZEFU_LOG_FILE", global = true)]
+    /// Append logs to a specific log file
+    pub log_file: Option<PathBuf>,
 }
 
 impl GlobalArgs {
     pub fn workspace(&self) -> Workspace {
         let default_workspace = Workspace::default();
+
         let workspace = match (&self.config_dir, &self.config_file) {
             (Some(dir), Some(file)) => Workspace::new(dir, file),
             (Some(dir), None) => Workspace::new(dir, &dir.join(Workspace::CONFIG_FILENAME)),
             (None, Some(file)) => Workspace::new(&default_workspace.path, file),
             (None, None) => default_workspace,
         };
 
+        
+
+        let lo = match self.log_file {
+            Some(log_file) => log_file,
+            None => {
+                let contents = fs::read_to_string(workspace.config_file()).unwrap_or("{}".to_string());
+                let config: GlobalConfig = serde_json::from_str(&contents)
+                .unwrap_or_default();
+                config.log_file.unwrap_or_else(|| workspace.logs_file())
+            }
+        }
+
+
         debug!("Using config directory: {}", workspace.path.display());
         workspace
     }
@@ -42,6 +60,7 @@ mod tests {
         let args = GlobalArgs {
             config_dir: Some(PathBuf::from("/tmp/config_dir")),
             config_file: Some(PathBuf::from("/tmp/config_dir/config.json")),
+            log_file: None,
         };
         let ws = args.workspace();
         assert_eq!(ws.path, PathBuf::from("/tmp/config_dir"));
@@ -56,6 +75,7 @@ mod tests {
         let args = GlobalArgs {
             config_dir: Some(PathBuf::from("/tmp/config_dir")),
             config_file: None,
+            log_file: None,
         };
         let ws = args.workspace();
         assert_eq!(ws.path, PathBuf::from("/tmp/config_dir"));
@@ -80,6 +100,7 @@ mod tests {
         let args = GlobalArgs {
             config_dir: None,
             config_file: Some(PathBuf::from("/tmp/config_dir/config.json")),
+            log_file: None,
         };
         let ws = args.workspace();
         assert_eq!(ws.path, default_ws.path);
@@ -95,6 +116,7 @@ mod tests {
         let args = GlobalArgs {
             config_dir: None,
             config_file: None,
+            log_file: None,
         };
         let ws = args.workspace();
         assert_eq!(ws.path, default_ws.path);
@@ -106,6 +128,7 @@ mod tests {
         let args = GlobalArgs {
             config_dir: Some(PathBuf::from("/tmp/config_dir")),
             config_file: Some(PathBuf::from("/tmp/config_dir/config.json")),
+            log_file: None,
         };
         assert_eq!(
             args.workspace().config_file(),