Update app.py

app.py

@@ -1,21 +1,22 @@
 import logging
-import shutil
-from pathlib import Path
-from moviepy.editor import VideoFileClip
-import gradio as gr
 import requests
 from urllib.parse import urlparse
 import subprocess
-import atexit
 from flask import Flask, send_from_directory
 from threading import Thread
+from pathlib import Path
+from moviepy.editor import VideoFileClip
+import gradio as gr
 
 # Initialize a Flask application
 app = Flask(__name__)
 
+output_dir = Path.cwd() / "output"
+output_dir.mkdir(exist_ok=True)
+
 @app.route('/files/<path:path>')
 def serve_file(path):
-    return send_from_directory(Path.cwd(), path)
+    return send_from_directory(output_dir, path)
 
 # Start the Flask server in a new thread
 Thread(target=app.run, kwargs={'host': '0.0.0.0', 'port': 5000}).start()
@@ -23,47 +24,41 @@ Thread(target=app.run, kwargs={'host': '0.0.0.0', 'port': 5000}).start()
 logging.basicConfig(level=logging.INFO)
 
 def download_file(url, destination):
-    """Downloads a file from a url to a destination."""
     response = requests.get(url)
     response.raise_for_status()
     with open(destination, 'wb') as f:
         f.write(response.content)
 
 def get_input_path(video_file, video_url):
-    """Returns the path to the video file, downloading it if necessary."""
     if video_file is not None:
         return Path(video_file.name)
     elif video_url:
         url_path = urlparse(video_url).path
         file_name = Path(url_path).name
-        destination = Path.cwd() / file_name
+        destination = output_dir / file_name
         download_file(video_url, destination)
         return destination
     else:
         raise ValueError("No input was provided.")
 
 def get_output_path(input_path, res):
-    """Returns the path to the output file, creating it if necessary."""
-    output_path = Path.cwd() / (Path(input_path).stem + f"_{res}.m3u8")
+    output_path = output_dir / (Path(input_path).stem + f"_{res}.m3u8")
     return output_path
 
 def get_aspect_ratio(input_path, aspect_ratio):
-    """Returns the aspect ratio of the video, calculating it if necessary."""
     if aspect_ratio is not None:
         return aspect_ratio
     video = VideoFileClip(str(input_path))
     return f"{video.size[0]}:{video.size[1]}"
 
 def create_master_playlist(output_paths):
-    """Creates a master playlist .m3u8 file that includes all other .m3u8 files."""
-    master_playlist_path = Path.cwd() / "master_playlist.m3u8"
+    master_playlist_path = output_dir / "master_playlist.m3u8"
     with open(master_playlist_path, 'w') as f:
         f.write("#EXTM3U\n")
         for path in output_paths:
             f.write(f"#EXT-X-STREAM-INF:BANDWIDTH={1000*1000},RESOLUTION={path.stem.split('_')[-1]}\n")
             f.write(f"{path.name}\n")
-    return master_playlist_path  # make sure this is a single Path object
-
+    return master_playlist_path
 
 def convert_video(video_file, quality, aspect_ratio, video_url):
     input_path = get_input_path(video_file, video_url)
@@ -85,7 +80,7 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
             "ffmpeg", "-i", str(input_path), "-c:v", "libx264", "-crf", str(quality),
             "-vf", f"scale={scale}:force_original_aspect_ratio=decrease,pad=ceil(iw/2)*2:ceil(ih/2)*2",
             "-hls_time", "10", "-hls_playlist_type", "vod", "-hls_segment_filename",
-            str(Path.cwd() / f"{output_path.stem}_%03d.ts"), str(output_path)
+            str(output_dir / f"{output_path.stem}_%03d.ts"), str(output_path)
         ]
 
         logging.info("Running ffmpeg command: " + ' '.join(ffmpeg_command))
@@ -102,8 +97,8 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
         video_path = f'http://localhost:5000/files/{path.name}'
         video_component = f'''
             <div style="margin-bottom: 20px; border: 1px solid #ccc; padding: 10px;">
-                <video width="320" height="240" controls>
-                    <source src="{video_path}" type="video/mp4">
+                <video controls>
+                    <source src="{video_path}" type="application/x-mpegURL">
                     Your browser does not support the video tag.
                 </video>
                 <p>
@@ -117,47 +112,20 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
     return "\n".join(html_blocks),
 
 video_file = gr.inputs.File(label="Video File")
-quality = gr.inputs.Dropdown(
-    choices=["18", "23", "27", "28", "32"], 
-    default="27", 
-    label="Quality"
-)
-aspect_ratio = gr.inputs.Dropdown(
-    choices=["16:9",  "1:1", "4:3", "3:2", "5:4", "21:9", "1.85:1", "2.35:1", "3:1", "360", "9:16", "2:1", "1:2", "9:1"], 
-    default="16:9", 
-    label="Aspect ratio (width:height)"
-)
+quality = gr.inputs.Dropdown(choices=["18", "23", "27", "28", "32"], default="27", label="Quality")
+aspect_ratio = gr.inputs.Dropdown(choices=["16:9",  "1:1", "4:3", "3:2", "5:4", "21:9", "1.85:1", "2.35:1", "3:1", "360", "9:16", "2:1", "1:2", "9:1"], default="16:9", label="Aspect ratio (width:height)")
 standard_resolutions = [4320, 2160, 1440, 1080, 720, 480, 360, 240, 144]  # 8K, 4K, 2K, Full HD, HD, SD in pixels
 video_url = gr.inputs.Textbox(label="Or enter video URL")
 
-inputs = [
-    gr.components.File(label="Video File"),
-    gr.components.Dropdown(
-        choices=["18", "23", "27", "28", "32"], 
-        default="27", 
-        label="Quality"
-    ),
-    gr.components.Dropdown(
-        choices=["16:9",  "1:1", "4:3", "3:2", "5:4", "21:9", "1.85:1", "2.35:1", "3:1", "360", "9:16", "2:1", "1:2", "9:1"], 
-        default="16:9", 
-        label="Aspect ratio (width:height)"
-    ),
-    gr.components.Textbox(label="Or enter video URL")
-]
-
-outputs = [
-    gr.components.HTML(label="Download Links"),
-    gr.components.Video(label="Video Player"),
-    gr.components.Textbox(label="Text Files", type="text")
-]
-
 interface = gr.Interface(
     fn=convert_video, 
-    inputs=inputs,
-    outputs=outputs,
+    inputs=[video_file, quality, aspect_ratio, video_url],
+    outputs=[
+        gr.outputs.HTML(label="Download Links")
+    ],
     title="Video Converter",
     description="A simple video converter app",
     allow_flagging=False
 )
 
-interface.launch(server_name="0.0.0.0", server_port=7860)
+interface.launch(server_name="0.0.0.0", server_port=7860)