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

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

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

{better_ffmpeg_progress-5.0.0 → better_ffmpeg_progress-5.1.0}/better_ffmpeg_progress/progress_bars.py

@@ -13,6 +13,7 @@ from rich.progress import (
 from tqdm import tqdm
 
 from .utils import parse_ffmpeg_progress_line
+from .exceptions import FfmpegProcessError
 
 if TYPE_CHECKING:
     from .better_ffmpeg_progress import FfmpegProcess
@@ -20,7 +21,7 @@ if TYPE_CHECKING:
 
 def use_rich(
     ffmpeg_process_instance: "FfmpegProcess", process: subprocess.Popen
-) -> int:
+) -> None:
     task_id = None
     progress_bar_instance = Progress(
         TextColumn("[progress.description]{task.description}"),
@@ -38,7 +39,7 @@ def use_rich(
     with progress_bar_instance as progress_bar:
         if duration_secs:
             task_id = progress_bar.add_task(
-                f"Processing {input_filename}",
+                f"Processing '{input_filename}'",
                 total=duration_secs,
             )
             update_progress = progress_bar.update
@@ -51,12 +52,12 @@ def use_rich(
                 if progress_val_secs is not None and task_id is not None:
                     update_progress(task_id, completed=progress_val_secs)
         else:
-            print(f"Processing {input_filename}...")
+            print(f"Processing '{input_filename}'...")
 
         process.wait()
 
-        if task_id is not None:
-            if process.returncode == 0:
+        if process.returncode == 0:
+            if task_id is not None:
                 update_progress(task_id, completed=duration_secs)
                 progress_bar.columns = (
                     TextColumn("[progress.description]{task.description}"),
@@ -65,23 +66,18 @@ def use_rich(
                 )
                 update_progress(
                     task_id,
-                    description=f"✓ Processed {input_filename}",
+                    description=f"✓ Processed '{input_filename}'",
                 )
-            else:
-                progress_bar.update(
-                    task_id,
-                    description=f"FFmpeg process failed. Check {log_file} for details.",
-                )
-
-        if process.returncode != 0 and task_id is None:
-            print(f"FFmpeg process failed. Check {log_file} for details.")
+        else:
+            if task_id is not None:
+                progress_bar.update(task_id)
 
-        return 1 if process.returncode != 0 else 0
+            raise FfmpegProcessError(f"FFmpeg process failed. Check '{log_file}' for details.")
 
 
 def use_tqdm(
     ffmpeg_process_instance: "FfmpegProcess", process: subprocess.Popen
-) -> int:
+) -> None:
     progress_bar = None
     try:
         width = os.get_terminal_size().columns
@@ -96,7 +92,7 @@ def use_tqdm(
         progress_bar = tqdm(
             mininterval=0.5,
             total=duration_secs,
-            desc=f"Processing {input_filename}",
+            desc=f"Processing '{input_filename}'",
             ncols=80,
             dynamic_ncols=True if width < 80 else False,
             bar_format="{desc} {bar} {percentage:.1f}% [{elapsed}<{remaining}, {rate_fmt}{postfix}]",
@@ -111,20 +107,19 @@ def use_tqdm(
                 progress_bar.n = progress_val_secs
                 progress_bar.refresh()
     else:
-        print(f"Processing {input_filename}...")
+        print(f"Processing '{input_filename}'...")
 
     process.wait()
 
     if process.returncode == 0:
         if progress_bar:
             progress_bar.n = duration_secs
-            progress_bar.set_description(f"✓ Processed {input_filename}")
+            progress_bar.set_description(f"✓ Processed '{input_filename}'")
             progress_bar.close()
         else:
-            print(f"✓ Processed {input_filename}")
+            print(f"✓ Processed '{input_filename}'")
     else:
         if progress_bar:
             progress_bar.close()
-        print(f"FFmpeg process failed. Check {log_file} for details.")
 
-    return 1 if process.returncode != 0 else 0
+        raise FfmpegProcessError(f"FFmpeg process failed. Check '{log_file}' for details.")

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

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

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

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