Update app.py

app.py

@@ -83,6 +83,14 @@ def create_master_playlist(output_paths):
             f.write(f'{Path(path).name}\n')
     return master_playlist_path
 
+def upload_file_to_s3(file_path, s3_path):
+    print(f"Upload {file_path} to AWS")
+    with open(file_path, 'rb') as file:
+        file_content = file.read()
+
+    with fs.open(s3_path, 'wb') as file:
+        file.write(file_content)
+
 def convert_video(video_file, quality, aspect_ratio, video_url):
     input_path = get_input_path(video_file, video_url)
 
@@ -99,17 +107,22 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
 
         scale = "-1:" + str(res)
         output_path = get_output_path(input_path, str(res) + 'p')
+        output_file_stem = output_dir / f"{output_path.stem}_%03d.ts"
 
         ffmpeg_command = [
             "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(output_dir / f"{output_path.stem}_%03d.ts"), str(output_path)
+            str(output_file_stem), str(output_path)
         ]
 
         logging.info("Running ffmpeg command: " + ' '.join(ffmpeg_command))
         subprocess.run(ffmpeg_command, check=True)
 
+        # Upload TS files
+        for ts_file in output_dir.glob(f"{output_file_stem.stem}*.ts"):
+            upload_file_to_s3(ts_file, f"s3://{AWS_S3_BUCKET}/{ts_file.name}")
+
         output_paths.append(output_path)
 
     master_playlist_path = create_master_playlist(output_paths)
@@ -117,19 +130,16 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
 
     server_ip = get_ip_address()
     output_links = []
+
+    # Upload M3U8 files
     for path in output_paths:
         output_links.append(f'<a href="http://{server_ip}:8000{path}" target="_blank">Download {Path(path).stem}</a>')
-        print("Read local file")
-        with open(path, 'rb') as file:
-            file_content = file.read()
-        print("Upload " + Path(path).stem + " to AWS")
-        # fs.mv(str(output_dir / f"{output_path.stem}_%03d.ts"), f"s3://{AWS_S3_BUCKET}/{Path(path).stem}",)
-        with fs.open(f"s3://{AWS_S3_BUCKET}/{Path(path).stem}", 'wb') as file:
-            file.write(file_content)
+        upload_file_to_s3(path, f"s3://{AWS_S3_BUCKET}/{path.name}")
 
     output_html = "<br>".join(output_links)
     return output_html
 
+
 video_file = gr.inputs.File(label="Your video file")
 quality = gr.inputs.Slider(minimum=1, maximum=50, label="Quality (1:Speed - 50:Quality)")
 aspect_ratio = gr.inputs.Dropdown(["16:9", "4:3", "1:1", "3:4", "9:16", "1:1", "2:1", "1:2"], label="Aspect Ratio", default="16:9")