Update app.py

app.py

@@ -1,93 +1,75 @@
-from flask import Flask, render_template, request, send_file
+from flask import Flask, render_template, request, send_file, jsonify
 import os
 import tempfile
 import subprocess
-import zipfile
+from zipfile import ZipFile
 
-# Initialize the Flask app, tell it to look in the current directory for templates
+# Initialize the Flask app, setting the template folder to current directory
 app = Flask(__name__, template_folder='.')
 
+# Ensure FFmpeg is accessible and executable
+ffmpeg_path = "ffmpeg"  # Adjust if ffmpeg is not on PATH
+
 @app.route('/')
 def home():
-    return render_template('html.html')  # Flask will look in the current directory
+    return render_template('html.html')
 
 @app.route('/process', methods=['POST'])
 def process_video():
-    video_file = request.files['video']
-    action = request.form['action']
-    copy_streams = 'copy_streams' in request.form  # Check if the user selected "copy streams"
+    try:
+        video_file = request.files['video']
+        action = request.form['action']
+        format_option = request.form.get('format')
+        copy_streams = 'copy_streams' in request.form
 
-    # Save the uploaded video to a temporary file
-    temp_file = tempfile.NamedTemporaryFile(delete=False)
-    video_file.save(temp_file.name)
+        # Save the uploaded video to a temporary file
+        temp_file = tempfile.NamedTemporaryFile(delete=False, suffix='.mp4')
+        video_file.save(temp_file.name)
 
-    output_path = tempfile.NamedTemporaryFile(delete=False, suffix='.mp4').name  # Default output format
+        output_path = tempfile.mktemp(suffix=f".{format_option or 'mp4'}")
+        
+        # Prepare ffmpeg command based on action
+        command = [ffmpeg_path, '-y', '-i', temp_file.name]
 
-    # Process video based on action
-    if action == 'Convert Format':
-        selected_format = request.form['format']
-        output_path = tempfile.NamedTemporaryFile(delete=False, suffix=f'.{selected_format}').name  # Adjust output format based on user selection
+        if action == 'Convert Format' and format_option:
+            command.extend(['-c', 'copy' if copy_streams else 'libx264', output_path])
+        elif action == 'Trim Video':
+            start_time = request.form.get('start_time')
+            duration = request.form.get('duration')
+            command.extend(['-ss', start_time, '-t', duration, '-c', 'copy' if copy_streams else 'libx264', output_path])
+        elif action == 'Resize Video':
+            width = request.form.get('width')
+            height = request.form.get('height')
+            command.extend(['-vf', f'scale={width}:{height}', '-c:a', 'copy', output_path])
+        elif action == 'Extract Audio':
+            output_path = tempfile.mktemp(suffix=".mp3")
+            command.extend(['-vn', '-acodec', 'mp3', output_path])
+        elif action == 'Extract Frames':
+            frame_output_dir = tempfile.mkdtemp()
+            command.extend(['-vf', 'fps=1', f'{frame_output_dir}/frame_%03d.png'])
 
-        if copy_streams:
-            # If "copy streams" is selected, try to copy streams without re-encoding
-            result = subprocess.run(['ffmpeg', '-i', temp_file.name, '-c:v', 'copy', '-c:a', 'copy', '-y', output_path], capture_output=True)
-            if result.returncode != 0:
-                # If copying the streams failed, re-encode the video
-                subprocess.run(['ffmpeg', '-i', temp_file.name, '-y', output_path])
-        else:
-            subprocess.run(['ffmpeg', '-i', temp_file.name, '-y', output_path])
-    elif action == 'Trim Video':
-        start_time = request.form['start_time']
-        duration = request.form['duration']
-        output_path = tempfile.NamedTemporaryFile(delete=False, suffix='.mp4').name  # Example output format
+        # Run the ffmpeg command
+        result = subprocess.run(command, capture_output=True, text=True)
 
