From a5e60ea6b710f2fba403606b512e05a6a96d0721 Mon Sep 17 00:00:00 2001 From: ByteDream Date: Thu, 8 Dec 2022 15:10:53 +0100 Subject: [PATCH] Add generating file cli output --- crunchy-cli-core/src/cli/archive.rs | 4 +++- crunchy-cli-core/src/cli/download.rs | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crunchy-cli-core/src/cli/archive.rs b/crunchy-cli-core/src/cli/archive.rs index e8a5ca2..f9bb6a5 100644 --- a/crunchy-cli-core/src/cli/archive.rs +++ b/crunchy-cli-core/src/cli/archive.rs @@ -307,7 +307,9 @@ impl Execute for Archive { )) } - generate_mkv(&self, path, video_paths, audio_paths, subtitle_paths)? + let _progess_handler = progress!("Generating mkv"); + generate_mkv(&self, path, video_paths, audio_paths, subtitle_paths)?; + info!("Mkv generated") } } diff --git a/crunchy-cli-core/src/cli/download.rs b/crunchy-cli-core/src/cli/download.rs index f90355b..b7093aa 100644 --- a/crunchy-cli-core/src/cli/download.rs +++ b/crunchy-cli-core/src/cli/download.rs @@ -248,7 +248,7 @@ async fn download_ffmpeg(ctx: &Context, download: &Download, variant_data: Varia let (input_presets, output_presets) = FFmpegPreset::ffmpeg_presets(download.ffmpeg_preset.clone())?; - let ffmpeg = Command::new("ffmpeg") + let mut ffmpeg = Command::new("ffmpeg") .stdin(Stdio::piped()) .stdout(Stdio::null()) .stderr(Stdio::piped()) @@ -259,7 +259,11 @@ async fn download_ffmpeg(ctx: &Context, download: &Download, variant_data: Varia .arg(target.to_str().unwrap()) .spawn()?; - download_segments(ctx, &mut ffmpeg.stdin.unwrap(), None, variant_data).await?; + download_segments(ctx, &mut ffmpeg.stdin.take().unwrap(), None, variant_data).await?; + + let _progress_handler = progress!("Generating output file"); + ffmpeg.wait()?; + info!("Output file generated"); Ok(()) }