Merge pull request 'refactor: streamline ffmpeg command construction in VideoEncoder' (#5) from v1.0.2 into master

Reviewed-on: #5

.gitea/workflows/release.yml

@@ -20,11 +20,11 @@ jobs:
         id: get_version
         run: echo "VERSION=${{ github.head_ref }}" >> $GITHUB_OUTPUT
 
-      # - name: Generate Changelog
-      #   id: changelog
-      #   uses: https://github.com/metcalfc/changelog-generator@v4.6.2
-      #   with:
-      #     myToken: ${{ secrets.GITHUB_TOKEN }}
+      - name: Generate Changelog
+        id: changelog
+        uses: https://github.com/metcalfc/changelog-generator@v4.6.2
+        with:
+          myToken: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
         run: |
@@ -41,6 +41,6 @@ jobs:
         with:
           tag_name: ${{ steps.get_version.outputs.VERSION }}
           name: ${{ steps.get_version.outputs.VERSION }}
-          # body: ${{ steps.changelog.outputs.changelog }}
+          body: ${{ steps.changelog.outputs.changelog }}
           draft: false
           prerelease: false

Dockerfile

@@ -3,7 +3,7 @@ LABEL org.opencontainers.image.vendor="JDB-NET"
 WORKDIR /app
 COPY . /app
 ARG VERSION=dev
-ENV APP_VERSION=${VERSION}
+ENV VERSION=${VERSION}
 RUN pip install -r requirements.txt
 RUN apt-get update && apt-get install -y curl ffmpeg procps
 RUN rm -rf /var/lib/apt/lists/*

app.py

@@ -389,8 +389,7 @@ class VideoEncoder:
                 return False, "Invalid video resolution information"
             
             cmd = [
-                'ffmpeg', '-i', input_path, '-c:v', 'libx265', '-c:a', 'copy',
-                '-preset', 'medium', '-crf', '28', '-f', 'matroska'
+                'ffmpeg', '-i', input_path
             ]
             
             # Add scaling filter if target resolution is specified
@@ -404,8 +403,10 @@ class VideoEncoder:
                     # Ensure width is divisible by 2 (required by video codecs)
                     if scale_width % 2 != 0:
                         scale_width -= 1
-                    cmd.insert(2, f'scale={scale_width}:{target_height}')
-                    cmd.insert(2, '-vf')
+                    cmd.extend(['-vf', f'scale={scale_width}:{target_height}'])
+            
+            cmd.extend(['-c:v', 'libx265', '-c:a', 'copy',
+                '-preset', 'medium', '-crf', '28', '-f', 'matroska'])
             
             # Insert user flags if provided
             if ffmpeg_flags:
@@ -552,13 +553,11 @@ class AudioEncoder:
 def process_file(encoder_type, file_path, encoder):
     """Process a single file"""
     global current_jobs
-    if not ENCODING_ENABLED:
-        logger.info(f"Encoding is disabled. Skipping {file_path}")
-        db_manager.remove_from_queue(encoder_type, file_path)
-        with job_lock:
-            current_jobs[encoder_type] = None
-        return
     try:
+        logger.info(f"Starting to process {file_path} for {encoder_type}")
+        if not ENCODING_ENABLED:
+            logger.info(f"Encoding is disabled. Skipping {file_path}")
+            return
         if not os.path.exists(file_path):
             logger.warning(f"File {file_path} no longer exists, skipping")
             return
@@ -724,16 +723,17 @@ def process_file(encoder_type, file_path, encoder):
             if os.path.exists(temp_input):
                 os.remove(temp_input)
     except Exception as e:
-        logger.error(f"Error processing {file_path}: {e}")
+        logger.error(f"Error processing {file_path}: {e}", exc_info=True)
         try:
+            file_size = os.path.getsize(file_path) if os.path.exists(file_path) else 0
             db_manager.add_job_report(
-                encoder_type, file_path, os.path.getsize(file_path), 0,
+                encoder_type, file_path, file_size, 0,
                 os.path.splitext(file_path)[1], '', 'failed',
                 error_message=str(e),
-                target_resolution=target_resolution
+                target_resolution=target_resolution if 'target_resolution' in locals() else None
             )
-        except:
-            pass
+        except Exception as report_error:
+            logger.error(f"Failed to add job report: {report_error}", exc_info=True)
     finally:
         # Remove from queue after processing is complete
         db_manager.remove_from_queue(encoder_type, file_path)
@@ -743,23 +743,28 @@ def process_file(encoder_type, file_path, encoder):
 def worker_thread(encoder_type):
     """Worker thread for processing jobs"""
     encoder = VideoEncoder() if encoder_type == 'video' else AudioEncoder()
+    logger.info(f"Started {encoder_type} worker thread")
     
     while True:
         with job_lock:
             queue = db_manager.get_queue(encoder_type, limit=1)
             if queue and not current_jobs[encoder_type]:
                 file_path = queue[0]
+                logger.debug(f"{encoder_type} queue item: {file_path}")
                 # Check file exists before processing
                 if os.path.exists(file_path):
                     current_jobs[encoder_type] = {
                         'file_path': file_path,
                         'start_time': time.time()
                     }
+                    logger.info(f"Starting job for {file_path}")
                     # Do NOT remove from queue here anymore
                 else:
                     # Remove from queue if file does not exist
+                    logger.warning(f"File {file_path} does not exist, removing from queue")
                     db_manager.remove_from_queue(encoder_type, file_path)
         if current_jobs[encoder_type]:
+            logger.debug(f"Processing {current_jobs[encoder_type]['file_path']}")
             process_file(encoder_type, current_jobs[encoder_type]['file_path'], encoder)
         time.sleep(1)
 
@@ -898,6 +903,7 @@ def add_config():
     encoder_type = request.form.get('encoder_type')
     watch_folder = request.form.get('watch_folder')
     temp_dir = request.form.get('temp_dir') or '/temp'
+    target_resolution = request.form.get('target_resolution') or None
     ffmpeg_flags = None
     if encoder_type == 'video':
         crf = request.form.get('crf', '24')
@@ -907,7 +913,7 @@ def add_config():
         audio_bitrate = request.form.get('audio_bitrate', '320k')
         ffmpeg_flags = f'-b:a {audio_bitrate}'
     if encoder_type in ['video', 'audio'] and watch_folder:
-        db_manager.add_config(encoder_type, watch_folder, ffmpeg_flags, temp_dir)
+        db_manager.add_config(encoder_type, watch_folder, ffmpeg_flags, temp_dir, target_resolution)
     return redirect(url_for('config'))
 
 @app.route('/edit_config/<int:config_id>', methods=['POST'])