Update app.py

app.py

@@ -6,7 +6,7 @@ from torrentp import TorrentDownloader
 
 def ftp_upload_file(ftp, local_path, remote_path):
     """
-    Upload a file to the FTP server, showing a progress bar.
+    Upload a file to the FTP server with a progress bar.
     """
     file_size = os.path.getsize(local_path)
     uploaded_bytes = 0
@@ -21,13 +21,16 @@ def ftp_upload_file(ftp, local_path, remote_path):
     with open(local_path, 'rb') as f:
         ftp.storbinary(f"STOR {remote_path}", f, blocksize=1024, callback=handle_block)
 
-def start_torrent_download(link, download_folder, download_speed=0, upload_speed=0, port=6881):
+def start_torrent_download(link, download_folder):
     """
-    Create a TorrentDownloader from torrentp and run its asynchronous download method.
+    Start the torrent download using torrentp with default settings.
+    Defaults:
+      - Port: 6881
+      - Download speed: 0 (unlimited)
+      - Upload speed: 0 (unlimited)
     """
-    torrent_file = TorrentDownloader(link, download_folder, port=port)
-    # This will block until the asynchronous download completes.
-    asyncio.run(torrent_file.start_download(download_speed=download_speed, upload_speed=upload_speed))
+    torrent_file = TorrentDownloader(link, download_folder, port=6881)
+    asyncio.run(torrent_file.start_download(download_speed=0, upload_speed=0))
     return download_folder
 
 def main():
@@ -42,44 +45,34 @@ def main():
     st.header("Torrent Details")
     torrent_link = st.text_area("Torrent Link (magnet or .torrent file)", placeholder="magnet:?xt=urn:btih:...")
     download_folder = st.text_input("Download Folder", "./downloads")
-    download_speed = st.number_input("Download Speed (kB/s, 0 for unlimited)", value=0, step=1)
-    upload_speed = st.number_input("Upload Speed (kB/s, 0 for unlimited)", value=0, step=1)
-    port_value = st.number_input("Torrent Port", value=6881, step=1)
 
     if st.button("Start Download & Upload"):
-        # --- Verify FTP connection ---
-        st.write("Verifying FTP connection...")
-        try:
-            ftp = ftplib.FTP()
-            ftp.connect(ftp_host, ftp_port, timeout=10)
-            ftp.login(ftp_username, ftp_password)
-            st.success("FTP connection successful!")
-        except Exception as e:
-            st.error(f"FTP connection failed: {e}")
-            return
-
-        # Ensure the download folder exists.
-        if not os.path.exists(download_folder):
-            os.makedirs(download_folder)
-
         # --- Start torrent download ---
         st.write("Starting torrent download...")
+        if not os.path.exists(download_folder):
+            os.makedirs(download_folder)
         with st.spinner("Downloading torrent..."):
             try:
-                start_torrent_download(torrent_link, download_folder, download_speed, upload_speed, port=port_value)
+                start_torrent_download(torrent_link, download_folder)
             except Exception as e:
                 st.error(f"Torrent download failed: {e}")
-                ftp.quit()
                 return
         st.success("Torrent download complete!")
 
-        # --- Upload downloaded files to FTP ---
-        st.write("Uploading downloaded files to FTP...")
+        # --- Connect to FTP and upload files ---
+        st.write("Connecting to FTP and uploading files...")
+        try:
+            ftp = ftplib.FTP()
+            ftp.connect(ftp_host, ftp_port, timeout=10)
+            ftp.login(ftp_username, ftp_password)
+        except Exception as e:
+            st.error(f"FTP connection failed: {e}")
+            return
+
         for root, dirs, files in os.walk(download_folder):
             for file in files:
                 local_file = os.path.join(root, file)
-                # Adjust remote_file if you want to preserve directory structure.
-                remote_file = file
+                remote_file = file  # Modify as needed to set the remote path
                 st.write(f"Uploading {file}...")
                 try:
                     ftp_upload_file(ftp, local_file, remote_file)
@@ -91,4 +84,4 @@ def main():
         st.success("All files uploaded. FTP connection closed.")
 
 if __name__ == '__main__':
-    main()
+    main()