refactor: remove more instances of unwrap

Author: icecreammatt

src/ffmpeg.rs

@@ -1,11 +1,7 @@
 use std::{fs, io, process::Command};
 
-fn run_command(command: &str) {
-    let cmd = Command::new("sh")
-        .arg("-c")
-        .arg(command)
-        .output()
-        .expect("Error");
+fn run_command(command: &str) -> io::Result<()> {
+    let cmd = Command::new("sh").arg("-c").arg(command).output()?;
 
     println!("status: {}", cmd.status);
 
@@ -18,34 +14,35 @@ fn run_command(command: &str) {
     let result = result.as_str();
 
     println!("{}", result);
+    Ok(())
 }
 
 pub fn create_preview_gif(input: &str, subpath: &str, output: &str) -> io::Result<()> {
     let path = format!("{}/{}", output, subpath);
     if fs::metadata(&path).is_err() {
-        fs::create_dir_all(&path).unwrap();
+        fs::create_dir_all(&path)?;
     }
 
     let command = format!(
     "ffmpeg -ss 30 -t 3 -i {} -vf \"fps=10,scale=320:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse\" -loop 0 {}/{}.gif", input, path, output
     );
 
-    run_command(&command);
+    run_command(&command)?;
     Ok(())
 }
 
 pub fn create_preview_image(input: &str, subpath: &str, output: &str) -> io::Result<()> {
     let path = format!("{}/{}", output, subpath);
     if fs::metadata(&path).is_err() {
-        fs::create_dir_all(&path).unwrap();
+        fs::create_dir_all(&path)?;
     }
 
     let command = format!(
         "ffmpeg -i {} -vf scale=iw*sar:ih,setsar=1 -ss 00:00:05 -t 1 -vframes 1 {}/{}.jpg",
         input, path, output
     );
 
-    run_command(&command);
+    run_command(&command)?;
     Ok(())
 }
 
@@ -56,15 +53,15 @@ pub fn create_thumbnails(input: &str, subpath: &str, output: &str) -> io::Result
 
     println!("Path: {}", thumbs_path);
     if fs::metadata(&thumbs_path).is_err() {
-        fs::create_dir_all(&thumbs_path).unwrap();
+        fs::create_dir_all(&thumbs_path)?;
     }
 
     let command = format!(
         "ffmpeg -i {} -vf \"fps=1/4,scale=320:-1\" {}/img%03d.jpg",
         input, thumbs_path
     );
 
-    run_command(&command);
+    run_command(&command)?;
     Ok(())
 }
 
@@ -74,15 +71,15 @@ pub fn create_hls_encoding(input: &str, subpath: &str, output: &str) -> io::Resu
     let hls_path = format!("{}/{}", output, subpath);
 
     if fs::metadata(&hls_path).is_err() {
-        fs::create_dir_all(&hls_path).unwrap();
+        fs::create_dir_all(&hls_path)?;
     }
 
     // TODO: Sub add paths
     // let paths = ["hls", "dash"];
     // for path in paths {
     //     let p = format!("{}/{}", path, output);
     //     if !fs::metadata(&p).is_ok() {
-    //         fs::create_dir_all(&p).unwrap();
+    //         fs::create_dir_all(&p)?;
     //     }
     // }
 
@@ -98,6 +95,6 @@ pub fn create_hls_encoding(input: &str, subpath: &str, output: &str) -> io::Resu
         -hls_segment_filename \
         -hls_playlist_type {}/vod \
         {}/720p_%03d.m3u8 {}/720p.m3u8", input, hls_path, hls_path, hls_path);
-    run_command(&command);
+    run_command(&command)?;
     Ok(())
 }

src/fileio.rs

@@ -1,23 +1,24 @@
 use crate::metadata::*;
-use std::fs;
 use std::fs::File;
 use std::io::Write;
+use std::{fs, io};
 
 pub fn file_to_hyphen(name: &str) -> String {
     name.replace(['_', ' ', '.'], "-")
 }
 
-pub fn write_metadata(data: &OutputMetadata) {
+pub fn write_metadata(data: &OutputMetadata) -> io::Result<()> {
     let directory = file_to_hyphen(&data.title);
 
     if fs::metadata(&directory).is_err() {
-        fs::create_dir(&directory).unwrap();
+        fs::create_dir(&directory)?;
     }
 
-    let json = serde_json::to_string(&data).unwrap();
+    let json = serde_json::to_string(&data)?;
     let outpath = format!("{}/{}.json", &directory, data.title);
-    let mut file = File::create(outpath).unwrap();
-    file.write_all(json.as_bytes()).unwrap();
+    let mut file = File::create(outpath)?;
+    file.write_all(json.as_bytes())?;
+    Ok(())
 }
 
 #[test]
@@ -33,7 +34,11 @@ fn write_metadata_test() {
         ..Default::default()
     };
 
-    write_metadata(&output_metadata);
+    let result = write_metadata(&output_metadata);
+    match result {
+        Ok(()) => {}
+        Err(e) => panic!("Failed to write metadata file: {}", e),
+    }
 
     let file = File::open("temp/temp.json").expect("error opening file");
     let reader = std::io::BufReader::new(file);

src/main.rs

@@ -102,7 +102,7 @@ fn main() -> io::Result<()> {
 
     let out = media_info::get_media_info(input);
     println!("{:#?}", &out);
-    fileio::write_metadata(&out);
+    fileio::write_metadata(&out)?;
 
     let path = format!("./{}", file_to_hyphen(&out.title));