better-ffmpeg-progress 5.4.0__tar.gz → 5.4.2__tar.gz

{better_ffmpeg_progress-5.4.0 → better_ffmpeg_progress-5.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-ffmpeg-progress
-Version: 5.4.0
+Version: 5.4.2
 Summary: Run FFmpeg & see percentage progress + ETA.
 Home-page: https://github.com/CrypticSignal/better-ffmpeg-progress
 Author: GitHub.com/CrypticSignal

{better_ffmpeg_progress-5.4.0 → better_ffmpeg_progress-5.4.2}/better_ffmpeg_progress/better_ffmpeg_progress.py

@@ -1,6 +1,7 @@
 import math
 import os
 import re
+import shlex
 from pathlib import Path
 import subprocess
 from sys import exit
@@ -17,7 +18,6 @@ from .utils import (
     validate_ffmpeg_command,
     get_media_duration,
     get_expected_output_duration,
-    check_shell_needed_for_command,
     is_lavfi_input,
 )
 from .terminate_process import terminate_ffmpeg_process
@@ -191,22 +191,7 @@ class FfmpegProcess:
         print_command: bool = False,
     ) -> None:
         if print_command:
-            cmd_str = (
-                " ".join(self._ffmpeg_command)
-                if isinstance(self._ffmpeg_command, list)
-                else self._ffmpeg_command
-            )
-            print(f"Executing: {cmd_str}")
-
-        self._shell_needed = check_shell_needed_for_command(
-            self._ffmpeg_command
-            if isinstance(self._ffmpeg_command, list)
-            else [self._ffmpeg_command]
-        )
-
-        current_ffmpeg_command = self._ffmpeg_command
-        if self._shell_needed and isinstance(current_ffmpeg_command, list):
-            current_ffmpeg_command = " ".join(current_ffmpeg_command)
+            print(f"Executing: {shlex.join(self._ffmpeg_command)}")
 
         try:
             creationflags = 0
@@ -221,16 +206,14 @@ class FfmpegProcess:
                     encoding="utf-8",
                 ) as f:
                     self._process = subprocess.Popen(
-                        current_ffmpeg_command,
-                        shell=self._shell_needed,
+                        self._ffmpeg_command,
                         stdout=subprocess.PIPE,
                         stderr=f,
                         creationflags=creationflags,
                     )
             else:
                 self._process = subprocess.Popen(
-                    current_ffmpeg_command,
-                    shell=self._shell_needed,
+                    self._ffmpeg_command,
                     stdout=subprocess.PIPE,
                     stderr=self._ffmpeg_log_file,
                     creationflags=creationflags,

{better_ffmpeg_progress-5.4.0 → better_ffmpeg_progress-5.4.2}/better_ffmpeg_progress/progress_bars.py

@@ -27,8 +27,21 @@ _MAX_FILENAME_LENGTH = 60
 
 
 def _format_size(current_size_mb: float, estimated_size_mb: Optional[float]) -> str:
-    estimate = f"~{estimated_size_mb:.2f} MB" if estimated_size_mb is not None else "~? MB"
-    return f"({current_size_mb:.2f} MB / {estimate})"
+    """
+    Returns e.g. "(3.25 MB / ~14.33 MB)", "(3.25 MB)" while there is no estimate yet, or ""
+    if FFmpeg has not reported a size (e.g. at the start, or when the output is "-f null").
+    """
+    # Also hide sizes that would display as "0.00 MB", such as a container header of a few bytes.
+    if round(current_size_mb, 2) <= 0:
+        return ""
+    if estimated_size_mb is None:
+        return f"({current_size_mb:.2f} MB)"
+    return f"({current_size_mb:.2f} MB / ~{estimated_size_mb:.2f} MB)"
+
+
+def _with_size(text: str, current_size_mb: float, estimated_size_mb: Optional[float]) -> str:
+    size = _format_size(current_size_mb, estimated_size_mb)
+    return f"{text} {size}" if size else text
 
 
 def use_rich(ffmpeg_process_instance: "FfmpegProcess", process: subprocess.Popen) -> None:
@@ -75,8 +88,9 @@ def use_rich(ffmpeg_process_instance: "FfmpegProcess", process: subprocess.Popen
                     update_progress(
                         task_id,
                         completed=progress_val_secs,
-                        description=f"Processing {input_filename} "
-                        f"{_format_size(current_size_mb, estimated_size_mb)}",
+                        description=_with_size(
+                            f"Processing {input_filename}", current_size_mb, estimated_size_mb
+                        ),
                     )
         else:
             print(f"Processing '{input_filename}'...")
@@ -93,7 +107,9 @@ def use_rich(ffmpeg_process_instance: "FfmpegProcess", process: subprocess.Popen
                 )
                 update_progress(
                     task_id,
-                    description=f"✓ Processed '{input_filename}' ({current_size_mb:.2f} MB)",
+                    description=_with_size(
+                        f"✓ Processed '{input_filename}'", current_size_mb, None
+                    ),
                 )
         else:
             if task_id is not None:
@@ -152,7 +168,7 @@ def use_tqdm(ffmpeg_process_instance: "FfmpegProcess", process: subprocess.Popen
         if progress_bar:
             progress_bar.n = duration_secs
             progress_bar.set_description(f"✓ Processed '{input_filename}'")
-            progress_bar.set_postfix_str(f"{current_size_mb:.2f} MB")
+            progress_bar.set_postfix_str(_format_size(current_size_mb, None))
             progress_bar.close()
         else:
             print(f"✓ Processed '{input_filename}'")

{better_ffmpeg_progress-5.4.0 → better_ffmpeg_progress-5.4.2}/better_ffmpeg_progress/utils.py

@@ -117,16 +117,6 @@ def get_media_duration(input_file: str) -> Optional[float]:
         return None
 
 
-def check_shell_needed_for_command(command: List[str]) -> bool:
-    """
-    Checks if any part of the command contains shell operators,
-    indicating that shell=True might be needed for subprocess.Popen.
-    This is a basic check and might not cover all edge cases.
-    """
-    shell_operators = {"|", ">", "<", ">>", "&&", "||"}  # Basic set
-    return any(op in item for item in command for op in shell_operators)
-
-
 def parse_ffmpeg_progress_line(
     line: bytes, total_duration_secs: Optional[float]
 ) -> Optional[float]:

{better_ffmpeg_progress-5.4.0 → better_ffmpeg_progress-5.4.2}/better_ffmpeg_progress.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-ffmpeg-progress
-Version: 5.4.0
+Version: 5.4.2
 Summary: Run FFmpeg & see percentage progress + ETA.
 Home-page: https://github.com/CrypticSignal/better-ffmpeg-progress
 Author: GitHub.com/CrypticSignal

{better_ffmpeg_progress-5.4.0 → better_ffmpeg_progress-5.4.2}/setup.py

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