Update app.py

app.py

@@ -71,7 +71,7 @@ def get_input_path(video_file, video_url):
         raise ValueError("No input was provided.")
 
 def get_output_path(input_path, res):
-    output_path = output_dir / (Path(input_path).stem + f"_{res}p.m3u8")
+    output_path = output_dir / f"{Path(input_path).stem}_{res}p.m3u8"
     return output_path
 
 def create_master_playlist(output_paths, input_filename):
@@ -84,8 +84,8 @@ def create_master_playlist(output_paths, input_filename):
             # read the .m3u8 file and replace relative links with absolute links
             with open(path, 'r') as playlist_file:
                 content = playlist_file.readlines()
-            # replace .ts extension with complete URL pointing to the TS segments on S3
-            content = [f"https://{AWS_S3_BUCKET}.s3.amazonaws.com/{quote_plus(input_filename)}/{res}/{quote_plus(line.rstrip())}\n" if line.endswith('.ts\n') else line for line in content]
+            content = [line.replace('.ts', f'.ts\n') if line.endswith('.ts\n') else line for line in content]
+            content = [f"{quote_plus(line.rstrip())}\n" if line.endswith('.ts\n') else line for line in content]
             f.writelines(content)
     return master_playlist_path
 
@@ -132,23 +132,20 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
     master_playlist_path = create_master_playlist(output_paths, Path(input_path).stem)
     output_paths.append(master_playlist_path)
 
-    output_links = []
+        output_links = []
     for path in output_paths:
-        res_folder = Path(path).stem.split("_")[1] if "_" in Path(path).stem else ""
-        s3_path = f"s3://{AWS_S3_BUCKET}/{quote_plus(Path(input_path).stem)}/{res_folder}/{quote_plus(Path(path).name)}"
+        s3_path = f"s3://{AWS_S3_BUCKET}/{Path(input_path).stem}/{Path(path).name}"
         upload_file_to_s3(path, s3_path)
-        output_links.append(f'<a href="https://{AWS_S3_BUCKET}.s3.amazonaws.com/{quote_plus(Path(input_path).stem)}/{res_folder}/{quote_plus(Path(path).name)}" target="_blank">Download {Path(path).stem}</a>')
+        output_links.append(f'<a href="https://{AWS_S3_BUCKET}.s3.amazonaws.com/{Path(input_path).stem}/{quote_plus(Path(path).name)}" target="_blank">Download {Path(path).stem}</a>')
 
     # upload ts files to s3
     for path in output_dir.glob(f"{Path(input_path).stem}_*p_*.ts"):
-        res_folder = Path(path).stem.split("_")[1]
-        s3_path = f"s3://{AWS_S3_BUCKET}/{quote_plus(Path(input_path).stem)}/{res_folder}/{quote_plus(Path(path).name)}"
+        s3_path = f"s3://{AWS_S3_BUCKET}/{Path(input_path).stem}/{Path(path).name}"
         upload_file_to_s3(path, s3_path)
 
     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")