Update app.py

app.py

@@ -59,45 +59,44 @@ def upload_to_web3_storage(api_key, path):
         logging.exception("An error occurred while uploading to web3.storage.")
         return f"An error occurred while uploading to web3.storage: {response.json()}"
 
-def convert_video(video_file, quality, aspect_ratio, resolution, video_url, api_key, upload):
-    """Converts a video to HLS format, adjusting the quality and aspect ratio as necessary."""
+def convert_video(video_file, quality, aspect_ratio, video_url, api_key, upload, resolution):
     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)
 
-        # Set default values if quality or aspect_ratio are None
-        quality = "27" if quality is None else quality
-        aspect_ratio = "1:1" if aspect_ratio is None else aspect_ratio
-
-        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:
-            logging.info("Running command: %s", " ".join(ffmpeg_command))
-            subprocess.run(ffmpeg_command, check=True, timeout=600)
-        except subprocess.CalledProcessError:
-            logging.exception("ffmpeg command failed.")
-            error_file_path = tempfile.gettempdir() + "/error.txt"
-            with open(error_file_path, 'w') as error_file:
-                error_file.write("ffmpeg command failed.")
-            return error_file_path
-        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)}"
-
-        # Copy the output to a new temporary file that won't be deleted when the
-        # TemporaryDirectory context manager exits.
+        for res in resolution:
+            scale = "-1:" + str(res.replace("p", ""))  # we convert '1080p' to '-1:1080'
+            output_path = get_output_path(input_path, temp_dir, res)  # pass the resolution to create a unique output file
+
+            ffmpeg_command = [
+                "ffmpeg", "-i", str(input_path), "-c:v", "libx264", "-crf", str(quality),
+                "-vf", f"scale={scale},setsar={aspect_ratio}", "-hls_time", "6",
+                "-hls_playlist_type", "vod", "-f", "hls", str(output_path)
+            ]
+
+            try:
+                logging.info("Running command: %s", " ".join(ffmpeg_command))
+                subprocess.run(ffmpeg_command, check=True, timeout=600)
+            except subprocess.CalledProcessError:
+                logging.exception("ffmpeg command failed.")
+                error_file_path = tempfile.gettempdir() + "/error.txt"
+                with open(error_file_path, 'w') as error_file:
+                    error_file.write("ffmpeg command failed.")
+                return error_file_path
+            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)}"
+
+        # We need to modify this part if you want to return all converted videos
+        # Here we only return the last converted video
         output_copy_path = shutil.copy2(output_path, tempfile.gettempdir())
 
     if upload:
@@ -114,8 +113,8 @@ def main():
                  "1.85:1", "2.35:1", "3:1", "360", "9:16", "16:9", 
                  "2:1", "1:2", "9:1"], 
         label="Aspect Ratio", default=None) 
-    resolution = gr.inputs.Dropdown(
-        choices=["Max", "Min"], label="Resolution", default="Max")
+    resolution = gr.components.Dropdown(
+    choices=["480p", "720p", "1080p", "1440p", "2160p", "4320p"], label="Resolution", multiple=True, default=["1080p"])
     video_url = gr.inputs.Textbox(label="Video URL")
     api_key = gr.inputs.Textbox(label="web3.storage API Key")
     upload = gr.inputs.Checkbox(label="Upload to web3.storage", default=False)