diff --git a/src/data/sources/monkrus.py b/src/data/sources/monkrus.py index 3386d22..f45e32a 100644 --- a/src/data/sources/monkrus.py +++ b/src/data/sources/monkrus.py @@ -74,5 +74,5 @@ class MonkrusScraper: return filtered_posts - def get_magnet(self, post: Dict): + def get_download_link(self, post: Dict): return get_magnet_link(post["url"]) diff --git a/src/data/sources/rutracker.py b/src/data/sources/rutracker.py index 9f48bfc..73b6a4b 100644 --- a/src/data/sources/rutracker.py +++ b/src/data/sources/rutracker.py @@ -40,7 +40,7 @@ class RutrackerScraper: consoleLog("No response from server, returning nothing") return [] - def get_magnet(self, post: Dict): + def get_download_link(self, post: Dict): _, post_links, _, _, _ = format_data([post]) return get_magnet_link(post_links[0]) diff --git a/src/data/sources/uztracker.py b/src/data/sources/uztracker.py index 4b4dfd7..027394e 100644 --- a/src/data/sources/uztracker.py +++ b/src/data/sources/uztracker.py @@ -45,6 +45,6 @@ class UztrackerScraper: consoleLog(f"Failed to fetch {search_url}: {e}") return None - def get_magnet(self, post: Dict): + def get_download_link(self, post: Dict): return get_magnet_link(post["url"]) diff --git a/src/network/direct_download/__init__.py b/src/network/direct_download/__init__.py index 3d6f8b2..a082b51 100644 --- a/src/network/direct_download/__init__.py +++ b/src/network/direct_download/__init__.py @@ -3,8 +3,8 @@ from utils.data.state import state from typing import Optional -from .handle import DirectDownloadHandle -from .utils import ( +from network.direct_download.handle import DirectDownloadHandle +from network.direct_download.utils import ( sanitize_filename, extract_filename_from_url, detect_filename_from_headers, diff --git a/src/network/direct_download/utils.py b/src/network/direct_download/utils.py index 20948f6..2b70b58 100644 --- a/src/network/direct_download/utils.py +++ b/src/network/direct_download/utils.py @@ -1,5 +1,5 @@ -from utils.logging.logs import consoleLog from urllib.parse import urlparse, unquote +from utils.logging.logs import consoleLog from typing import Optional import requests import os diff --git a/src/utils/network/download.py b/src/utils/network/download.py index a6b5953..86a8152 100644 --- a/src/utils/network/download.py +++ b/src/utils/network/download.py @@ -31,9 +31,9 @@ def download_selected(items: list[QTableWidgetItem]): run_thread(threading.Thread(target=run_download, args=(post,))) def run_download(post, headers: Optional[dict] = None): - linkfunc = state.trackers[state.currenttracker]["linkFunc"] - ismagnet = state.trackers[state.currenttracker]["isMagnet"] - result = linkfunc(post) + link_method = state.trackers[state.currenttracker].get_download_link + ismagnet = state.trackers[state.currenttracker].is_magnet + result = link_method(post) if ismagnet: link = result