From 27dd9da6a6ea175c32338a259fe2a177c67a9ae1 Mon Sep 17 00:00:00 2001
From: Jeena <hello@jeena.net>
Date: Mon, 2 Jun 2025 08:10:59 +0900
Subject: [PATCH] Make progress bar show continous progress

---
 src/recoder/transcoder_worker.py | 77 +++++++++++++++++++++++---------
 1 file changed, 57 insertions(+), 20 deletions(-)

diff --git a/src/recoder/transcoder_worker.py b/src/recoder/transcoder_worker.py
index c44ee24..8d7c054 100644
--- a/src/recoder/transcoder_worker.py
+++ b/src/recoder/transcoder_worker.py
@@ -1,23 +1,12 @@
 import os
 import threading
-from gi.repository import GLib
 import subprocess
-
-def transcode_file(input_path, output_dir):
-    os.makedirs(output_dir, exist_ok=True)
-    basename = os.path.basename(input_path)
-    output_path = os.path.join(output_dir, basename)
-
-    cmd = [
-        "ffmpeg", "-y", "-i", input_path,
-        "-c:v", "libx264", "-preset", "fast",
-        "-c:a", "aac", output_path
-    ]
-
-    result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    return result.returncode == 0, output_path
+import re
+from gi.repository import GLib
 
 class TranscoderWorker:
+    TIME_RE = re.compile(r"time=(\d+):(\d+):(\d+)\.(\d+)")
+
     def __init__(self, files, progress_callback=None, done_callback=None):
         self.files = files
         self.progress_callback = progress_callback
@@ -34,20 +23,68 @@ class TranscoderWorker:
 
     def _process_files(self):
         total = len(self.files)
-        for idx, filepath in enumerate(self.files):
+        for idx, filepath in enumerate(self.files, start=1):
             basename = os.path.basename(filepath)
-            self._update_progress(f"Processing {basename} ({idx}/{total})...", idx / total)
+            self._update_progress(f"Starting {basename}", (idx - 1) / total)
 
-            success, output_path = transcode_file(filepath, os.path.join(os.path.dirname(filepath), "transcoded"))
+            success, output_path = self._transcode_file(filepath, os.path.join(os.path.dirname(filepath), "transcoded"), basename, idx, total)
             if not success:
-                self._update_progress(f"Error transcoding {basename}", idx + 1 / total)
+                self._update_progress(f"Error transcoding {basename}", idx / total)
             else:
-                self._update_progress(f"Finished {basename}", idx + 1 / total)
+                self._update_progress(f"Finished {basename}", idx / total)
 
         self.is_processing = False
         self._update_progress("All done!", 1.0)
         self._notify_done()
 
+    def _transcode_file(self, input_path, output_dir, basename, idx, total):
+        os.makedirs(output_dir, exist_ok=True)
+        output_path = os.path.join(output_dir, basename)
+
+        # Get duration of input file
+        duration = self._get_duration(input_path)
+        if duration is None:
+            duration = 1.0  # fallback to avoid division by zero
+
+        cmd = [
+            "ffmpeg", "-y", "-i", input_path,
+            "-c:v", "libx264", "-preset", "fast",
+            "-c:a", "aac", output_path
+        ]
+
+        process = subprocess.Popen(cmd, stderr=subprocess.PIPE, universal_newlines=True)
+
+        while True:
+            line = process.stderr.readline()
+            if not line:
+                break
+
+            match = self.TIME_RE.search(line)
+            if match:
+                hours, minutes, seconds, milliseconds = map(int, match.groups())
+                elapsed = hours * 3600 + minutes * 60 + seconds + milliseconds / 100
+                progress_fraction = min(elapsed / duration, 1.0)
+                overall_fraction = (idx - 1 + progress_fraction) / total
+                self._update_progress(f"Transcoding {basename}", overall_fraction)
+
+        process.wait()
+        success = (process.returncode == 0)
+        return success, output_path
+
+    def _get_duration(self, input_path):
+        # Run ffprobe to get duration in seconds
+        cmd = [
+            "ffprobe", "-v", "error",
+            "-show_entries", "format=duration",
+            "-of", "default=noprint_wrappers=1:nokey=1",
+            input_path
+        ]
+        try:
+            output = subprocess.check_output(cmd, universal_newlines=True)
+            return float(output.strip())
+        except Exception:
+            return None
+
     def _update_progress(self, text, fraction):
         if self.progress_callback:
             GLib.idle_add(self.progress_callback, text, fraction)