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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-ffmpeg-progress
-Version: 5.4.0
+Version: 5.4.1
 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.1}/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.1}/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.1}/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.1
 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.1}/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.1",
     author="GitHub.com/CrypticSignal",
     author_email="theaudiophile@outlook.com",
     description="Run FFmpeg & see percentage progress + ETA.",