From b3f72406e0bdcace714a02beea6f2d92a9266fb4 Mon Sep 17 00:00:00 2001 From: Vxrtrauter Date: Thu, 24 Jul 2025 02:17:50 +0200 Subject: [PATCH] Refactor download management: remove old code and implement new structure for aria2p integration --- core/download.py | 65 ------------------- .../aria2p_server.py | 5 +- core/downloading/download.py | 19 ++++++ main.py | 10 ++- 4 files changed, 31 insertions(+), 68 deletions(-) delete mode 100644 core/download.py rename core/{download => downloading}/aria2p_server.py (93%) create mode 100644 core/downloading/download.py diff --git a/core/download.py b/core/download.py deleted file mode 100644 index 15949ac..0000000 --- a/core/download.py +++ /dev/null @@ -1,65 +0,0 @@ -import aria2p -import subprocess -import keyboard -import os -# from .scraper import uri - -aria2 = aria2p.API( - aria2p.Client( - host="http://localhost", - port=6800, - secret="" - ) -) - -download_paused = False -def pauseDownload(_): - global download_paused - if download_paused == True: - print("Error: Download already paused.") - else: - print("Download is being paused...") - download_paused = True - aria2.pause_all() - -def startDownload(_): - global download_paused - if download_paused == True: - aria2.resume_all() - print("Download Resumed!") - download_paused = False - else: - print("Download Started!") - download = aria2.add_magnet(uri) - download_paused = False - -def terminate(): - return - -# print("Enter Download URL: ") -# uri = input() - -#Magnet Download -# downloads_dir = os.path.join(os.path.expanduser("~"), "Downloads") -# subprocess.Popen(["aria2c", "--enable-rpc", "--rpc-listen-all=true", f"--dir={downloads_dir}"]) -# magnet_uri = "magnet:?xt=urn:btih:7FBF03CCC9115260DC50102E5A31E83E91422A79&dn=Ready+or+Not%3A+LSPD+Bundle+%28v66884+%2B+4+DLCs%2FBonuses+%2B+Windows+7+Fix%2C+MULTi12%29+%5BFitGirl+Repack%2C+Selective+Download+-+from+34.7+GB%5D&tr=udp%3A%2F%2Fopentor.net%3A6969&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.theoks.net%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.ccp.ovh%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=http%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=https%3A%2F%2Ftracker.tamersunion.org%3A443%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=http%3A%2F%2Ftracker.bt4g.com%3A2095%2Fannounce&tr=udp%3A%2F%2Fbt2.archive.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fbt1.archive.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.filemail.com%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker1.bt.moack.co.kr%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=http%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=udp%3A%2F%2Fopentracker.i2p.rocks%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fcoppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.zer0day.to%3A1337%2Fannounce" - -# #Torrent Download -# downloads_dir = os.path.join(os.path.expanduser("~"), "Downloads") -# subprocess.Popen(["aria2c", "--enable-rpc", "--rpc-listen-all=true", f"--dir={downloads_dir}"]) -# torrent_path = "C:/Users/Downloads/Ready or Not.torrent" - -#Direct Download -downloads_dir = os.path.join(os.path.expanduser("~"), "Downloads") -subprocess.Popen(["aria2c", "--enable-rpc", "--rpc-listen-all=true", f"--dir={downloads_dir}"]) -uri - -downloads = aria2.get_downloads() - -for download in downloads: - print(download.name, downloads.download_speed, download.status) - -keyboard.on_press_key("d", startDownload, suppress=False) -keyboard.on_press_key("s", pauseDownload, suppress=False) -keyboard.on_press_key("q", pauseDownload, terminate) -keyboard.wait("q") diff --git a/core/download/aria2p_server.py b/core/downloading/aria2p_server.py similarity index 93% rename from core/download/aria2p_server.py rename to core/downloading/aria2p_server.py index a33c19d..01b513c 100644 --- a/core/download/aria2p_server.py +++ b/core/downloading/aria2p_server.py @@ -1,6 +1,7 @@ import aria2p +import os import subprocess -# nig + def run_aria2p(): @@ -17,4 +18,4 @@ def run_aria2p(): subprocess.Popen(["aria2c", "--enable-rpc", "--rpc-listen-all=true", f"--dir={downloads_dir}"]) - return aria2p \ No newline at end of file + return aria2 \ No newline at end of file diff --git a/core/downloading/download.py b/core/downloading/download.py new file mode 100644 index 0000000..0e9bdc2 --- /dev/null +++ b/core/downloading/download.py @@ -0,0 +1,19 @@ +from .aria2p_server import run_aria2p +import aria2p +import subprocess +import os +# from .scraper import uri +def start_client(): + global aria2 + aria2 = run_aria2p() + +def add_magnet(uri): + aria2.add_magnet(uri) + + +def terminate(): + return + + + + diff --git a/main.py b/main.py index 16b3431..df234cb 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,8 @@ from ui.clinterface import asciititle; -from core.uztracker_scraper import scrape_uztracker; +from core.uztracker_scraper import scrape_uztracker +from core.uztracker_scraper import get_magnet_link +from core.downloading.download import start_client +from core.downloading.download import add_magnet import os @@ -52,5 +55,10 @@ if __name__ == "__main__": results = search() selected = select_result(results) print(selected) + uri = get_magnet_link(selected) + start_client() + add_magnet(uri) + +