better-ffmpeg-progress 2.3.1__tar.gz → 2.4.1__tar.gz

{better_ffmpeg_progress-2.3.1 → better_ffmpeg_progress-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-ffmpeg-progress
-Version: 2.3.1
+Version: 2.4.1
 Summary: Run FFmpeg & see percentage progress + ETA.
 Home-page: https://github.com/CrypticSignal/better-ffmpeg-progress
 Author: GitHub.com/CrypticSignal
@@ -168,3 +168,7 @@ The `run` method takes the following **optional** arguments:
 [29/10/2024]
 - [v2.3.0] Set `shell=True` to support piping.
 - [v2.3.1] Kill FFmpeg process(es) on KeyboardInterrupt
+
+[31/10/2024]
+- [v2.4.0] Print FFmpeg stderr if better progress information cannot be shown.
+- [v2.4.0] Flush the stream when printing FFmpeg stderr to ensure that it is printed immediately.

{better_ffmpeg_progress-2.3.1 → better_ffmpeg_progress-2.4.1}/README.md

@@ -149,4 +149,8 @@ The `run` method takes the following **optional** arguments:
 
 [29/10/2024]
 - [v2.3.0] Set `shell=True` to support piping.
-- [v2.3.1] Kill FFmpeg process(es) on KeyboardInterrupt
+- [v2.3.1] Kill FFmpeg process(es) on KeyboardInterrupt
+
+[31/10/2024]
+- [v2.4.0] Print FFmpeg stderr if better progress information cannot be shown.
+- [v2.4.0] Flush the stream when printing FFmpeg stderr to ensure that it is printed immediately.

{better_ffmpeg_progress-2.3.1 → better_ffmpeg_progress-2.4.1}/better_ffmpeg_progress/better_ffmpeg_progress.py

@@ -79,15 +79,11 @@ class FfmpegProcess:
                 )
 
             # -progress pipe:1 sends progress metrics to stdout AND -stats_period sets the period at which encoding progress/statistics are updated
-            # -nostats disables encoding progress/statistics in stderr
-            self._ffmpeg_args.extend(
-                ["-progress", "pipe:1", "-stats_period", "0.1", "-nostats"]
-            )
+            self._ffmpeg_args.extend(["-progress", "pipe:1", "-stats_period", "0.1"])
         except Exception:
             print(
-                f"Could not detect the duration of {self._input_filepath.name}. Percentage progress, ETA and estimated filesize will be unavailable."
+                f"Could not detect the duration of '{self._input_filepath.name}'. Percentage progress, ETA and estimated filesize will be unavailable.\n",
             )
-            self._duration_secs = None
 
     def _check_output_exists(self) -> bool:
         """Check if output file exists and handle overwrite prompt."""
@@ -165,7 +161,9 @@ class FfmpegProcess:
         if is_error:
             return
 
-        print(f"FFmpeg log written to: {log_file}")
+        print(
+            f"{"\n\n" if self._duration_secs is None else ""}FFmpeg log filename: {log_file}"
+        )
 
     def _start_process(
         self,
@@ -173,12 +171,7 @@ class FfmpegProcess:
         task_id: Optional[int],
         progress_handler: Optional[Callable],
     ) -> None:
-        # Windows
-        if os.name == "nt":
-            creationflags = subprocess.CREATE_NEW_PROCESS_GROUP
-        # macOS and Linux
-        else:
-            creationflags = 0
+        creationflags = subprocess.CREATE_NEW_PROCESS_GROUP if os.name == "nt" else 0
 
         process = subprocess.Popen(
             self._ffmpeg_args,
@@ -199,43 +192,50 @@ class FfmpegProcess:
 
         try:
             while process.poll() is None:
-                try:
-                    stdout = stdout_queue.get_nowait()
+                if self._duration_secs is not None:
+                    try:
+                        stdout = stdout_queue.get_nowait()
 
-                    if stdout:
-                        metric, value = stdout.split("=")
-
-                        if (
-                            metric in self.WANTED_METRICS
-                            and value
-                            and "N/A" not in value
-                        ):
-                            self._update_metrics(
-                                stdout, metric, value, progress_handler
-                            )
+                        if stdout:
+                            metric, value = stdout.split("=")
 
                             if (
-                                metric == "out_time_ms"
-                                and progress_bar
-                                and task_id is not None
+                                metric in self.WANTED_METRICS
+                                and value
+                                and "N/A" not in value
                             ):
-                                progress_bar.update(
-                                    task_id,
-                                    completed=self._metrics.seconds_processed,
-                                    speed=self._metrics.speed,
+                                self._update_metrics(
+                                    stdout, metric, value, progress_handler
                                 )
-                except Empty:
-                    pass
+
+                                if (
+                                    metric == "out_time_ms"
+                                    and progress_bar
+                                    and task_id is not None
+                                ):
+                                    progress_bar.update(
+                                        task_id,
+                                        completed=self._metrics.seconds_processed,
+                                        speed=self._metrics.speed,
+                                    )
+                    except Empty:
+                        pass
 
                 try:
                     stderr = stderr_queue.get_nowait()
+
+                    if self._duration_secs is None:
+                        print(stderr, end="\r", flush=True)
+
                     self._ffmpeg_stderr.append(stderr)
                 except Empty:
                     pass
 
         except KeyboardInterrupt:
             self._kill_process_and_children(process.pid)
-            sys.exit("[KeyboardInterrupt] FFmpeg process(es) killed.")
+            sys.exit(
+                f"{"\n" if self._duration_secs is None else ""}[KeyboardInterrupt] FFmpeg process(es) killed."
+            )
 
         return process.returncode
 
@@ -258,7 +258,9 @@ class FfmpegProcess:
         if not self._check_output_exists():
             return
 
-        print(f"Executing: {' '.join(self._ffmpeg_args)}")
+        print(
+            f"Executing: {' '.join(self._ffmpeg_args)}{"\n" if self._duration_secs is None else ""}"
+        )
 
         if self._duration_secs and not progress_handler:
             with Progress(
@@ -314,7 +316,9 @@ class FfmpegProcess:
         if success_handler:
             success_handler()
         else:
-            print("FFmpeg process completed.")
+            print(
+                f"{"\n" if self._duration_secs is None else ""}FFmpeg process completed."
+            )
 
     def _kill_process_and_children(self, proc_pid):
         try:

{better_ffmpeg_progress-2.3.1 → better_ffmpeg_progress-2.4.1}/better_ffmpeg_progress.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-ffmpeg-progress
-Version: 2.3.1
+Version: 2.4.1
 Summary: Run FFmpeg & see percentage progress + ETA.
 Home-page: https://github.com/CrypticSignal/better-ffmpeg-progress
 Author: GitHub.com/CrypticSignal
@@ -168,3 +168,7 @@ The `run` method takes the following **optional** arguments:
 [29/10/2024]
 - [v2.3.0] Set `shell=True` to support piping.
 - [v2.3.1] Kill FFmpeg process(es) on KeyboardInterrupt
+
+[31/10/2024]
+- [v2.4.0] Print FFmpeg stderr if better progress information cannot be shown.
+- [v2.4.0] Flush the stream when printing FFmpeg stderr to ensure that it is printed immediately.

{better_ffmpeg_progress-2.3.1 → better_ffmpeg_progress-2.4.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as f:
 
 setuptools.setup(
     name="better-ffmpeg-progress",
-    version="2.3.1",
+    version="2.4.1",
     author="GitHub.com/CrypticSignal",
     author_email="theaudiophile@outlook.com",
     description="Run FFmpeg & see percentage progress + ETA.",