Update app.py

app.py

@@ -3,83 +3,93 @@ import os
 import tempfile
 import subprocess
 import zipfile
+from waitress import serve
 
-# Initialize the Flask app
+# Initialize the Flask app, tell it to look in the current directory for templates
 app = Flask(__name__, template_folder='.')
 
 @app.route('/')
 def home():
-    return render_template('html.html')  # Loads the HTML interface from the same folder
+    return render_template('html.html')  # Flask will look in the current directory
 
 @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"
 
     # Save the uploaded video to a temporary file
     temp_file = tempfile.NamedTemporaryFile(delete=False)
     video_file.save(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
+    output_path = tempfile.NamedTemporaryFile(delete=False, suffix='.mp4').name  # Default output format
 
     # 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
+        output_path = tempfile.NamedTemporaryFile(delete=False, suffix=f'.{selected_format}').name  # Adjust output format based on user selection
 
-        # 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])
+        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:
-            # Re-encode without specifying a codec
-            subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, output_path])
-
+            subprocess.run(['ffmpeg', '-i', temp_file.name, '-y', output_path])
     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])
+        output_path = tempfile.NamedTemporaryFile(delete=False, suffix='.mp4').name  # Example output format
+
+        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:
-                subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-ss', start_time, '-t', duration, output_path])
+                # 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', '-y', '-i', temp_file.name, '-ss', start_time, '-t', duration, output_path])
-
+            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']
-        subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-vf', f'scale={width}:{height}', output_path])
-
+        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
-        subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-vn', '-acodec', 'mp3', output_path])
-
+        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':
-        frames_folder = tempfile.mkdtemp()
-        subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-vf', 'fps=1', 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)
+        # 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'])
+        
+        # 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']
-        subprocess.run(['ffmpeg', '-y', '-i', temp_file.name, '-filter:v', f'setpts={1/float(speed_factor)}*PTS', output_path])
+        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 if successful
+    # Send the processed file back as a download (if applicable)
     if os.path.exists(output_path):
         return send_file(output_path, as_attachment=True)
-    else:
-        return "Error: Processing failed", 500
+
+    return 'Error processing video', 500
 
 if __name__ == '__main__':
-    from waitress import serve
-    # Serving the app using waitress
+    # Run the app using waitress to serve the HTML and video processing functionality
     serve(app, host='0.0.0.0', port=8080)