Update app.py

app.py

@@ -1,20 +1,22 @@
-import time
-import requests
-import subprocess
+import logging
+import shutil
 import tempfile
+import subprocess
 from pathlib import Path
 from moviepy.editor import VideoFileClip
 import gradio as gr
+import requests
+from urllib.parse import urlparse
+
+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()  # Raises a HTTPError if the status is 4xx, 5xx
+    response.raise_for_status()
     with open(destination, 'wb') as f:
         f.write(response.content)
 
-from urllib.parse import urlparse
-
 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:
@@ -28,10 +30,9 @@ def get_input_path(video_file, video_url, temp_dir):
     else:
         raise ValueError("No input was provided.")
 
-
 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")
+    output_path = temp_dir / (Path(input_path).stem + ".m3u8")
     return output_path
 
 def get_aspect_ratio(input_path, aspect_ratio):
@@ -43,28 +44,39 @@ def get_aspect_ratio(input_path, aspect_ratio):
 
 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)
+    with tempfile.TemporaryDirectory() as temp_dir:
+        temp_dir = Path(temp_dir)
+        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)
 
-    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}"
-        )
+        ffmpeg_command = [
+            "ffmpeg", "-i", str(input_path), "-c:v", "libx264", "-crf", str(quality),
+            "-vf", f"scale=-1:720,setsar={aspect_ratio}", "-hls_time", "6",
+            "-hls_playlist_type", "vod", "-f", "hls", str(output_path)
+        ]
 
         try:
-            subprocess.run(ffmpeg_command, shell=True, timeout=600)
+            logging.info("Running command: %s", " ".join(ffmpeg_command))
+            subprocess.run(ffmpeg_command, check=True, timeout=600)
+        except subprocess.CalledProcessError:
+            logging.exception("ffmpeg command failed.")
+            return "ffmpeg command failed."
         except subprocess.TimeoutExpired:
+            logging.exception("ffmpeg command timed out.")
             return "ffmpeg command timed out."
         except FileNotFoundError:
+            logging.exception("ffmpeg is not installed.")
             return "ffmpeg is not installed."
         except Exception as e:
+            logging.exception("An error occurred.")
             return f"An error occurred: {str(e)}"
 
-    return output_path
+        # Copy the output to a new temporary file that won't be deleted when the
+        # TemporaryDirectory context manager exits.
+        output_copy_path = shutil.copy2(output_path, tempfile.gettempdir())
+
+    return output_copy_path
 
 def main():
     video_file = gr.inputs.File(label="Video File", type="file")
@@ -80,5 +92,4 @@ def main():
     gr.Interface(convert_video, inputs=[video_file, quality, aspect_ratio, video_url], outputs='file').launch()
 
 if __name__ == "__main__":
-    main()
-
+    main()