Update app.py

app.py

@@ -36,6 +36,29 @@ def get_output_path(input_path, temp_dir, res):
     output_path = temp_dir / (Path(input_path).stem + f"_{res}.m3u8")
     return output_path
 
+def process_output(output):
+    """Process output and display it appropriately."""
+    if isinstance(output, str):
+        # If output is a string, assume it's an error message and display it as text.
+        return gr.outputs.Textbox()(output)
+    elif isinstance(output, Path):
+        # If output is a Path, assume it's an error file and provide it as a downloadable file.
+        return gr.outputs.File()(str(output))
+    elif isinstance(output, list):
+        # If output is a list, assume it's a list of Paths or URLs and display it as a markdown list.
+        return gr.outputs.Markdown()("\n".join(f"- {o}" for o in output))
+    else:
+        raise TypeError("Unexpected output type")
+
+gr.Interface(
+    convert_video, 
+    inputs=[video_file, quality, aspect_ratio, video_url, api_key, upload],
+    outputs=gr.outputs.Any(),
+    output_processor=process_output,
+    allow_flagging=False, 
+    live=False,
+).launch()
+
 
 def get_aspect_ratio(input_path, aspect_ratio):
     """Returns the aspect ratio of the video, calculating it if necessary."""
@@ -61,6 +84,16 @@ 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 create_master_playlist(output_paths, temp_dir):
+    """Creates a master playlist .m3u8 file that includes all other .m3u8 files."""
+    master_playlist_path = temp_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
+
 def convert_video(video_file, quality, aspect_ratio, video_url, api_key, upload):
     standard_resolutions = [4320, 2160, 1440, 1080, 720, 480]  # 8K, 4K, 2K, Full HD, HD, SD in pixels
 
@@ -88,18 +121,17 @@ def convert_video(video_file, quality, aspect_ratio, video_url, api_key, upload)
                 "-vf", f"scale={scale},setsar={aspect_ratio}", "-hls_time", "6",
                 "-hls_playlist_type", "vod", "-f", "hls", str(output_path)
             ]
-    
+
             try:
-                result = subprocess.run(ffmpeg_command, check=True, timeout=600, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                logging.info("Running command: %s", " ".join(ffmpeg_command))
+                subprocess.run(ffmpeg_command, check=True, timeout=600, stderr=subprocess.PIPE)
             except subprocess.CalledProcessError as e:
                 logging.exception("ffmpeg command failed.")
-                error_file_path = tempfile.gettempdir() + "/error.txt"
+                error_file_path = temp_dir / "error.txt"
                 with open(error_file_path, 'w') as error_file:
-                    error_file.write("ffmpeg command failed. Output was:\n\n")
-                    error_file.write(e.stdout.decode())
+                    error_file.write("ffmpeg command failed:\n")
                     error_file.write(e.stderr.decode())
                 return error_file_path
-
             except subprocess.TimeoutExpired:
                 logging.exception("ffmpeg command timed out.")
                 return "ffmpeg command timed out."
@@ -115,12 +147,16 @@ def convert_video(video_file, quality, aspect_ratio, video_url, api_key, upload)
         if not output_paths:
             return "The video is smaller than the smallest standard resolution."
 
+        # Create master playlist
+        master_playlist_path = create_master_playlist(output_paths, temp_dir)
+
         output_copy_paths = [shutil.copy2(path, tempfile.gettempdir()) for path in output_paths]
+        master_playlist_copy_path = shutil.copy2(master_playlist_path, tempfile.gettempdir())
 
     if upload:
-        return [upload_to_web3_storage(api_key, path) for path in output_copy_paths]
+        return [upload_to_web3_storage(api_key, path) for path in [master_playlist_copy_path] + output_copy_paths]
     else:
-        return output_copy_paths
+        return [master_playlist_copy_path] + output_copy_paths
 
 
 def main():
@@ -132,8 +168,6 @@ 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="16:9") 
-    # resolution = gr.components.Dropdown(
-    # choices=["480p", "720p", "1080p", "1440p", "2160p", "4320p"], label="Resolution", 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)