debug 2 patch

app/services/encoder_service.py

@@ -5,15 +5,24 @@ from pathlib import Path
 import logging
 import json
 from datetime import datetime
-import re
 import threading
 import signal
 import time
+import queue
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
+def _read_pipe(pipe, q):
+    """Read lines from a pipe and put them into a queue."""
+    try:
+        with pipe:
+            for line in iter(pipe.readline, ''):
+                q.put(line)
+    except Exception as e:
+        logger.error(f"Error reading pipe: {str(e)}")
+
 class EncoderService:
     def __init__(self):
         self.jobs = {}
@@ -139,7 +148,7 @@ class EncoderService:
                     })
                     output_file = output_dir / f"{output_name}_{quality}.mp4"
                     
-                    # FFmpeg command with optimized settings for web streaming
+                    # Build the FFmpeg command
                     cmd = [
                         'ffmpeg', '-y',
                         '-i', str(input_file),
@@ -173,23 +182,32 @@ class EncoderService:
                         )
                         self.active_processes[job_id] = process
 
-                        # Monitor FFmpeg progress with a timeout if no output in 30 seconds
+                        # Use a queue and separate thread to read stdout
+                        q = queue.Queue()
+                        reader_thread = threading.Thread(target=_read_pipe, args=(process.stdout, q))
+                        reader_thread.daemon = True
+                        reader_thread.start()
+
                         last_output_time = time.time()
                         while True:
-                            line = process.stdout.readline() if process.stdout.readable() else ''
-                            if line:
+                            try:
+                                # Wait up to 5 seconds for a line
+                                line = q.get(timeout=5)
                                 last_output_time = time.time()
-                                progress = self._parse_ffmpeg_progress(line, duration)
-                                if progress is not None:
-                                    quality_progress = ((completed_steps + progress / 100) / total_steps) * 100
+                                prog = self._parse_ffmpeg_progress(line, duration)
+                                if prog is not None:
+                                    quality_progress = ((completed_steps + prog / 100) / total_steps) * 100
                                     self.jobs[job_id]['progress'] = quality_progress
-                            # Break if no output for 30 seconds
-                            if time.time() - last_output_time > 30:
-                                logger.warning(f"No ffmpeg output for 30 seconds on quality {quality}, attempt {attempts+1} for job {job_id}")
-                                break
+                            except queue.Empty:
+                                # If no output in 5 seconds, check if process is still alive
+                                if time.time() - last_output_time > 30:
+                                    logger.warning(f"No ffmpeg output for 30 seconds on quality {quality}, attempt {attempts+1} for job {job_id}")
+                                    break
                             if process.poll() is not None:
                                 break
 
+                        reader_thread.join(timeout=5)
+                        # Check if process completed successfully
                         if process.returncode == 0:
                             logger.info(f"Encoding successful for quality {quality} on attempt {attempts+1} for job {job_id}")
                             outputs.append({