Update app.py

app.py

@@ -31,13 +31,13 @@ def get_input_path(video_file, video_url, temp_dir):
     else:
         raise ValueError("No input was provided.")
 
-def upload_to_ftp(server, username, password, source_file, destination_file):
+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 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")
@@ -60,7 +60,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):
+def convert_video(video_file, quality, aspect_ratio, video_url, ftp_server, ftp_username, ftp_password, ftp_path, upload):
     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:
@@ -113,9 +113,10 @@ def convert_video(video_file, quality, aspect_ratio, video_url):
         if upload:
             ftp_files = []
             for path in [master_playlist_copy_path] + output_copy_paths:
-                destination = ftp_path + "/" + path.name
-                upload_to_ftp(ftp_server, ftp_username, ftp_password, path, destination)
-                ftp_files.append(destination)
+                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
+                upload_to_ftp(ftp_server, 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
@@ -158,19 +159,20 @@ def main():
     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="password")
+    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_username, ftp_password, ftp_path, upload],
-        outputs=gr.outputs.Textbox(),
+        outputs=[gr.outputs.Textbox(), gr.outputs.File(), gr.outputs.Markdown()],
         output_processor=process_output,
         allow_flagging=False, 
         live=False,
-    ).launch()
+    ).launch())
 
 if __name__ == "__main__":
     main()