test patch

app/proxy.py

@@ -1,10 +1,12 @@
-from flask import Blueprint, send_from_directory, current_app
+from flask import Blueprint, request, jsonify, current_app, render_template, send_from_directory
 import os
 import logging
 
 logger = logging.getLogger(__name__)
 proxy_bp = Blueprint('proxy', __name__)
 
+from app.services.encoder_service import encoder_service
+
 @proxy_bp.route('/files/<path:filename>')
 def serve_file(filename):
     """Serve files from the encoded directory"""
@@ -38,16 +40,37 @@ def serve_upload(filename):
 def serve_video(job_id, quality):
     """Serve encoded video files"""
     try:
-        encoded_dir = current_app.config['ENCODED_FOLDER']
-        video_path = os.path.join(encoded_dir, job_id, f"{quality}.mp4")
-        if os.path.exists(video_path):
+        job_info = encoder_service.get_job_info(job_id)
+        if not job_info:
+            return jsonify({
+                'error': True,
+                'message': 'Job not found'
+            }), 404
+
+        # Retrieve the video file path based on quality from the job info
+        video_file_path = None
+        for file in job_info.get('files', []):
+            if file['quality'] == quality:
+                video_file_path = file['path']
+                break
+
+        if video_file_path and os.path.exists(video_file_path):
+            directory, video_filename = os.path.split(video_file_path)
             return send_from_directory(
-                os.path.join(encoded_dir, job_id),
-                f"{quality}.mp4",
-                mimetype='video/mp4'
+                directory,
+                video_filename,
+                mimetype='video/mp4',
+                as_attachment=True,
+                download_name=video_filename
             )
         else:
-            return {"error": "Video not found"}, 404
+            return jsonify({
+                'error': True,
+                'message': 'Video not found'
+            }), 404
     except Exception as e:
-        logger.error(f"Error serving video {job_id}/{quality}: {str(e)}")
-        return {"error": "Video not found"}, 404
+        logger.error(f"Failed to serve video: {str(e)}")
+        return jsonify({
+            'error': True,
+            'message': 'Failed to serve video'
+        }), 500

app/templates/index.html

@@ -227,7 +227,6 @@
                 xhr.onload = function() {
                     if (xhr.status === 202) {
                         const response = JSON.parse(xhr.responseText);
-                        alert('Upload successful! Job ID: ' + response.job_id);
                         uploadForm.reset();
                         fileInfo.classList.add('hidden');
                         fetchJobs();