Refactor rsc

Author: albertwoo

src/bin/rsc.rs

@@ -1,33 +1,36 @@
+use clap::Parser as _;
+use std::ffi::OsString;
 use std::path::Path;
 
-use clap::Parser as _;
 use rustickers::cli;
 use rustickers::storage::paths::AppPaths;
 
 fn main() {
     let app_paths = AppPaths::new().expect("App paths should initialize");
 
-    // when args length is 1 and it is a valid file/url then run view command directly
-    let cli = if std::env::args().len() == 2 {
-        let arg = std::env::args().nth(1).unwrap();
-        if rustickers::utils::url::is_url(&arg)
-            || Path::new(&arg).is_dir()
-            || Path::new(&arg).is_file()
-        {
-            cli::view::run(arg).unwrap_or_else(|err| {
-                eprintln!("error: {err:#}");
-                std::process::exit(1);
-            });
-            return;
-        } else {
-            cli::Cli::parse()
-        }
-    } else {
-        cli::Cli::parse()
-    };
+    let cli = cli::Cli::parse_from(normalize_argv_for_view_alias());
 
     if let Err(err) = cli::run(cli, &app_paths) {
         eprintln!("error: {err:#}");
         std::process::exit(1);
     }
 }
+
+fn normalize_argv_for_view_alias() -> Vec<OsString> {
+    let args: Vec<OsString> = std::env::args_os().collect();
+
+    if args.len() != 2 {
+        return args;
+    }
+
+    let source = args[1].clone();
+    let source_path = Path::new(&source);
+    let is_existing_path = source_path.is_file() || source_path.is_dir();
+    let is_url = source.to_str().is_some_and(rustickers::utils::url::is_url);
+
+    if is_existing_path || is_url {
+        vec![args[0].clone(), OsString::from("view"), source]
+    } else {
+        args
+    }
+}