Update app.py

app.py

@@ -97,6 +97,12 @@ def upload_file_to_s3(file_path, s3_path):
         file.write(file_content)
 
 def convert_video(video_file, quality, aspect_ratio, video_url):
+
+    def convert_video(video_file, quality, aspect_ratio, video_url):
+    # Ensure either a file or a URL is provided
+    if not video_file and not 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))
@@ -128,16 +134,17 @@ 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)
 
-    server_ip = get_ip_address()
     output_links = []
     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")
-        upload_file_to_s3(path, f"s3://{AWS_S3_BUCKET}/{Path(path).stem}")
+        s3_path = f"s3://{AWS_S3_BUCKET}/{Path(input_path).stem}/{Path(path).stem}"
+        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>')
 
     # 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}")
+        s3_path = f"s3://{AWS_S3_BUCKET}/{Path(input_path).stem}/{Path(path).stem.split('_')[1]}/{Path(path).stem}"
+        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_html = "<br>".join(output_links)
     return output_html