From fe49161e933e739784393a5ba92e29291025b803 Mon Sep 17 00:00:00 2001
From: bytedream <bytedream@protonmail.com>
Date: Mon, 8 Apr 2024 00:37:19 +0200
Subject: [PATCH] End ffmpeg progress always with at least 100%

---
 crunchy-cli-core/src/utils/download.rs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/crunchy-cli-core/src/utils/download.rs b/crunchy-cli-core/src/utils/download.rs
index d7904f3..cee89e2 100644
--- a/crunchy-cli-core/src/utils/download.rs
+++ b/crunchy-cli-core/src/utils/download.rs
@@ -1285,21 +1285,11 @@ async fn ffmpeg_progress<R: AsyncReadExt + Unpin>(
 
     let reader = BufReader::new(stats);
     let mut lines = reader.lines();
+    let mut frame = 0;
     loop {
         select! {
-            // when gracefully canceling this future, set the progress to 100% (finished). sometimes
-            // ffmpeg is too fast or already finished when the reading process of 'stats' starts
-            // which causes the progress to be stuck at 0%
             _ = cancellation_token.cancelled() => {
-                if let Some(p) = &progress {
-                    p.set_position(total_frames)
-                }
-                debug!(
-                    "Processed frame [{}/{} 100%]",
-                    total_frames,
-                    total_frames
-                );
-                return Ok(())
+                break
             }
             line = lines.next_line() => {
                 let Some(line) = line? else {
@@ -1314,7 +1304,7 @@ async fn ffmpeg_progress<R: AsyncReadExt + Unpin>(
                 let Some(frame_str) = frame_cap.name("frame") else {
                     break
                 };
-                let frame: u64 = frame_str.as_str().parse()?;
+                frame = frame_str.as_str().parse()?;
 
                 if let Some(p) = &progress {
                     p.set_position(frame)
@@ -1330,5 +1320,15 @@ async fn ffmpeg_progress<R: AsyncReadExt + Unpin>(
         }
     }
 
+    // when this future is gracefully cancelled or if ffmpeg is too fast or already finished when
+    // reading process of 'stats' starts (which causes the progress to be stuck at 0%), the progress
+    // is manually set to 100% here
+    if frame < total_frames {
+        if let Some(p) = &progress {
+            p.set_position(frame)
+        }
+        debug!("Processed frame [{}/{} 100%]", total_frames, total_frames);
+    }
+
     Ok(())
 }