Update app.py

app.py

@@ -112,35 +112,32 @@ 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_file_stem), str(output_path)
+            str(output_dir / f"{output_path.stem}_%03d.ts"), 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, Path(input_path).stem)
-
     output_paths.append(master_playlist_path)
 
     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>')
-        upload_file_to_s3(path, f"s3://{AWS_S3_BUCKET}/{path.name}")
+        print("Read local file")
+        upload_file_to_s3(path, f"s3://{AWS_S3_BUCKET}/{Path(path).stem}")
+
+    # upload ts files to s3
+    for path in output_dir.glob(f"{Path(input_path).stem}_*p_*.ts"):
+        upload_file_to_s3(path, f"s3://{AWS_S3_BUCKET}/{Path(path).stem}")
 
     output_html = "<br>".join(output_links)
     return output_html