mirror of
https://github.com/KeksPirates/SoftwareManager.git
synced 2026-08-03 17:39:42 +02:00
cc51f57e18
Improve thread-safety, logging, and various bug fixes across the app. Key changes: - Add and use state.downloads_lock around accesses to state.active_downloads in multiple modules (UI, libtorrent, misc, direct downloads) to prevent race conditions. - Prevent concurrent dl_status_loop runs using a non-blocking _loop_lock and ensure proper iteration over a snapshot of downloads. - Add metadata timeout when waiting for torrent metadata and fix free-space check logic to remove or reject downloads appropriately. - Refactor download log persistence: add _load_downloads and _save_downloads helpers and centralize JSON read/write logic in utils/logging/logs.py. - Optimize DirectDownloadStatus speed window by switching to deque and using popleft to trim older samples. - Trim console log widget to 500 lines to avoid unbounded growth. - Add small state fields for custom image positioning (x/y and enabled flag). - Fix Steamrip scraper caching behavior and make Uztracker return an empty list on fetch failures. - Add defensive checks in run_download to handle missing links. These changes focus on stability and correctness for concurrent download handling and durable logging.
61 lines
2.1 KiB
Python
61 lines
2.1 KiB
Python
from network.direct_download import add_direct_download
|
|
from network.libtorrent_wrapper import add_magnet
|
|
from PySide6.QtWidgets import QTableWidgetItem
|
|
from utils.logging.logs import add_download_log
|
|
from utils.general.wrappers import run_thread
|
|
from network.libtorrent_int import add_seed
|
|
from utils.logging.logs import consoleLog
|
|
from utils.data.state import state
|
|
from PySide6.QtCore import Qt
|
|
from typing import Optional
|
|
import threading
|
|
|
|
|
|
|
|
def download_selected(items: list[QTableWidgetItem]):
|
|
if not items:
|
|
consoleLog("No item selected for download.")
|
|
return
|
|
seen = set()
|
|
for item in items:
|
|
if item.column() != 0:
|
|
continue
|
|
post_idx = item.data(Qt.ItemDataRole.UserRole)
|
|
if post_idx is None:
|
|
post_idx = item.row()
|
|
|
|
if post_idx not in seen:
|
|
seen.add(post_idx)
|
|
post = state.posts[post_idx]
|
|
consoleLog(f"Downloading {post.get('title', 'Unknown')}")
|
|
run_thread(threading.Thread(target=run_download, args=(post,)))
|
|
|
|
def run_download(post, headers: Optional[dict] = None):
|
|
link_method = state.trackers[state.currenttracker].get_download_link
|
|
ismagnet = state.trackers[state.currenttracker].is_magnet
|
|
result = link_method(post)
|
|
|
|
if ismagnet:
|
|
link = result
|
|
if not link:
|
|
consoleLog("Failed to retrieve magnet link")
|
|
return
|
|
add_magnet(link)
|
|
add_download_log(post.get("title", "Unknown"), "", link, False)
|
|
else:
|
|
link, link_headers = result if isinstance(result, tuple) else (result, None)
|
|
if not link:
|
|
consoleLog("Failed to retrieve download link")
|
|
return
|
|
final_headers = headers or link_headers
|
|
add_direct_download(link, post.get("title", "Unknown"), headers=final_headers, single_threaded=final_headers is not None)
|
|
|
|
def run_download_direct(magnet_uri, title="Direct Download"):
|
|
consoleLog(f"Magnet: {title}")
|
|
add_magnet(magnet_uri)
|
|
add_download_log(title, "", magnet_uri, False)
|
|
|
|
def seed_magnet(magnet_uri, file_path):
|
|
consoleLog(f"Seeding: {magnet_uri[:60]}")
|
|
add_seed(magnet_uri, file_path)
|