Update app.py

app.py

@@ -104,14 +104,12 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
         raise ValueError("Please provide either a video file or a video URL.")
     
     input_path = get_input_path(video_file, video_url)
-
     video = VideoFileClip(str(input_path))
 
     # Get the original height to avoid upscaling
     original_height = video.size[1]
 
     output_paths = []
-
     for res in standard_resolutions:
         if res > original_height:
             continue
@@ -136,19 +134,22 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
 
     output_links = []
     for path in output_paths:
-        s3_path = f"s3://{AWS_S3_BUCKET}/{Path(input_path).stem}/{Path(path).stem}"
+        res_folder = Path(path).stem.split("_")[1]
+        s3_path = f"s3://{AWS_S3_BUCKET}/{Path(input_path).stem}/{res_folder}/{Path(path).name}"
         upload_file_to_s3(path, s3_path)
-        output_links.append(f'<a href="https://s3-us-east-1.amazonaws.com/{AWS_S3_BUCKET}/{Path(input_path).stem}/{Path(path).stem}" target="_blank">Download {Path(path).stem}</a>')
+        output_links.append(f'<a href="https://s3-us-east-1.amazonaws.com/{AWS_S3_BUCKET}/{Path(input_path).stem}/{res_folder}/{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"):
-        s3_path = f"s3://{AWS_S3_BUCKET}/{Path(input_path).stem}/{Path(path).stem.split('_')[1]}/{Path(path).stem}"
+        res_folder = Path(path).stem.split("_")[1]
+        s3_path = f"s3://{AWS_S3_BUCKET}/{Path(input_path).stem}/{res_folder}/{Path(path).name}"
         upload_file_to_s3(path, s3_path)
-        output_links.append(f'<a href="https://s3-us-east-1.amazonaws.com/{AWS_S3_BUCKET}/{Path(input_path).stem}/{Path(path).stem.split('_')[1]}/{Path(path).stem}" target="_blank">Download {Path(path).stem}</a>')
+        output_links.append(f'<a href="https://s3-us-east-1.amazonaws.com/{AWS_S3_BUCKET}/{Path(input_path).stem}/{res_folder}/{Path(path).name}" target="_blank">Download {Path(path).stem}</a>')
 
     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")