fix: move file paths into main function

Author: icecreammatt

src/ffmpeg.rs

@@ -20,8 +20,8 @@ fn run_command(command: &str) {
     println!("{}", result);
 }
 
-pub fn create_preview_gif(input: &str, output: &str) {
-    let path = format!("{}/gif", output);
+pub fn create_preview_gif(input: &str, subpath: &str, output: &str) {
+    let path = format!("{}/{}", output, subpath);
     if fs::metadata(&path).is_err() {
         fs::create_dir_all(&path).unwrap();
     }
@@ -33,8 +33,8 @@ pub fn create_preview_gif(input: &str, output: &str) {
     run_command(&command);
 }
 
-pub fn create_preview_image(input: &str, output: &str) {
-    let path = format!("{}/lg", output);
+pub fn create_preview_image(input: &str, subpath: &str, output: &str) {
+    let path = format!("{}/{}", output, subpath);
     if fs::metadata(&path).is_err() {
         fs::create_dir_all(&path).unwrap();
     }
@@ -47,10 +47,10 @@ pub fn create_preview_image(input: &str, output: &str) {
     run_command(&command);
 }
 
-pub fn create_thumbnails(input: &str, output: &str) {
+pub fn create_thumbnails(input: &str, subpath: &str, output: &str) {
     println!("\ncreate_thumbnails");
 
-    let thumbs_path = format!("{}/thumbs", output);
+    let thumbs_path = format!("{}/{}", output, subpath);
 
     println!("Path: {}", thumbs_path);
     if fs::metadata(&thumbs_path).is_err() {
@@ -65,11 +65,13 @@ pub fn create_thumbnails(input: &str, output: &str) {
     run_command(&command);
 }
 
-pub fn create_hls_encoding(input: &str, output: &str) {
+pub fn create_hls_encoding(input: &str, subpath: &str, output: &str) {
     println!("\npub create_hls_encoding");
 
-    if fs::metadata(output).is_err() {
-        fs::create_dir_all(output).unwrap();
+    let hls_path = format!("{}/{}", output, subpath);
+
+    if fs::metadata(&hls_path).is_err() {
+        fs::create_dir_all(&hls_path).unwrap();
     }
 
     // TODO: Sub add paths
@@ -91,7 +93,7 @@ pub fn create_hls_encoding(input: &str, output: &str) {
         -window_size 0 -adaptation_sets \"id=0,streams=v id=1,streams=a\" -hls_playlist 1 -seg_duration 4 \
         -streaming 0 -f dash \
         -hls_segment_filename \
-         -hls_playlist_type {}/vod \
-         {}/720p_%03d.m3u8 {}/720p.m3u8", input, output, output, output);
+        -hls_playlist_type {}/vod \
+        {}/720p_%03d.m3u8 {}/720p.m3u8", input, hls_path, hls_path, hls_path);
     run_command(&command);
 }

src/main.rs

@@ -108,22 +108,22 @@ fn main() {
 
     let gen_thumbs = matches.is_present(Flags::Thumbnails.as_str());
     if gen_thumbs {
-        create_thumbnails(&out.file_name, &path);
+        create_thumbnails(&out.file_name, "thumbs", &path);
     }
 
     let gen_preview_image = matches.is_present(Flags::PreviewImage.as_str());
     if gen_preview_image {
-        create_preview_image(&out.file_name, &path);
+        create_preview_image(&out.file_name, "lg", &path);
     }
 
     let gen_hls = matches.is_present(Flags::Hls.as_str());
     if gen_hls {
-        create_hls_encoding(&out.file_name, &path);
+        create_hls_encoding(&out.file_name, "hls", &path);
     }
 
     let gen_gif = matches.is_present(Flags::Gif.as_str());
     if gen_gif {
-        create_preview_gif(&out.file_name, &path);
+        create_preview_gif(&out.file_name, "gif", &path);
     }
 
     /*
@@ -141,7 +141,7 @@ fn main() {
         [x] HLS
         [x] DASH
         xx] Metadata
-    [ ] Move hard coded path out of functions and into main
+    [x] Move hard coded path out of functions and into main
     [ ] Refactor to get rid of unwraps and panics
     [ ] Upload metadata to database
     [ ] Create queue watcher to start running jobs (watches queueu every 5 seconds)