mirror of
https://github.com/KeksPirates/SoftwareManager.git
synced 2026-08-03 17:39:42 +02:00
Vxrtrauter
f5809c466a
Add network timeouts and more robust error handling across scrapers/hosts, improve logging concurrency, and refine download handling: - Hosts/sources: add request timeouts (15s) and exception handling to buzzheavier, gofile, steamrip, uztracker and rutracker; use urllib.parse.quote for search queries and better parse error checks. - GoFile: use Session with try/finally, create guest account with timeout, validate API responses and close session. - Context menu: import DirectDownloadHandle and handle stopping direct downloads separately from libtorrent; simplify file deletion with single try/catch; improve logging on exceptions. - GUI/search flow: move UI state changes (clear table, disable searchbar, hide empty results) into MainWindow._start_search and reduce duplicated UI changes in run_search. - Main: remove duplicate is_running assignment. - Libtorrent: snapshot seeded magnets in update loop to avoid concurrent access; minor indentation change in add_seed. - State/logging: add _log_lock to AppState; protect state.log_buffer with lock in consoleLog and flush_log_buffer and fix flush semantics. - Updater: replace busy-wait with QEventLoop/QTimer polling for DirectDownloadHandle progress, stop timer and quit loop on completion/error, and remove unnecessary sleeps. These changes aim to make network operations more reliable, prevent UI freezes, avoid race conditions when logging, and handle direct vs libtorrent downloads more cleanly.
107 lines
3.2 KiB
Python
107 lines
3.2 KiB
Python
from network.direct_download.handle import DirectDownloadHandle
|
|
from utils.general.shutdown import closehelper
|
|
from utils.logging.logs import consoleLog
|
|
from utils.data.state import state
|
|
from PySide6.QtCore import Qt, QTimer, QEventLoop
|
|
from PySide6 import QtWidgets
|
|
import libtorrent as lt
|
|
import subprocess
|
|
import tempfile
|
|
import hashlib
|
|
import sys
|
|
import os
|
|
|
|
|
|
def _verify_hash(file_path: str, expected_hash: str) -> bool:
|
|
sha256 = hashlib.sha256()
|
|
with open(file_path, "rb") as f:
|
|
for chunk in iter(lambda: f.read(8192), b""):
|
|
sha256.update(chunk)
|
|
return f"sha256:{sha256.hexdigest()}" == expected_hash
|
|
|
|
|
|
def download_update(assets: list):
|
|
filename = None
|
|
setup_hash = None
|
|
url = None
|
|
|
|
for asset in assets:
|
|
if "-windows-setup.exe" in asset["name"]:
|
|
filename = asset["name"]
|
|
setup_hash = asset["hash"]
|
|
url = asset["url"]
|
|
break
|
|
|
|
if not filename:
|
|
consoleLog("Error: No Windows installer found in release assets")
|
|
return
|
|
|
|
installer_path = os.path.join(tempfile.gettempdir(), filename)
|
|
|
|
progress = QtWidgets.QProgressDialog("Downloading update... (0.0 MB/s)", None, 0, 100)
|
|
progress.setWindowTitle("Updating")
|
|
progress.setWindowModality(Qt.WindowModality.ApplicationModal)
|
|
progress.setCancelButton(None)
|
|
progress.setMinimumDuration(0)
|
|
progress.setAutoClose(False)
|
|
progress.setAutoReset(False)
|
|
progress.setValue(0)
|
|
progress.show()
|
|
QtWidgets.QApplication.processEvents()
|
|
|
|
original_limit = state.down_speed_limit
|
|
state.down_speed_limit = 0
|
|
handle = DirectDownloadHandle(url, filename, tempfile.gettempdir())
|
|
handle.start()
|
|
|
|
loop = QEventLoop()
|
|
timer = QTimer()
|
|
timer.setInterval(100)
|
|
|
|
def poll_progress():
|
|
status = handle.status()
|
|
|
|
if status.error:
|
|
state.down_speed_limit = original_limit
|
|
progress.close()
|
|
consoleLog(f"Update download failed: {status.error}")
|
|
timer.stop()
|
|
loop.quit()
|
|
return
|
|
|
|
if status.total_wanted > 0:
|
|
pct = int(status.total_wanted_done * 100 / status.total_wanted)
|
|
speed_mb = status.download_rate / (1024 * 1024)
|
|
progress.setValue(pct)
|
|
progress.setLabelText(f"Downloading update... ({speed_mb:.1f} MB/s)")
|
|
|
|
if status.state == lt.torrent_status.seeding:
|
|
timer.stop()
|
|
loop.quit()
|
|
|
|
timer.timeout.connect(poll_progress)
|
|
timer.start()
|
|
loop.exec()
|
|
|
|
if handle.status().error:
|
|
return
|
|
|
|
state.down_speed_limit = original_limit
|
|
|
|
if setup_hash:
|
|
if _verify_hash(installer_path, setup_hash):
|
|
consoleLog(f"Successfully validated installer hash ({setup_hash})")
|
|
else:
|
|
progress.close()
|
|
consoleLog("Error: Invalid file hash, file may be corrupted")
|
|
sys.exit(0)
|
|
else:
|
|
consoleLog("Skipping hash verification (no hash found for release)")
|
|
|
|
progress.setLabelText("Installing update...")
|
|
progress.setValue(100)
|
|
QtWidgets.QApplication.processEvents()
|
|
|
|
closehelper()
|
|
subprocess.Popen([installer_path, "/VERYSILENT", "/SUPPRESSMSGBOXES", "/SP-", "/CLOSEAPPLICATIONS"])
|
|
os._exit(0) |