Update app.py

app.py

@@ -1,75 +1,83 @@
-from flask import Flask, render_template, request, send_file, jsonify
+from flask import Flask, render_template, request, send_file
 import os
 import tempfile
 import subprocess
-from zipfile import ZipFile
+import zipfile
 
-# Initialize the Flask app, setting the template folder to current directory
+# Initialize the Flask app
 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')
+    return render_template('html.html')  # Loads the HTML interface
 
 @app.route('/process', methods=['POST'])
 def process_video():
-    try:
-        video_file = request.files['video']
-        action = request.form['action']
-        format_option = request.form.get('format')
-        copy_streams = 'copy_streams' in request.form
+    video_file = request.files['video']
+    action = request.form['action']
 
-        # Save the uploaded video to a temporary file
-        temp_file = tempfile.NamedTemporaryFile(delete=False, suffix='.mp4')
-        video_file.save(temp_file.name)
+    # Save the uploaded video to a temporary file
+    temp_file = tempfile.NamedTemporaryFile(delete=False)
+    video_file.save(temp_file.name)
 
-        output_path = tempfile.mktemp(suffix=f".{format_option or 'mp4'}")
-        
-        # Prepare ffmpeg command based on action
-        command = [ffmpeg_path, '-y', '-i', temp_file.name]
+    # Determine the output path based on selected action
+    output_path = tempfile.NamedTemporaryFile(delete=False, suffix='.mp4').name  # Default output format is mp4
 
-        if action == 'Convert Format' and format_option:
-            command.extend(['-c', 'copy' if copy_streams else '', 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'])
+    # Process video based on action
+    if action == 'Convert Format':
+        # Get the selected format from the form
+        selected_format = request.form['format']
+        output_path = tempfile.NamedTemporaryFile(delete=False, suffix=f'.{selected_format}').name
 
-        # Run the ffmpeg command
-        result = subprocess.run(command, capture_output=True, text=True)
+        # Check if "Copy Streams" option is enabled
+        if 'copy_streams' in request.form:
+            # Attempt to copy streams
+            result = subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-c', 'copy', output_path])
+            if result.returncode != 0:  # If copying fails, re-encode without specifying a codec
+                subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, output_path])
+        else:
+            # Re-encode without specifying a codec
+            subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, output_path])
 
-        if result.returncode != 0:
-            return jsonify({"error": f"Processing failed: {result.stderr}"}), 500
-        
-        # 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")
+    elif action == 'Trim Video':
+        start_time = request.form['start_time']
+        duration = request.form['duration']
+        if 'copy_streams' in request.form:
+            result = subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-ss', start_time, '-t', duration, '-c', 'copy', output_path])
+            if result.returncode != 0:
+                subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-ss', start_time, '-t', duration, output_path])
         else:
-            return send_file(output_path, as_attachment=True)
+            subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-ss', start_time, '-t', duration, output_path])
+
+    elif action == 'Resize Video':
+        width = request.form['width']
+        height = request.form['height']
+        subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-vf', f'scale={width}:{height}', output_path])
+
+    elif action == 'Extract Audio':
+        output_path = tempfile.NamedTemporaryFile(delete=False, suffix='.mp3').name
+        subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-vn', '-acodec', 'mp3', output_path])
+
+    elif action == 'Extract Frames':
+        frames_folder = tempfile.mkdtemp()
+        subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-an', f'{frames_folder}/frame_%04d.png'])
+
+        # Create a zip file for the frames
+        output_path = tempfile.NamedTemporaryFile(delete=False, suffix='.zip').name
+        with zipfile.ZipFile(output_path, 'w') as zipf:
+            for root, _, files in os.walk(frames_folder):
+                for file in files:
+                    zipf.write(os.path.join(root, file), arcname=file)
+
+    elif action == 'Change Video Speed':
+        speed_factor = request.form['speed_factor']
+        subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-filter:v', f'setpts={1/float(speed_factor)}*PTS', output_path])
 
-    finally:
-        os.remove(temp_file.name)
-        if os.path.exists(output_path):
-            os.remove(output_path)
+    # Send the processed file back if successful
+    if os.path.exists(output_path):
+        return send_file(output_path, as_attachment=True)
+    else:
+        return "Error: Processing failed", 500
 
-# Run the app using waitress (adjust port as needed for Hugging Face Spaces)
 if __name__ == '__main__':
-    from waitress import serve
-    serve(app, host='0.0.0.0', port=7860)
+    app.run(debug=True)