plex-generate-previews 2.0.0__py3-none-any.whl → 2.1.1__py3-none-any.whl

plex_generate_previews/cli.py

@@ -40,9 +40,25 @@ class ApplicationState:
     
     def cleanup(self):
         """Perform cleanup operations."""
-        # Restore terminal cursor visibility
+        # Restore terminal cursor visibility using Rich's proper methods
         if self.console:
-            self.console.show_cursor(True)
+            try:
+                # Rich's proper way to restore terminal state
+                self.console.show_cursor(True)
+                # Force Rich to restore the terminal to its original state
+                if hasattr(self.console, '_live'):
+                    self.console._live = None
+                # Clear any pending output and ensure proper terminal state
+                self.console.print("", end="")
+                # Force a newline to ensure we're on a fresh line
+                self.console.print()
+            except Exception as e:
+                # Fallback: direct terminal escape sequence
+                try:
+                    print('\033[?25h', end='', flush=True)
+                    print()  # Ensure we're on a new line
+                except:
+                    pass
         
         # Clean up working tmp folder if it exists
         try:
@@ -320,7 +336,7 @@ def create_progress_displays():
     main_progress = Progress(
         SpinnerColumn(), 
         TextColumn("[bold green]{task.description}"),
-        BarColumn(bar_width=None, style="green"),
+        BarColumn(bar_width=None, style="red", complete_style="green", finished_style="green"),
         TextColumn("[progress.percentage]{task.percentage:>3.0f}%"),
         MofNCompleteColumn(),
         TimeElapsedColumn(),
@@ -451,6 +467,17 @@ def run_processing(config, selected_gpus):
                 logger.debug(f"Cleaned up working temp folder: {config.working_tmp_folder}")
         except Exception as cleanup_error:
             logger.warning(f"Failed to clean up working temp folder {config.working_tmp_folder}: {cleanup_error}")
+        
+        # Final terminal cleanup to ensure cursor is visible
+        try:
+            console.show_cursor(True)
+            # Force Rich to restore the terminal to its original state
+            if hasattr(console, '_live'):
+                console._live = None
+            # Ensure we're on a fresh line
+            console.print()
+        except:
+            pass
 
 
 def main() -> None:

plex_generate_previews/media_processing.py

@@ -65,7 +65,7 @@ def parse_ffmpeg_progress_line(line: str, total_duration: float, progress_callba
         q = float(q_match.group(1)) if q_match else 0
         size = int(size_match.group(1)) if size_match else 0
         bitrate = float(bitrate_match.group(1)) if bitrate_match else 0
-        speed = speed_match.group(1) + "x" if speed_match else "0.0x"
+        speed = speed_match.group(1) + "x" if speed_match else None
         
         if time_match:
             hours, minutes, seconds = time_match.groups()
@@ -84,7 +84,7 @@ def parse_ffmpeg_progress_line(line: str, total_duration: float, progress_callba
             
             # Call progress callback with all FFmpeg data
             if progress_callback:
-                progress_callback(progress_percent, current_time, total_duration, speed, 
+                progress_callback(progress_percent, current_time, total_duration, speed or "0.0x", 
                                 remaining_time, frame, fps, q, size, time_str, bitrate)
     
     return total_duration
@@ -197,7 +197,10 @@ def generate_images(video_file: str, output_folder: str, gpu: Optional[str],
     
     # Use file polling approach for non-blocking, high-frequency progress monitoring
     # This is faster than subprocess.PIPE which would block on readline() calls
-    output_file = f'/tmp/ffmpeg_output_{os.getpid()}_{int(time.time())}.log'
+    # Use high-resolution timestamp and thread ID to ensure unique file per worker
+    import threading
+    thread_id = threading.get_ident()
+    output_file = f'/tmp/ffmpeg_output_{os.getpid()}_{thread_id}_{time.time_ns()}.log'
     proc = subprocess.Popen(args, stderr=open(output_file, 'w'), stdout=subprocess.DEVNULL)
     
     # Signal that FFmpeg process has started
@@ -212,39 +215,57 @@ def generate_images(video_file: str, output_folder: str, gpu: Optional[str],
     ffmpeg_output_lines = []  # Store all FFmpeg output for debugging
     line_count = 0
     
+    # Create a wrapper callback to capture speed updates
+    def speed_capture_callback(progress_percent, current_duration, total_duration, speed_value, 
+                              remaining_time=None, frame=0, fps=0, q=0, size=0, time_str="00:00:00.00", bitrate=0):
+        nonlocal speed
+        if speed_value and speed_value != "0.0x":
+            speed = speed_value
+        if progress_callback:
+            progress_callback(progress_percent, current_duration, total_duration, speed_value, 
+                            remaining_time, frame, fps, q, size, time_str, bitrate)
+    
     # Allow time for it to start
-    time.sleep(0.05)  # Reduced from 0.1s
+    time.sleep(0.02)
 
     # Parse FFmpeg output using file polling (much faster)
+    poll_count = 0
     while proc.poll() is None:
+        poll_count += 1
         if os.path.exists(output_file):
+            try:
+                with open(output_file, 'r') as f:
+                    lines = f.readlines()
+                    if len(lines) > line_count:
+                        # Process new lines
+                        for i in range(line_count, len(lines)):
+                            line = lines[i].strip()
+                            if line:
+                                ffmpeg_output_lines.append(line)
+                                # Parse FFmpeg output line
+                                total_duration = parse_ffmpeg_progress_line(line, total_duration, speed_capture_callback)
+                        line_count = len(lines)
+            except (OSError, IOError):
+                # Handle file access issues gracefully
+                pass
+        
+        time.sleep(0.005)  # Poll every 5ms for very responsive updates
+    
+    # Process any remaining data in the output file
+    if os.path.exists(output_file):
+        try:
             with open(output_file, 'r') as f:
                 lines = f.readlines()
                 if len(lines) > line_count:
-                    # Process new lines
+                    # Process any remaining lines
                     for i in range(line_count, len(lines)):
                         line = lines[i].strip()
                         if line:
-                            ffmpeg_output_lines.append(line)  # Store for debugging
-                            
-                            # Parse FFmpeg output line
-                            total_duration = parse_ffmpeg_progress_line(line, total_duration, progress_callback)
-                    line_count = len(lines)
-        
-        time.sleep(0.005)  # Poll every 5ms for very responsive updates
-    
-    # Process any remaining data in the output file
-    if os.path.exists(output_file):
-        with open(output_file, 'r') as f:
-            lines = f.readlines()
-            if len(lines) > line_count:
-                # Process any remaining lines
-                for i in range(line_count, len(lines)):
-                    line = lines[i].strip()
-                    if line:
-                        ffmpeg_output_lines.append(line)
-                        # Parse any remaining progress lines
-                        total_duration = parse_ffmpeg_progress_line(line, total_duration, progress_callback)
+                            ffmpeg_output_lines.append(line)
+                            # Parse any remaining progress lines
+                            total_duration = parse_ffmpeg_progress_line(line, total_duration, speed_capture_callback)
+        except (OSError, IOError):
+            pass
     
     # Clean up the output file
     try:
@@ -265,13 +286,18 @@ def generate_images(video_file: str, output_folder: str, gpu: Optional[str],
     end = time.time()
     seconds = round(end - start, 1)
 
+    # Calculate fallback speed if no valid speed was captured
+    if speed == "0.0x" and total_duration and total_duration > 0 and seconds > 0:
+        calculated_speed = total_duration / seconds
+        speed = f"{calculated_speed:.0f}x"
+
     # Optimize and Rename Images
     for image in glob.glob(f'{output_folder}/img*.jpg'):
         frame_no = int(os.path.basename(image).strip('-img').strip('.jpg')) - 1
         frame_second = frame_no * config.plex_bif_frame_interval
         os.rename(image, os.path.join(output_folder, f'{frame_second:010d}.jpg'))
 
-    logger.info(f'Generated Video Preview for {video_file} HW={hw} TIME={seconds}seconds SPEED={speed}x')
+    logger.info(f'Generated Video Preview for {video_file} HW={hw} TIME={seconds}seconds SPEED={speed}')
 
 
 def generate_bif(bif_filename: str, images_path: str, config: Config) -> None:

plex_generate_previews/worker.py

@@ -432,7 +432,7 @@ class WorkerPool:
             
             # Adaptive sleep to balance responsiveness and CPU usage
             if self.has_busy_workers():
-                time.sleep(0.01)  # 10ms sleep for better stability with multiple workers
+                time.sleep(0.005)  # 5ms sleep for better responsiveness with multiple workers
         
         # Final statistics
         total_completed = sum(worker.completed for worker in self.workers)

{plex_generate_previews-2.0.0.dist-info → plex_generate_previews-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plex-generate-previews
-Version: 2.0.0
+Version: 2.1.1
 Summary: Generate video preview thumbnails for Plex Media Server
 Author-email: stevezau <stevezau@example.com>
 License-Expression: MIT

{plex_generate_previews-2.0.0.dist-info → plex_generate_previews-2.1.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
 plex_generate_previews/__init__.py,sha256=AsZalox9lP8FYHvi-aAUo-G5hy8ngaZq7fG-FJit7Qg,304
 plex_generate_previews/__main__.py,sha256=7aEa3EqUk32lBE_V99Nks2t8SVaP31_9LnGJ-qX8FDg,197
-plex_generate_previews/cli.py,sha256=NMEp-2JzeZ1K7_IFxfFuEZPwJ34GNezFqO8v0LO2bNI,19251
+plex_generate_previews/cli.py,sha256=7WtebiJ8GBlHMTIgf9Iat5LsgtGBD3cag9agAZlb5lE,20463
 plex_generate_previews/config.py,sha256=REtXu_7MvTotJYfP00Fu_HcsMfzucuyuLW2gxDzGWxg,24019
 plex_generate_previews/gpu_detection.py,sha256=BXGBFFjWJhvZKjIyUkAlDhFKUsqHUp3ibNCE2ENziek,20684
-plex_generate_previews/media_processing.py,sha256=nsr-h0RLwunm0_vzWscEHFIs4cM8SF-U913q_zJjjVA,18718
+plex_generate_previews/media_processing.py,sha256=d_LwZaMqJ-wLWQLsPgT5hLggWzQSaDsUaIoYdNRO3HM,19968
 plex_generate_previews/plex_client.py,sha256=Qcy5hkuwL1n87ZL7-wvB2j4fa3CWd0aQ3QApI9u0ru4,8537
 plex_generate_previews/utils.py,sha256=lRFbFu6saBV9Xgokd1oMME9cWaq7vyVJpnLRodox4MY,4375
 plex_generate_previews/version_check.py,sha256=tleI-pdX4qUAgv5u_2sn1JPIOFc5kOs0jH04sbz18hw,6316
-plex_generate_previews/worker.py,sha256=W50TbcuoIWQIeOu7B2yE6QPwtJFx6lSSvv2DBTvHVk8,19740
-plex_generate_previews-2.0.0.dist-info/METADATA,sha256=88Ke9patJ9r9PoB0KpwajycD3o7_M7cclOCWNHhQ4GM,23843
-plex_generate_previews-2.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-plex_generate_previews-2.0.0.dist-info/entry_points.txt,sha256=AvOKrBTsHLpjsCJWZgz-tNfA-0KInF35YKMr4QzHoA8,75
-plex_generate_previews-2.0.0.dist-info/top_level.txt,sha256=d0aQi-UccrXBheWaw8GfpInS6qdbfI8D9OO5fr0ZT3g,23
-plex_generate_previews-2.0.0.dist-info/RECORD,,
+plex_generate_previews/worker.py,sha256=nXLOOpWTRJvvG7Na4F5_GZR493QU9lGNVPAwy_JUxIE,19745
+plex_generate_previews-2.1.1.dist-info/METADATA,sha256=taNk1NUBA-yYzDYuMGnl2X7LRiiURrxCk-FfJZmlhWI,23843
+plex_generate_previews-2.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+plex_generate_previews-2.1.1.dist-info/entry_points.txt,sha256=AvOKrBTsHLpjsCJWZgz-tNfA-0KInF35YKMr4QzHoA8,75
+plex_generate_previews-2.1.1.dist-info/top_level.txt,sha256=d0aQi-UccrXBheWaw8GfpInS6qdbfI8D9OO5fr0ZT3g,23
+plex_generate_previews-2.1.1.dist-info/RECORD,,