better-ffmpeg-progress 4.0.1__tar.gz → 5.0.0__tar.gz

{better_ffmpeg_progress-4.0.1 → better_ffmpeg_progress-5.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-ffmpeg-progress
-Version: 4.0.1
+Version: 5.0.0
 Summary: Run FFmpeg & see percentage progress + ETA.
 Home-page: https://github.com/CrypticSignal/better-ffmpeg-progress
 Author: GitHub.com/CrypticSignal
@@ -61,13 +61,13 @@ from better_ffmpeg_progress import FfmpegProcess, FfmpegProcessError
 command = [
     "ffmpeg",
     "-i",
-    "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
-    "-c:v",
+    "https://media.xiph.org/video/derf/y4m/ducks_take_off_1080p50.y4m",
+    "-map", 
+    "0:V",
+    "-c:V",
     "libx264",
     "-preset",
     "ultrafast",
-    "-c:a",
-    "copy",
     "-f",
     "null",
     "-",
@@ -78,11 +78,7 @@ try:
     # Uncomment the line below if you want to use tqdm instead of rich for the progress bar
     # process.use_tqdm = True
 
-    # Run the FFmpeg command and show a progress bar
     process.run()
-    # The FFmpeg process failed if the return code is not 0
-    if process.return_code != 0:
-        pass
 except FfmpegProcessError as e:
     print(f"An error occurred when running the better-ffmpeg-process package:\n{e}")
 ```

{better_ffmpeg_progress-4.0.1 → better_ffmpeg_progress-5.0.0}/README.md

@@ -42,13 +42,13 @@ from better_ffmpeg_progress import FfmpegProcess, FfmpegProcessError
 command = [
     "ffmpeg",
     "-i",
-    "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
-    "-c:v",
+    "https://media.xiph.org/video/derf/y4m/ducks_take_off_1080p50.y4m",
+    "-map", 
+    "0:V",
+    "-c:V",
     "libx264",
     "-preset",
     "ultrafast",
-    "-c:a",
-    "copy",
     "-f",
     "null",
     "-",
@@ -59,11 +59,7 @@ try:
     # Uncomment the line below if you want to use tqdm instead of rich for the progress bar
     # process.use_tqdm = True
 
-    # Run the FFmpeg command and show a progress bar
     process.run()
-    # The FFmpeg process failed if the return code is not 0
-    if process.return_code != 0:
-        pass
 except FfmpegProcessError as e:
     print(f"An error occurred when running the better-ffmpeg-process package:\n{e}")
 ```

{better_ffmpeg_progress-4.0.1 → better_ffmpeg_progress-5.0.0}/better_ffmpeg_progress/better_ffmpeg_progress.py

@@ -57,7 +57,7 @@ class FfmpegProcess:
         self,
         command: List[str],
         ffmpeg_log_level: Optional[Union[FfmpegLogLevel, str]] = None,
-        ffmpeg_log_file: Optional[Union[str, Path]] = None,
+        ffmpeg_log_file: Optional[Union[str, os.PathLike]] = None,
         print_detected_duration: bool = False,
     ):
         # Raises FfmpegCommandError if the command is invalid
@@ -91,9 +91,13 @@ class FfmpegProcess:
         # Assumes last argument is output
         self._output_filepath = Path(command[-1])
 
-        self._ffmpeg_log_file = Path(
-            ffmpeg_log_file or f"{self._input_filepath.name}_ffmpeg_log.txt"
-        )
+        if ffmpeg_log_file is None:
+            self._ffmpeg_log_file = Path(f"{self._input_filepath.name}_ffmpeg_log.txt")
+        elif isinstance(ffmpeg_log_file, (str, os.PathLike)):
+            self._ffmpeg_log_file = Path(ffmpeg_log_file)
+        else:
+            self._ffmpeg_log_file = ffmpeg_log_file
+
         self._print_detected_duration = print_detected_duration
         self._duration_secs = get_media_duration(input_file_path_str)
 
@@ -123,13 +127,12 @@ class FfmpegProcess:
             self._handle_overwrite_prompt()
 
         self._process: Optional[subprocess.Popen] = None
-        self._return_code: Optional[int] = None
         self.use_tqdm: bool = False
 
     def run(
         self,
         print_command: bool = False,
-    ) -> int:
+    ) -> None:
         if print_command:
             cmd_str = (
                 " ".join(self._ffmpeg_command)
@@ -148,42 +151,48 @@ class FfmpegProcess:
         if self._shell_needed and isinstance(current_ffmpeg_command, list):
             current_ffmpeg_command = " ".join(current_ffmpeg_command)
 
-        self._return_code = 1
-
         try:
-            with open(self._ffmpeg_log_file, "w", encoding="utf-8") as f:
-                creationflags = 0
-
-                if os.name == "nt":
-                    creationflags = subprocess.CREATE_NEW_PROCESS_GROUP
-
+            creationflags = 0
+            # Windows
+            if os.name == "nt":
+                creationflags = subprocess.CREATE_NEW_PROCESS_GROUP
+
+            if isinstance(self._ffmpeg_log_file, Path):
+                with open(self._ffmpeg_log_file, "w", encoding="utf-8") as f:
+                    self._process = subprocess.Popen(
+                        current_ffmpeg_command,
+                        shell=self._shell_needed,
+                        stdout=subprocess.PIPE,
+                        stderr=f,
+                        creationflags=creationflags,
+                    )
+            else:
                 self._process = subprocess.Popen(
                     current_ffmpeg_command,
                     shell=self._shell_needed,
                     stdout=subprocess.PIPE,
-                    stderr=f,
+                    stderr=self._ffmpeg_log_file,
                     creationflags=creationflags,
                 )
         except Exception as e:
-            # self._return_code remains None as the process didn't start
             raise FfmpegProcessError(f"Error starting FFmpeg process: {e}") from e
 
+        user_interrupted = False
         try:
             if self.use_tqdm:
-                self._return_code = use_tqdm(self, self._process)
+                use_tqdm(self, self._process)
             else:
-                self._return_code = use_rich(self, self._process)
+                use_rich(self, self._process)
         except KeyboardInterrupt:
+            user_interrupted = True
             self._terminate()
-            self._return_code = 1
         finally:
             if self._process:
-                self._return_code = self._process.returncode
-
                 if self._process.stdout:
                     self._process.stdout.close()
 
-        return self._return_code
+        if not user_interrupted and self._process and self._process.returncode != 0:
+            raise FfmpegProcessError(f"FFmpeg process failed. Return code: {self._process.returncode}")
 
     def _terminate(self):
         if self._process:
@@ -191,10 +200,3 @@ class FfmpegProcess:
         else:
             exit()
 
-    @property
-    def return_code(self) -> Optional[int]:
-        """
-        The return code of the FFmpeg process.
-        None if the process has not started or failed to start.
-        """
-        return self._return_code

{better_ffmpeg_progress-4.0.1 → better_ffmpeg_progress-5.0.0}/better_ffmpeg_progress/terminate_process.py

@@ -196,6 +196,8 @@ def terminate_ffmpeg_process(process: Optional[subprocess.Popen]):
     if not process or process.poll() is not None:
         return
 
+    print("[KeyboardInterrupt] Terminating the FFmpeg process...")
+
     original_pid = process.pid
 
     parent_ps_proc: Optional[psutil.Process] = None
@@ -219,8 +221,6 @@ def terminate_ffmpeg_process(process: Optional[subprocess.Popen]):
                 print(f"Error during fallback Popen termination: {popen_term_err}")
         return
 
-    print("[better-ffmpeg-progress] Terminating the FFmpeg process...")
-
     if parent_ps_proc:
         _terminate_children_processes(parent_ps_proc)
 

{better_ffmpeg_progress-4.0.1 → better_ffmpeg_progress-5.0.0}/better_ffmpeg_progress.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-ffmpeg-progress
-Version: 4.0.1
+Version: 5.0.0
 Summary: Run FFmpeg & see percentage progress + ETA.
 Home-page: https://github.com/CrypticSignal/better-ffmpeg-progress
 Author: GitHub.com/CrypticSignal
@@ -61,13 +61,13 @@ from better_ffmpeg_progress import FfmpegProcess, FfmpegProcessError
 command = [
     "ffmpeg",
     "-i",
-    "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
-    "-c:v",
+    "https://media.xiph.org/video/derf/y4m/ducks_take_off_1080p50.y4m",
+    "-map", 
+    "0:V",
+    "-c:V",
     "libx264",
     "-preset",
     "ultrafast",
-    "-c:a",
-    "copy",
     "-f",
     "null",
     "-",
@@ -78,11 +78,7 @@ try:
     # Uncomment the line below if you want to use tqdm instead of rich for the progress bar
     # process.use_tqdm = True
 
-    # Run the FFmpeg command and show a progress bar
     process.run()
-    # The FFmpeg process failed if the return code is not 0
-    if process.return_code != 0:
-        pass
 except FfmpegProcessError as e:
     print(f"An error occurred when running the better-ffmpeg-process package:\n{e}")
 ```

{better_ffmpeg_progress-4.0.1 → better_ffmpeg_progress-5.0.0}/setup.py

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