Make workspace possibly user defined

rinex-cli/src/cli.rs

@@ -28,6 +28,23 @@ impl Cli {
                         .help("Input RINEX file")
                         .action(ArgAction::Append)
                         .required(true))
+                .next_help_heading("General")
+                    .arg(Arg::new("quiet")
+                        .short('q')
+                        .long("quiet")
+                        .action(ArgAction::SetTrue)
+                        .help("Disable all terminal output. Also disables auto HTML reports opener."))
+                    .arg(Arg::new("pretty")
+                        .short('p')
+                        .long("pretty")
+                        .action(ArgAction::SetTrue)
+                        .help("Make terminal output more readable."))
+                    .arg(Arg::new("workspace")
+                        .short('w')
+                        .long("workspace")
+                        .value_name("[FOLDER]")
+                        .help("Customize workspace location (folder does not have to exist).
+The default workspace is rinex-cli/workspace"))
                 .next_help_heading("Data identification")
                     .arg(Arg::new("epochs")
                         .long("epochs")
@@ -242,17 +259,7 @@ For example -fp was filtered and decimated, use --output to dump results into a
                         .help("Custom header attributes, in case we're generating data.
 --custom-header must either be plain JSON or an external JSON descriptor.
 Refer to README"))
-                .next_help_heading("Terminal (options)")
-                    .arg(Arg::new("quiet")
-                        .short('q')
-                        .action(ArgAction::SetTrue)
-                        .help("Disable all terminal output. Disable auto HTML opener, on HTML rendering."))
-                    .arg(Arg::new("pretty")
-                        .short('p')
-                        .long("pretty")
-                        .action(ArgAction::SetTrue)
-                        .help("Make terminal output more readable"))
-                    .get_matches()
+                .get_matches()
             },
         }
     }
@@ -439,6 +446,10 @@ Refer to README"))
     pub fn nav_path(&self) -> Option<&String> {
         self.matches.get_one::<String>("nav")
     }
+    /// Returns WORKSPACE prefix to be used
+    pub fn workspace_prefix(&self) -> Option<&String> {
+        self.matches.get_one::<String>("workspace")
+    }
     pub fn atx_path(&self) -> Option<&String> {
         self.matches.get_one::<String>("atx")
     }

rinex-cli/src/main.rs

@@ -31,13 +31,23 @@ extern crate log;
 use fops::open_with_web_browser;
 use sp3::{prelude::SP3, Merge as SP3Merge};
 use std::io::Write;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
 /*
  * Workspace location is fixed to rinex-cli/product/$primary
  * at the moment
  */
-fn workspace_path(ctx: &QcContext) -> PathBuf {
+fn workspace_path(ctx: &QcContext, cli: &Cli) -> PathBuf {
+    let mut path = PathBuf::new();
+    if let Some(prefix) = cli.workspace_prefix() {
+        path.push(prefix);
+    } else {
+        path.push(env!("CARGO_MANIFEST_DIR"));
+        path.push("workspace");
+    }
+    /*
+     * grab file name
+     */
     let primary_stem: &str = ctx
         .primary_path()
         .file_stem()
@@ -49,10 +59,7 @@ fn workspace_path(ctx: &QcContext) -> PathBuf {
      * Can use .file_name() once https://github.com/rust-lang/rust/issues/86319  is stabilized
      */
     let primary_stem: Vec<&str> = primary_stem.split(".").collect();
-
-    Path::new(env!("CARGO_MANIFEST_DIR"))
-        .join("workspace")
-        .join(primary_stem[0])
+    path.join(primary_stem[0])
 }
 
 /*
@@ -180,7 +187,7 @@ pub fn main() -> Result<(), rinex::Error> {
     let mut ctx = create_context(&cli);
 
     // Workspace
-    let workspace = workspace_path(&ctx);
+    let workspace = workspace_path(&ctx, &cli);
     info!("workspace is \"{}\"", workspace.to_string_lossy());
     create_workspace(workspace.clone());
 
@@ -435,7 +442,7 @@ pub fn main() -> Result<(), rinex::Error> {
      * Render Graphs (HTML)
      */
     if !qc_only {
-        let html_path = workspace_path(&ctx).join("graphs.html");
+        let html_path = workspace_path(&ctx, &cli).join("graphs.html");
         let html_path = html_path.to_str().unwrap();
 
         let mut html_fd = std::fs::File::create(html_path)