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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: better-ffmpeg-progress
-Version: 5.3.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
@@ -108,6 +108,29 @@ process = FfmpegProcess(
 process.run()
 ```
 
+## Generated (lavfi) Inputs
+Inputs generated by FFmpeg's [lavfi](https://ffmpeg.org/ffmpeg-devices.html#lavfi) device, such as test patterns, are supported. FFprobe cannot detect the duration of these inputs, so provide it with `duration_override`:
+
+```python
+from better_ffmpeg_progress import FfmpegProcess
+
+command = [
+    "ffmpeg",
+    "-f",
+    "lavfi",
+    "-i",
+    "testsrc2=duration=30:size=1920x1080:rate=30",
+    "-c:v",
+    "libx264",
+    "output.mp4",
+]
+
+process = FfmpegProcess(command, duration_override=30)
+process.run()
+```
+
+By default, the FFmpeg log file is named after the source, e.g. `lavfi_testsrc2_ffmpeg_log.txt`.
+
 ## Optional Arguments
 An instance of `FfmpegProcess` accepts the following optional arguments:
 * `ffmpeg_log_level` — Set a value for FFmpeg's `-loglevel` option. Default: `"verbose"`.

{better_ffmpeg_progress-5.3.0 → better_ffmpeg_progress-5.4.1}/README.md

@@ -89,6 +89,29 @@ process = FfmpegProcess(
 process.run()
 ```
 
+## Generated (lavfi) Inputs
+Inputs generated by FFmpeg's [lavfi](https://ffmpeg.org/ffmpeg-devices.html#lavfi) device, such as test patterns, are supported. FFprobe cannot detect the duration of these inputs, so provide it with `duration_override`:
+
+```python
+from better_ffmpeg_progress import FfmpegProcess
+
+command = [
+    "ffmpeg",
+    "-f",
+    "lavfi",
+    "-i",
+    "testsrc2=duration=30:size=1920x1080:rate=30",
+    "-c:v",
+    "libx264",
+    "output.mp4",
+]
+
+process = FfmpegProcess(command, duration_override=30)
+process.run()
+```
+
+By default, the FFmpeg log file is named after the source, e.g. `lavfi_testsrc2_ffmpeg_log.txt`.
+
 ## Optional Arguments
 An instance of `FfmpegProcess` accepts the following optional arguments:
 * `ffmpeg_log_level` — Set a value for FFmpeg's `-loglevel` option. Default: `"verbose"`.

{better_ffmpeg_progress-5.3.0 → better_ffmpeg_progress-5.4.1}/better_ffmpeg_progress/better_ffmpeg_progress.py

@@ -1,5 +1,7 @@
 import math
 import os
+import re
+import shlex
 from pathlib import Path
 import subprocess
 from sys import exit
@@ -16,7 +18,7 @@ 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
 from .progress_bars import use_rich, use_tqdm
@@ -112,7 +114,14 @@ class FfmpegProcess:
         self._output_filepath = Path(command[-1])
 
         if ffmpeg_log_file is None:
-            self._ffmpeg_log_file = Path(f"{self._input_filepath.name}_ffmpeg_log.txt")
+            if is_lavfi_input(command, input_file_index):
+                # A filtergraph such as "testsrc2=size=1920x1080" can contain characters that
+                # are not valid in filenames (e.g. ":" on Windows), so name the log after the
+                # source instead.
+                source_name = re.sub(r"[^\w.,-]", "_", input_file_path_str.split("=", 1)[0])
+                self._ffmpeg_log_file = Path(f"lavfi_{source_name}_ffmpeg_log.txt")
+            else:
+                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:
@@ -182,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
@@ -212,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.3.0 → better_ffmpeg_progress-5.4.1}/better_ffmpeg_progress/utils.py

@@ -15,6 +15,14 @@ _BYTES_PER_MB = 1024 * 1024
 _MULTIPLIER = 1e-6
 
 
+def is_lavfi_input(command: List[str], input_flag_pos: int) -> bool:
+    """
+    Returns True if the input at input_flag_pos is preceded by "-f lavfi", meaning it is a
+    filtergraph (e.g. "testsrc2=duration=30") generated by FFmpeg rather than a file or URL.
+    """
+    return command[max(input_flag_pos - 2, 0) : input_flag_pos] == ["-f", "lavfi"]
+
+
 def validate_ffmpeg_command(command: List[str]) -> None:
     """
     Validates the FFmpeg command.
@@ -54,8 +62,10 @@ def validate_ffmpeg_command(command: List[str]) -> None:
             f"Input file path '{input_file}' looks like an option flag. Please check your command."
         )
 
-    # Validate input file/URL
-    if input_file.startswith("http://") or input_file.startswith("https://"):
+    # Validate input file/URL. lavfi inputs are generated by FFmpeg, so there is nothing to check.
+    if is_lavfi_input(command, input_flag_pos):
+        pass
+    elif input_file.startswith("http://") or input_file.startswith("https://"):
         try:
             response = requests.head(input_file, timeout=5, allow_redirects=True)
             response.raise_for_status()
@@ -107,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.3.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.3.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
@@ -108,6 +108,29 @@ process = FfmpegProcess(
 process.run()
 ```
 
+## Generated (lavfi) Inputs
+Inputs generated by FFmpeg's [lavfi](https://ffmpeg.org/ffmpeg-devices.html#lavfi) device, such as test patterns, are supported. FFprobe cannot detect the duration of these inputs, so provide it with `duration_override`:
+
+```python
+from better_ffmpeg_progress import FfmpegProcess
+
+command = [
+    "ffmpeg",
+    "-f",
+    "lavfi",
+    "-i",
+    "testsrc2=duration=30:size=1920x1080:rate=30",
+    "-c:v",
+    "libx264",
+    "output.mp4",
+]
+
+process = FfmpegProcess(command, duration_override=30)
+process.run()
+```
+
+By default, the FFmpeg log file is named after the source, e.g. `lavfi_testsrc2_ffmpeg_log.txt`.
+
 ## Optional Arguments
 An instance of `FfmpegProcess` accepts the following optional arguments:
 * `ffmpeg_log_level` — Set a value for FFmpeg's `-loglevel` option. Default: `"verbose"`.

{better_ffmpeg_progress-5.3.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.3.0",
+    version="5.4.1",
     author="GitHub.com/CrypticSignal",
     author_email="theaudiophile@outlook.com",
     description="Run FFmpeg & see percentage progress + ETA.",