feat: expand ~ to home dir in command line args

Author: a-catgirl-dev

src/lib.rs

@@ -69,23 +69,33 @@ impl AtomicF32 {
 }
 
 pub fn to_vec<R: std::io::BufRead>(reader: R) -> Result<Vec<String>, Box<dyn std::error::Error>> {
-    use std::env;
-
-    // i swear theres a better way to do this lmao
-    let mut v: Vec<String> = Vec::new();
-    let home = if cfg!(unix) { env::var("HOME") } else { env::var("USERPROFILE") }
-        .expect("can't find home dir");
+    let mut v = Vec::new();
 
     for line in reader.lines() {
         let line = line?;
-        if line.is_empty() {
-            continue;
-        }
-        let line = line.replacen('~', &home, 1);
-        // dbg!(&line);
+        let line = if let Some(l) = normalize_line(&line) { l } else { continue };
         v.push(line); // fast code
     }
 
     Ok(v)
 }
 
+pub fn normalize<R: Iterator<Item = String>>(i: R) -> Vec<String> {
+    let mut vec = Vec::new();
+    for s in i {
+        if let Some(s) = normalize_line(&s) { vec.push(s) } else { continue }
+    }
+
+    vec
+}
+
+pub fn normalize_line(s: &str) -> Option<String> {
+    use std::env;
+
+    let home = if cfg!(unix) { env::var("HOME") } else { env::var("USERPROFILE") }
+        .expect("can't find home dir");
+
+    if s.is_empty() { return None };
+    Some(s.replacen('~', &home, 1))
+}
+

src/main.rs

@@ -65,18 +65,24 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut render_requested_mode = RenderMode::default();
 
     if args.len() == 2 {
-        let mut first_arg = BufReader::new(File::open(&args[1])?);
+        let mut first_arg = if let Some(s) = encore::normalize_line(&args[1]) { BufReader::new(File::open(s)?) }
+        else {
+            quit_with("No such file or directory", "argv[1] not found.")?;
+            unreachable!("quit_with must quit")
+        };
         match file_format::check_file(&mut first_arg).unwrap() {
             FileFormat::Audio => {
-                parse_playlist(&args, 1).unwrap();
+                let playlist = encore::normalize(&mut args.into_iter());
+                parse_playlist(&playlist, 1).unwrap();
             }
             FileFormat::Other => {
                 let possible_playlist = encore::to_vec(&mut first_arg).expect("valid utf8");
                 parse_playlist(&possible_playlist, 0).unwrap();
             }
         }
     } else {
-        parse_playlist(&args, 1).unwrap();
+        let file = encore::normalize(&mut args.into_iter());
+        parse_playlist(&file, 1).unwrap();
     }
 
     let playlist_len = PLAYLIST.read().unwrap().len();