Update app.py

app.py

@@ -1,115 +1,80 @@
 import time
-import os
-import gradio as gr
 import requests
 import subprocess
-from gradio import components
 import tempfile
 from pathlib import Path
-from gradio import inputs, outputs
 from moviepy.editor import VideoFileClip
+import gradio as gr
 
-# Define File object
-File = Path
-
-# Define temp directory
-temp_dir = tempfile.mkdtemp()
-
-video_file = gr.inputs.File(label="Video File", type="file")
-quality = gr.inputs.Dropdown(choices=["18", "23", "28", "32"], label="Quality", default="23")
-
-# default will now be None, which will retain original aspect ratio
-aspect_ratio = gr.inputs.Dropdown(choices=[
-  None,  # Add None option to retain original aspect ratio
-  "1:1",
-  "4:3",
-  "3:2",
-  "5:4",
-  "16:9",
-  "21:9",
-  "1.85:1",
-  "2.35:1",
-  "3:1",
-  "360",
-  "9:16",
-  "16:9",
-  "2:1",
-  "1:2",
-  "9:1",
-], label="Aspect Ratio", default=None) 
-
-video_url = gr.inputs.Textbox(label="Video URL")
+def download_file(url, destination):
+    """Downloads a file from a url to a destination."""
+    response = requests.get(url)
+    response.raise_for_status()  # Raises a HTTPError if the status is 4xx, 5xx
+    with open(destination, 'wb') as f:
+        f.write(response.content)
 
-def convert_video(video_file, quality, aspect_ratio, video_url):
-    # If a file was uploaded
+def get_input_path(video_file, video_url, temp_dir):
+    """Returns the path to the video file, downloading it if necessary."""
     if video_file is not None:
-        # Get the file extension
-        file_extension = video_file.name.split(".")[-1]
-
-        # Define output file name
-        output_file_name = video_file.name[:-len(file_extension) - 1] + ".m3u8"
-        
-        input_path = video_file.name
-    
-    # If a URL was provided
+        return video_file.name
     elif video_url:
-        # Get the file name from URL
-        file_name = video_url.split("/")[-1]
+        file_name = Path(video_url).name
+        destination = temp_dir / file_name
+        download_file(video_url, destination)
+        return destination
+    else:
+        raise ValueError("No input was provided.")
 
-        # Get the file extension
-        file_extension = file_name.split(".")[-1]
+def get_output_path(input_path, temp_dir):
+    """Returns the path to the output file, creating it if necessary."""
+    output_path = temp_dir / (input_path.stem + ".m3u8")
+    return output_path
 
-        # Define output file name
-        output_file_name = file_name[:-len(file_extension) - 1] + ".m3u8"
-        
-        # Download the file to the temporary directory
-        response = requests.get(video_url)
-        
-        if response.status_code == 200:
-            input_path = os.path.join(temp_dir, file_name)
-            with open(input_path, 'wb') as f:
-                f.write(response.content)
-        else:
-            print("Failed to download file from URL.")
-            return "Failed to download file from URL."
-    else:
-        print("No input was provided.")
-        return "No input was provided."
+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]}"
 
-    # Define the output path
-    output_path = os.path.join(temp_dir, output_file_name)
+def convert_video(video_file, quality, aspect_ratio, video_url):
+    """Converts a video to HLS format, adjusting the quality and aspect ratio as necessary."""
+    temp_dir = Path(tempfile.mkdtemp())
+    input_path = get_input_path(video_file, video_url, temp_dir)
+    output_path = get_output_path(input_path, temp_dir)
+    aspect_ratio = get_aspect_ratio(input_path, aspect_ratio)
 
-    # Check if the output file exists
-    if os.path.exists(output_path):
-        # The file already exists, so we can just display it in the output viewer
-        return output_path
-    else:
-        # The file does not exist, so we need to convert it
-        if aspect_ratio is None:
-            video = VideoFileClip(input_path)
-            aspect_ratio = f"{video.size[0]}:{video.size[1]}"
-    
-    ffmpeg_command = f"ffmpeg -i {input_path} -c:v libx264 -crf {quality} -vf scale=-1:720,setsar={aspect_ratio} -hls_time 6 -hls_playlist_type vod -f hls {output_path}"
-    
-    print(f"Input Path: {input_path}")
-    print(f"Output Path: {output_path}")
-    
-    try:
-        subprocess.run(ffmpeg_command, shell=True, timeout=600)     
+    if not output_path.exists():
+        ffmpeg_command = (
+            f"ffmpeg -i {input_path} -c:v libx264 -crf {quality} "
+            f"-vf scale=-1:720,setsar={aspect_ratio} -hls_time 6 "
+            f"-hls_playlist_type vod -f hls {output_path}"
+        )
+
+        try:
+            subprocess.run(ffmpeg_command, shell=True, timeout=600)
         except subprocess.TimeoutExpired:
-            print("ffmpeg timed out")
             return "ffmpeg command timed out."
         except FileNotFoundError:
-            print("ffmpeg is not installed.")
             return "ffmpeg is not installed."
+        except Exception as e:
+            return f"An error occurred: {str(e)}"
+
+    return output_path
+
+def main():
+    video_file = gr.inputs.File(label="Video File", type="file")
+    quality = gr.inputs.Dropdown(
+        choices=["18",     choices=["18", "23", "28", "32"], label="Quality", default="23")
+    aspect_ratio = gr.inputs.Dropdown(
+        choices=[None, "1:1", "4:3", "3:2", "5:4", "16:9", "21:9", 
+                 "1.85:1", "2.35:1", "3:1", "360", "9:16", "16:9", 
+                 "2:1", "1:2", "9:1"], 
+        label="Aspect Ratio", default=None) 
+    video_url = gr.inputs.Textbox(label="Video URL")
 
-        for i in range(10):
-            if os.path.exists(output_path):
-                break
-            else:
-                time.sleep(1)
+    gr.Interface(convert_video, inputs=[video_file, quality, aspect_ratio, video_url], outputs='file').launch()
 
-        # The file has now been converted, so we can display it in the output viewer
-        return output_path
+if __name__ == "__main__":
+    main()
 
-gr.Interface(convert_video, inputs=[video_file, quality, aspect_ratio, video_url], outputs='file').launch()