Update app.py

app.py

@@ -7,8 +7,6 @@ from moviepy.editor import VideoFileClip
 import gradio as gr
 import requests
 from urllib.parse import urlparse
-from ftplib import FTP
-import paramiko
 
 logging.basicConfig(level=logging.INFO)
 
@@ -32,24 +30,6 @@ def get_input_path(video_file, video_url, temp_dir):
     else:
         raise ValueError("No input was provided.")
 
-def upload_to_ftp(server, port, username, password, source_file, destination_file):
-    """Uploads a file to an FTP server."""
-    with FTP(server, username, password) as ftp:
-        ftp.connect(server, int(port))  # add this line to specify the port
-        with open(source_file, 'rb') as f:
-            ftp.storbinary(f'STOR {destination_file}', f)
-
-def upload_to_sftp(server, port, username, password, source_file, destination_file):
-    """Uploads a file to an SFTP server."""
-    transport = paramiko.Transport((server, int(port)))
-    transport.connect(username=username, password=password)
-    
-    sftp = paramiko.SFTPClient.from_transport(transport)
-    sftp.put(source_file, destination_file)
-    
-    sftp.close()
-    transport.close()
-
 def get_output_path(input_path, temp_dir, res):
     """Returns the path to the output file, creating it if necessary."""
     output_path = temp_dir / (Path(input_path).stem + f"_{res}.m3u8")
@@ -72,7 +52,7 @@ def create_master_playlist(output_paths, temp_dir):
             f.write(f"{path.name}\n")
     return master_playlist_path
 
-def convert_video(video_file, quality, aspect_ratio, video_url, ftp_server, ftp_port, ftp_username, ftp_password, ftp_path, upload):
+def convert_video(video_file, quality, aspect_ratio, video_url):
     standard_resolutions = [4320, 2160, 1440, 1080, 720, 480, 360, 240, 144]  # 8K, 4K, 2K, Full HD, HD, SD in pixels
 
     with tempfile.TemporaryDirectory() as temp_dir:
@@ -96,101 +76,32 @@ def convert_video(video_file, quality, aspect_ratio, video_url, ftp_server, ftp_
 
             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,setsar={aspect_ratio}", 
-                "-hls_time", "6",
-                "-hls_playlist_type", "vod", "-f", "hls", str(output_path)
+                "-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(temp_dir / f"{output_path.stem}_%03d.ts"), str(output_path)
             ]
 
-            try:
-                result = subprocess.run(ffmpeg_command, check=True, timeout=600, capture_output=True, text=True)
-            except subprocess.CalledProcessError as e:
-                logging.error("ffmpeg command failed with the following error:\n%s", e.stderr)
-                error_file_path = tempfile.gettempdir() + "/error.txt"
-                with open(error_file_path, 'w') as error_file:
-                    error_file.write("ffmpeg command failed with the following error:\n" + e.stderr)
-                return error_file_path
-
-            except subprocess.TimeoutExpired:
-                logging.exception("ffmpeg command timed out.")
-                return "ffmpeg command timed out."
-            except FileNotFoundError:
-                logging.exception("ffmpeg is not installed.")
-                return "ffmpeg is not installed."
-            except Exception as e:
-                logging.exception("An error occurred.")
-                return f"An error occurred: {str(e)}"
-
-            output_paths.append(output_path)  # Append the output_path to output_paths
-
-        if upload:
-            ftp_files = []
-            for path in [master_playlist_copy_path] + output_copy_paths:
-                source_file = path  # This should be the full local path of the file
-                destination_file = ftp_path + "/" + path.name  # This should be the desired remote path of the file
-                
-                # Distinguish between FTP and SFTP based on the port number
-                if ftp_port == 22:
-                    upload_to_sftp(ftp_server, ftp_port, ftp_username, ftp_password, source_file, destination_file)
-                else:
-                    upload_to_ftp(ftp_server, ftp_port, ftp_username, ftp_password, source_file, destination_file)
-    
-                ftp_files.append(destination_file)
-            return ftp_files
-        else:
-            return [master_playlist_copy_path] + output_copy_paths
-
-        if not output_paths:
-            return "The video is smaller than the smallest standard resolution."
-
-        # Create master playlist
+            logging.info("Running ffmpeg command: " + ' '.join(ffmpeg_command))
+            subprocess.run(ffmpeg_command, check=True)
+
+            output_paths.append(output_path)  # Append each completed output file to the output_paths list
+
         master_playlist_path = create_master_playlist(output_paths, temp_dir)
+        output_paths.append(master_playlist_path)
 
-        output_copy_paths = [shutil.copy2(path, tempfile.gettempdir()) for path in output_paths]
-        master_playlist_copy_path = shutil.copy2(master_playlist_path, tempfile.gettempdir())
+    return output_paths  # Return the list of completed output files
 
-        return [master_playlist_copy_path] + output_copy_paths
+video_file = gr.inputs.File(label="Upload video file")
+quality = gr.inputs.Slider(18, 28, 1, 23, label="Video quality (18-28, lower is better)")
+aspect_ratio = gr.inputs.Textbox("16:9", label="Aspect ratio (width:height)")
+video_url = gr.inputs.Textbox(label="Or enter video URL")
 
+iface = gr.Interface(
+    convert_video,
+    [video_file, quality, aspect_ratio, video_url],
+    gr.outputs.File(label="Download video file(s)"),
+    title="Video Transcoder",
+    description="Transcodes a video file or URL to multiple resolutions for adaptive streaming. Higher quality values reduce the video bitrate."
+)
 
-def process_output(output):
-    """Process output and display it appropriately."""
-    if isinstance(output, str):
-        # If output is a string, assume it's an error message and display it as text.
-        return output
-    elif isinstance(output, Path):
-        # If output is a Path, assume it's an error file and provide it as a downloadable file.
-        return str(output)
-    elif isinstance(output, list):
-        # If output is a list, assume it's a list of Paths or URLs and display it as a markdown list.
-        return "\n".join(f"- {o}" for o in output)
-    else:
-        raise TypeError("Unexpected output type")
-
-def main():
-    video_file = gr.inputs.File(label="Video File")
-    quality = gr.inputs.Dropdown(
-        choices=["18", "23", "27", "28", "32"], label="Quality", default="27")
-    aspect_ratio = gr.inputs.Dropdown(
-        choices=["16:9",  "1:1", "4:3", "3:2", "5:4", "21:9", 
-                 "1.85:1", "2.35:1", "3:1", "360", "9:16", "16:9", 
-                 "2:1", "1:2", "9:1"], 
-        label="Aspect Ratio", default="16:9") 
-    video_url = gr.inputs.Textbox(label="Video URL")
-
-    ftp_server = gr.inputs.Textbox(label="FTP Server")
-    ftp_port = gr.inputs.Textbox(label="FTP Port", placeholder="21")
-    ftp_username = gr.inputs.Textbox(label="FTP Username")
-    ftp_password = gr.inputs.Textbox(label="FTP Password", type="text")
-    ftp_path = gr.inputs.Textbox(label="FTP Path")
-    upload = gr.inputs.Checkbox(label="Upload to FTP server", default=False)
-
-    gr.Interface(
-        convert_video, 
-        inputs=[video_file, quality, aspect_ratio, video_url, ftp_server, ftp_port, ftp_username, ftp_password, ftp_path, upload],
-        outputs=gr.outputs.Textbox(),
-        output_processor=process_output,
-        allow_flagging=False, 
-        live=False,
-    ).launch()
-
-if __name__ == "__main__":
-    main()
+iface.launch()