refactor: get_magnet to get_download_link

Rename scraper method get_magnet -> get_download_link in monkrus, rutracker and uztracker. Update downloader code to call .get_download_link and use the .is_magnet flag on tracker objects (replace dict access). Switch direct_download package imports to absolute paths and perform a small import reorder in direct_download/utils.py. These changes unify the download API and adapt call sites to the new tracker interface.
This commit is contained in:
Vxrtrauter
2026-03-21 02:03:49 +01:00
parent 616552063d
commit 9e7607dd36
6 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -74,5 +74,5 @@ class MonkrusScraper:
return filtered_posts return filtered_posts
def get_magnet(self, post: Dict): def get_download_link(self, post: Dict):
return get_magnet_link(post["url"]) return get_magnet_link(post["url"])
+1 -1
View File
@@ -40,7 +40,7 @@ class RutrackerScraper:
consoleLog("No response from server, returning nothing") consoleLog("No response from server, returning nothing")
return [] return []
def get_magnet(self, post: Dict): def get_download_link(self, post: Dict):
_, post_links, _, _, _ = format_data([post]) _, post_links, _, _, _ = format_data([post])
return get_magnet_link(post_links[0]) return get_magnet_link(post_links[0])
+1 -1
View File
@@ -45,6 +45,6 @@ class UztrackerScraper:
consoleLog(f"Failed to fetch {search_url}: {e}") consoleLog(f"Failed to fetch {search_url}: {e}")
return None return None
def get_magnet(self, post: Dict): def get_download_link(self, post: Dict):
return get_magnet_link(post["url"]) return get_magnet_link(post["url"])
+2 -2
View File
@@ -3,8 +3,8 @@ from utils.data.state import state
from typing import Optional from typing import Optional
from .handle import DirectDownloadHandle from network.direct_download.handle import DirectDownloadHandle
from .utils import ( from network.direct_download.utils import (
sanitize_filename, sanitize_filename,
extract_filename_from_url, extract_filename_from_url,
detect_filename_from_headers, detect_filename_from_headers,
+1 -1
View File
@@ -1,5 +1,5 @@
from utils.logging.logs import consoleLog
from urllib.parse import urlparse, unquote from urllib.parse import urlparse, unquote
from utils.logging.logs import consoleLog
from typing import Optional from typing import Optional
import requests import requests
import os import os
+3 -3
View File
@@ -31,9 +31,9 @@ def download_selected(items: list[QTableWidgetItem]):
run_thread(threading.Thread(target=run_download, args=(post,))) run_thread(threading.Thread(target=run_download, args=(post,)))
def run_download(post, headers: Optional[dict] = None): def run_download(post, headers: Optional[dict] = None):
linkfunc = state.trackers[state.currenttracker]["linkFunc"] link_method = state.trackers[state.currenttracker].get_download_link
ismagnet = state.trackers[state.currenttracker]["isMagnet"] ismagnet = state.trackers[state.currenttracker].is_magnet
result = linkfunc(post) result = link_method(post)
if ismagnet: if ismagnet:
link = result link = result