-        if copy_streams:
-            # Try to copy streams during trim operation (if selected)
-            result = subprocess.run(['ffmpeg', '-i', temp_file.name, '-ss', start_time, '-t', duration, '-c:v', 'copy', '-c:a', 'copy', '-y', output_path], capture_output=True)
-            if result.returncode != 0:
-                # If copying the streams failed, re-encode the video
-                subprocess.run(['ffmpeg', '-i', temp_file.name, '-ss', start_time, '-t', duration, '-y', output_path])
-        else:
-            subprocess.run(['ffmpeg', '-i', temp_file.name, '-ss', start_time, '-t', duration, '-y', output_path])
-    elif action == 'Resize Video':
-        width = request.form['width']
-        height = request.form['height']
-        output_path = tempfile.NamedTemporaryFile(delete=False, suffix='.mp4').name  # Example output format
-        subprocess.run(['ffmpeg', '-i', temp_file.name, '-vf', f'scale={width}:{height}', '-y', output_path])
-    elif action == 'Extract Audio':
-        output_path = tempfile.NamedTemporaryFile(delete=False, suffix='.mp3').name  # Output audio in MP3 format
-        subprocess.run(['ffmpeg', '-i', temp_file.name, '-vn', '-acodec', 'mp3', '-y', output_path])
-    elif action == 'Extract Frames':
-        # Extract frames and save as .jpg files
-        frame_dir = tempfile.mkdtemp()  # Create a temporary directory to store frames
-        output_zip = tempfile.NamedTemporaryFile(delete=False, suffix='.zip').name  # Output ZIP file
-        
-        # Extract frames from the video (saving as JPG files)
-        subprocess.run(['ffmpeg', '-i', temp_file.name, '-an', f'{frame_dir}/frame_%04d.jpg', '-y'])
+        if result.returncode != 0:
+            return jsonify({"error": f"Processing failed: {result.stderr}"}), 500
         
-        # Create a ZIP file containing the frames
-        with zipfile.ZipFile(output_zip, 'w', zipfile.ZIP_DEFLATED) as zipf:
-            for frame in os.listdir(frame_dir):
-                if frame.endswith('.jpg'):
-                    zipf.write(os.path.join(frame_dir, frame), frame)  # Write each frame into the ZIP
-
-        # Clean up the extracted frames directory
-        for frame in os.listdir(frame_dir):
-            os.remove(os.path.join(frame_dir, frame))
-        os.rmdir(frame_dir)
-        
-        # Send the ZIP file containing the frames
-        return send_file(output_zip, as_attachment=True, mimetype='application/zip')
-    elif action == 'Change Video Speed':
-        speed_factor = request.form['speed_factor']
-        output_path = tempfile.NamedTemporaryFile(delete=False, suffix='.mp4').name  # Example output format
-        subprocess.run(['ffmpeg', '-i', temp_file.name, '-filter:v', f'setpts={1/speed_factor}*PTS', '-y', output_path])
-
-    # Send the processed file back as a download (if applicable)
-    if os.path.exists(output_path):
-        return send_file(output_path, as_attachment=True)
+        # Handle response
+        if action == 'Extract Frames':
+            zip_path = os.path.join(tempfile.gettempdir(), "frames.zip")
+            with ZipFile(zip_path, 'w') as zipf:
+                for frame_file in os.listdir(frame_output_dir):
+                    zipf.write(os.path.join(frame_output_dir, frame_file), frame_file)
+            return send_file(zip_path, as_attachment=True, download_name="frames.zip")
+        else:
+            return send_file(output_path, as_attachment=True)
 
-    return 'Error processing video', 500
+    finally:
+        os.remove(temp_file.name)
+        if os.path.exists(output_path):
+            os.remove(output_path)
 
+# Run the app using waitress (adjust port as needed for Hugging Face Spaces)
 if __name__ == '__main__':
-    app.run(debug=True)
+    from waitress import serve
+    serve(app, host='0.0.0.0', port=7860)