better-ffmpeg-progress 2.3.0__tar.gz → 2.4.0__tar.gz

{better_ffmpeg_progress-2.3.0 → better_ffmpeg_progress-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-ffmpeg-progress
-Version: 2.3.0
+Version: 2.4.0
 Summary: Run FFmpeg & see percentage progress + ETA.
 Home-page: https://github.com/CrypticSignal/better-ffmpeg-progress
 Author: GitHub.com/CrypticSignal
@@ -13,6 +13,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ffmpeg-python
+Requires-Dist: psutil
 Requires-Dist: rich
 
 <div align="center">
@@ -166,3 +167,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.

{better_ffmpeg_progress-2.3.0 → better_ffmpeg_progress-2.4.0}/README.md

@@ -148,4 +148,8 @@ The `run` method takes the following **optional** arguments:
 - [v2.2.2] Make printing the detected duration of the input file optional.
 
 [29/10/2024]
-- [v2.3.0] Set `shell=True` to support piping.
+- [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.

{better_ffmpeg_progress-2.3.0 → better_ffmpeg_progress-2.4.0}/better_ffmpeg_progress/better_ffmpeg_progress.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+import os
 from pathlib import Path
 from queue import Empty, Queue
 import subprocess
@@ -7,6 +8,7 @@ from threading import Thread
 from typing import Callable, List, Optional, Union
 
 from ffmpeg import probe
+import psutil
 from rich.progress import (
     Progress,
     TextColumn,
@@ -77,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."""
@@ -163,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,
@@ -171,12 +171,15 @@ class FfmpegProcess:
         task_id: Optional[int],
         progress_handler: Optional[Callable],
     ) -> None:
+        creationflags = subprocess.CREATE_NEW_PROCESS_GROUP if os.name == "nt" else 0
+
         process = subprocess.Popen(
             self._ffmpeg_args,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
             shell=True,
+            creationflags=creationflags,
         )
 
         stdout_queue, stderr_queue = Queue(), Queue()
@@ -187,40 +190,50 @@ class FfmpegProcess:
             target=self._handle_pipe, args=(process.stderr, stderr_queue), daemon=True
         ).start()
 
-        while process.poll() is 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 (
-                            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 "No such file" in stderr:
-                    raise FileNotFoundError(
-                        f"Input file not found: {self._input_filepath}"
-                    )
-
-                self._ffmpeg_stderr.append(stderr)
-            except Empty:
-                pass
+        try:
+            while process.poll() is None:
+                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 (
+                                    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")
+
+                    self._ffmpeg_stderr.append(stderr)
+                except Empty:
+                    pass
+
+        except KeyboardInterrupt:
+            self._kill_process_and_children(process.pid)
+            sys.exit("[KeyboardInterrupt] FFmpeg process(es) killed.")
 
         return process.returncode
 
@@ -243,7 +256,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(
@@ -299,4 +314,16 @@ 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:
+            process = psutil.Process(proc_pid)
+            for child in process.children(recursive=True):
+                child.terminate()
+            # Terminate the main process
+            process.terminate()
+        except psutil.NoSuchProcess:
+            pass

{better_ffmpeg_progress-2.3.0 → better_ffmpeg_progress-2.4.0}/better_ffmpeg_progress.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-ffmpeg-progress
-Version: 2.3.0
+Version: 2.4.0
 Summary: Run FFmpeg & see percentage progress + ETA.
 Home-page: https://github.com/CrypticSignal/better-ffmpeg-progress
 Author: GitHub.com/CrypticSignal
@@ -13,6 +13,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ffmpeg-python
+Requires-Dist: psutil
 Requires-Dist: rich
 
 <div align="center">
@@ -166,3 +167,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.

{better_ffmpeg_progress-2.3.0 → better_ffmpeg_progress-2.4.0}/better_ffmpeg_progress.egg-info/requires.txt

@@ -1,2 +1,3 @@
 ffmpeg-python
+psutil
 rich

{better_ffmpeg_progress-2.3.0 → better_ffmpeg_progress-2.4.0}/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.0",
+    version="2.4.0",
     author="GitHub.com/CrypticSignal",
     author_email="theaudiophile@outlook.com",
     description="Run FFmpeg & see percentage progress + ETA.",
@@ -13,7 +13,7 @@ setuptools.setup(
     long_description_content_type="text/markdown",
     url="https://github.com/CrypticSignal/better-ffmpeg-progress",
     packages=["better_ffmpeg_progress"],
-    install_requires=["ffmpeg-python", "rich"],
+    install_requires=["ffmpeg-python", "psutil", "rich"],
     python_requires=">=3.7",
     keywords=["ffmpeg", "progress"],
     classifiers=[