Compare commits

...

24 Commits

Author SHA1 Message Date
shayaa 9bc0e22ff7 Merge pull request #88 from KeksPirates/refactor/stability
fix/refactor/Improve Stability
2026-04-17 14:57:48 +02:00
Vxrtrauter 982be09f6e Refactor: implement log emitter for improved logging and signal handling 2026-04-16 11:51:11 +02:00
Vxrtrauter d5582c5c38 Refactor: enhance download_update function with cancellation handling and error messaging 2026-04-15 14:18:36 +02:00
Vxrtrauter 392d2a6f03 Refactor: enhance AppDaemons with QThread for improved background task management 2026-04-14 14:40:19 +02:00
Vxrtrauter 7310049246 Refactor: notification handling and introduce AppDaemons for background tasks 2026-04-14 14:33:21 +02:00
Vxrtrauter f5809c466a Add timeouts, error handling & logging
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.
2026-04-13 11:03:25 +02:00
Vxrtrauter 8f19703314 Merge branch 'main' of https://github.com/KeksPirates/SoftwareManager 2026-04-11 10:17:35 +02:00
Vxrtrauter 7d1f249797 Add sitemap.xml for improved SEO and site indexing 2026-04-11 10:17:34 +02:00
shayaa c20dc32de5 Merge pull request #85 from KeksPirates/enhance/docs
Add meta description and Android favicon
2026-04-11 10:09:54 +02:00
Vxrtrauter b2bc97a6af Add meta description and Android favicon
Add a meta description tag to improve SEO and provide a brief site summary, and add a 192x192 Android favicon link to support Android/home screen icons. This clarifies site metadata and improves mobile presentation.
2026-04-11 10:09:33 +02:00
shayaa 15a771fe9f Change runner to use matrix OS in GitHub Actions 2026-04-11 09:55:36 +02:00
shayaa 976d610baf Change runner to self-hosted for test workflow 2026-04-11 09:47:22 +02:00
shayaa 42616f996d Merge pull request #84 from KeksPirates/fix/steamrip-indexing
fix: steamrip provider indexing
2026-04-11 09:26:46 +02:00
Vxrtrauter 8601a1ed50 fix: Detect SteamRip hosts by URL
Replace brittle index-based host resolution in SteamripScraper with substring checks on the chosen download URL (buzzheavier, gofile, vikingfile, megadb). Add a console log for the resolved link and adjust returned values for gofile. Remove the unnecessary links.index lookup and its exception handling.
2026-04-11 09:25:32 +02:00
shayaa a885576d8a Merge pull request #83 from KeksPirates/auto/sync-readme-dependencies
Sync README dependencies
2026-04-11 00:04:32 +02:00
Vxrtrauter a8de8461bd Sync README dependencies 2026-04-10 22:03:40 +00:00
shayaa c1e4f3a688 Merge pull request #76 from KeksPirates/dependabot/pip/pyqtdarktheme-fork-2.3.6
build(deps): bump pyqtdarktheme-fork from 2.3.4 to 2.3.6
2026-04-11 00:03:30 +02:00
dependabot[bot] ca4020970a build(deps): bump pyqtdarktheme-fork from 2.3.4 to 2.3.6
Bumps [pyqtdarktheme-fork](https://github.com/5yutan5/PyQtDarkTheme) from 2.3.4 to 2.3.6.
- [Release notes](https://github.com/5yutan5/PyQtDarkTheme/releases)
- [Commits](https://github.com/5yutan5/PyQtDarkTheme/commits)

---
updated-dependencies:
- dependency-name: pyqtdarktheme-fork
  dependency-version: 2.3.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-04-10 21:06:14 +00:00
shayaa 0956317eb2 Merge pull request #75 from KeksPirates/dependabot/pip/psutil-7.2.2
build(deps): bump psutil from 7.1.0 to 7.2.2
2026-04-10 23:05:07 +02:00
shayaa eed4af7705 Merge pull request #74 from KeksPirates/dependabot/github_actions/peter-evans/create-pull-request-8
build(deps): bump peter-evans/create-pull-request from 7 to 8
2026-04-10 23:04:16 +02:00
Vxrtrauter 02bb77ea1e fix: set default accent color in AppState to #fda7d7 2026-04-10 20:15:58 +02:00
shayaa 204ef0f233 Fix Workflow 2026-04-10 20:00:04 +02:00
dependabot[bot] 82a2f2d4d7 build(deps): bump psutil from 7.1.0 to 7.2.2
Bumps [psutil](https://github.com/giampaolo/psutil) from 7.1.0 to 7.2.2.
- [Changelog](https://github.com/giampaolo/psutil/blob/master/docs/changelog.rst)
- [Commits](https://github.com/giampaolo/psutil/compare/v7.1.0...v7.2.2)

---
updated-dependencies:
- dependency-name: psutil
  dependency-version: 7.2.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-04-09 22:11:56 +00:00
dependabot[bot] be1c9bfe45 build(deps): bump peter-evans/create-pull-request from 7 to 8
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 7 to 8.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v7...v8)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-04-08 23:10:17 +00:00
21 changed files with 232 additions and 172 deletions
+1 -2
View File
@@ -238,6 +238,7 @@ jobs:
- name: Create Release (Public)
uses: softprops/action-gh-release@v2
with:
token: ${{ secrets.RELEASE_TOKEN }}
tag_name: ${{ needs.build.outputs.version }}
name: ${{ needs.build.outputs.version }}
generate_release_notes: true
@@ -247,5 +248,3 @@ jobs:
release/SoftwareManager-stable-${{ needs.build.outputs.short_sha }}-windows-setup.exe
release/SoftwareManager-stable-${{ needs.build.outputs.short_sha }}-macos
release/SHA256SUMS.txt
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
@@ -29,7 +29,7 @@ jobs:
run: python scripts/sync_readme_dependencies.py
- name: Create pull request
uses: peter-evans/create-pull-request@v7
uses: peter-evans/create-pull-request@v8
with:
commit-message: "Sync README dependencies"
branch: auto/sync-readme-dependencies
+1
View File
@@ -143,6 +143,7 @@ venv/
ENV/
env.bak/
venv.bak/
.python-version
# Spyder project settings
.spyderproject
+2 -2
View File
@@ -46,9 +46,9 @@ SoftwareManager is a Python-based GUI tool that simplifies searching and downloa
beautifulsoup4 (4.14.3)
darkdetect (0.7.1)
pyinstaller (6.19.0)
PyQtDarkTheme-fork (2.3.4)
PyQtDarkTheme-fork (2.3.6)
plyer (2.1.0)
psutil (7.1.0)
psutil (7.2.2)
libtorrent (2.0.11)
libtorrent-windows-dll (0.0.3)
send2trash (2.1.0)
+2
View File
@@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Simply search and download software and games from various sources. Developed with ❤︎ by KeksPirates.">
<meta name="darkreader-lock">
<link rel="stylesheet" href="main.css"/>
<title>SoftwareManager - Simply search and download software from various sources</title>
@@ -10,6 +11,7 @@
<link href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;700&display=swap" rel="stylesheet">
<link rel="apple-touch-icon" sizes="180x180" href="assets/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="192x192" href="assets/favicon/android-chrome-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="assets/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="assets/favicon/favicon-16x16.png">
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://softwaremanager.xyz/</loc>
<priority>1.0</priority>
</url>
<url>
<loc>https://softwaremanager.xyz/api</loc>
<priority>0.8</priority>
</url>
<url>
<loc>https://softwaremanager.xyz/docs</loc>
<priority>0.8</priority>
</url>
</urlset>
+2 -2
View File
@@ -3,9 +3,9 @@ PySide6-Essentials==6.11.0
beautifulsoup4==4.14.3
darkdetect==0.7.1
pyinstaller==6.19.0
PyQtDarkTheme-fork==2.3.4
PyQtDarkTheme-fork==2.3.6
plyer==2.1.0
psutil==7.1.0
psutil==7.2.2
libtorrent==2.0.11
libtorrent-windows-dll==0.0.3
send2trash==2.1.0
+15 -7
View File
@@ -1,9 +1,13 @@
from utils.logging.logs import consoleLog
import requests
def scrape_buzzheavier(url):
response = requests.get(url)
response.raise_for_status()
try:
response = requests.get(url, timeout=15)
response.raise_for_status()
except requests.RequestException as e:
consoleLog(f"Buzzheavier: Failed to fetch page - {e}")
return None
download_url = url + '/download'
@@ -12,7 +16,11 @@ def scrape_buzzheavier(url):
'hx-request': 'true',
'referer': url
}
head_response = requests.head(download_url, headers=headers, allow_redirects=False)
hx_redirect = head_response.headers.get('hx-redirect')
return hx_redirect
try:
head_response = requests.head(download_url, headers=headers, allow_redirects=False, timeout=15)
hx_redirect = head_response.headers.get('hx-redirect')
return hx_redirect
except requests.RequestException as e:
consoleLog(f"Buzzheavier: Failed to fetch download URL - {e}")
return None
+35 -33
View File
@@ -23,42 +23,44 @@ def scrape_gofile(url):
content_id = match.group(1)
session = requests.Session()
try:
# Create a guest account
r = session.post(f"{_API_BASE}/accounts", headers={"User-Agent": _USER_AGENT}, timeout=15)
data = r.json()
if data.get("status") != "ok":
consoleLog("GoFile: Failed to create guest account")
return None
# Create a guest account
r = session.post(f"{_API_BASE}/accounts", headers={"User-Agent": _USER_AGENT})
data = r.json()
if data.get("status") != "ok":
consoleLog("GoFile: Failed to create guest account")
return None
account_token = data["data"]["token"]
website_token = _generate_website_token(account_token)
account_token = data["data"]["token"]
website_token = _generate_website_token(account_token)
headers = {
"User-Agent": _USER_AGENT,
"Authorization": f"Bearer {account_token}",
"X-Website-Token": website_token,
"X-BL": "en-US",
"Referer": "https://gofile.io/",
"Origin": "https://gofile.io",
}
headers = {
"User-Agent": _USER_AGENT,
"Authorization": f"Bearer {account_token}",
"X-Website-Token": website_token,
"X-BL": "en-US",
"Referer": "https://gofile.io/",
"Origin": "https://gofile.io",
}
# Fetch folder contents
r = session.get(f"{_API_BASE}/contents/{content_id}", headers=headers, timeout=15)
data = r.json()
if data.get("status") != "ok":
consoleLog(f"GoFile: API error - {data.get('status')}")
return None
# Fetch folder contents
r = session.get(f"{_API_BASE}/contents/{content_id}", headers=headers)
data = r.json()
if data.get("status") != "ok":
consoleLog(f"GoFile: API error - {data.get('status')}")
return None
children = data["data"].get("children", {})
if not children:
consoleLog("GoFile: No files found")
return None
children = data["data"].get("children", {})
if not children:
consoleLog("GoFile: No files found")
return None
first_child = next(iter(children.values()))
link = first_child.get("link")
if not link:
consoleLog("GoFile: No download link in response")
return None
first_child = next(iter(children.values()))
link = first_child.get("link")
if not link:
consoleLog("GoFile: No download link in response")
return None
return link, headers
return link, headers
finally:
session.close()
+11 -2
View File
@@ -2,6 +2,7 @@ from utils.network.jsonhandler import split_data, format_data
from utils.data.tracker import get_magnet_link
from utils.logging.logs import consoleLog
from utils.data.state import state
from urllib.parse import quote
from typing import Dict
import requests
@@ -11,10 +12,18 @@ class RutrackerScraper:
is_magnet = True
def search(self, query):
search = requests.get(f"{state.api_url}/search?q={query}", timeout=15)
try:
search = requests.get(f"{state.api_url}/search?q={quote(query)}", timeout=15)
except requests.RequestException as e:
consoleLog(f"Failed to reach server: {e}")
return []
consoleLog("Sent request to server")
if search:
_, data, _, success, cached = split_data(search.text)
try:
_, data, _, success, cached = split_data(search.text)
except (KeyError, ValueError) as e:
consoleLog(f"Failed to parse server response: {e}")
return []
if cached:
consoleLog("Server response cached")
if success:
+7 -11
View File
@@ -27,7 +27,7 @@ class SteamripScraper:
try:
url = f"https://steamrip.com/games-list-page/"
response = requests.get(url)
response = requests.get(url, timeout=15)
response.raise_for_status()
text = response.text
except requests.RequestException as e:
@@ -61,7 +61,7 @@ class SteamripScraper:
def scrape_steamrip_game_downloads(self, url):
try:
response = requests.get(url)
response = requests.get(url, timeout=15)
response.raise_for_status()
except requests.RequestException as e:
consoleLog(f"SteamRip: Failed to fetch game page - {e}")
@@ -110,23 +110,19 @@ class SteamripScraper:
consoleLog("SteamRip: No valid download links found")
return None, None
try:
idx = links.index(best)
except ValueError:
consoleLog("SteamRip: Failed to resolve download host")
return None, None
try:
if idx == 0:
consoleLog(f"Found download link: {best}")
if "buzzheavier" in best:
link = scrape_buzzheavier(best)
return link
elif idx == 1:
elif "gofile" in best:
link, headers = scrape_gofile(best)
return link, headers
elif idx == 2:
elif "vikingfile" in best:
scrape_vikingfile(best)
return None, None
elif idx == 3:
elif "megadb" in best:
scrape_megadb(best)
return None, None
else:
+1 -1
View File
@@ -19,7 +19,7 @@ class UztrackerScraper:
posts = []
try:
response = requests.get(search_url)
response = requests.get(search_url, timeout=15)
response.raise_for_status()
soup = BeautifulSoup(response.text, 'html.parser')
links = soup.find_all('tr', class_="tCenter hl-tr", id=lambda x: x and x.startswith('tor_'))
+19 -18
View File
@@ -1,4 +1,5 @@
from PySide6.QtCore import Qt, QPoint, Signal, QThread
from network.direct_download.handle import DirectDownloadHandle
from utils.logging.logs import consoleLog, remove_download_log
from utils.network.download import download_selected
from utils.data.tracker import get_magnet_link
@@ -121,7 +122,12 @@ class ContextMenu_Downloads:
remove_download_log(magnet_link)
if state.dl_session:
if isinstance(magnetdl, DirectDownloadHandle):
try:
magnetdl.stop()
except Exception as e:
consoleLog(f"Exception while stopping direct download: {e}")
elif state.dl_session:
try:
state.dl_session.remove_torrent(magnetdl)
except Exception as e:
@@ -179,29 +185,24 @@ class ContextMenu_Downloads:
remove_download_log(magnet_link)
if state.dl_session:
if isinstance(magnetdl, DirectDownloadHandle):
try:
magnetdl.stop()
except Exception as e:
consoleLog(f"Exception while stopping direct download: {e}")
elif state.dl_session:
try:
state.dl_session.remove_torrent(magnetdl)
time.sleep(0.5)
except Exception as e:
consoleLog(f"Exception while removing download from LibTorrent: {e}")
if download_path and os.path.exists(download_path):
last_error = None
for attempt in range(3):
try:
if os.path.isfile(download_path) or os.path.isdir(download_path):
send2trash(download_path)
consoleLog(f"Deleted files for: {torrent_name}", True)
last_error = None
break
except Exception as e:
last_error = e
if attempt < 2:
time.sleep(0.5)
if last_error:
consoleLog(f"Error deleting files: {last_error}", True)
try:
if os.path.isfile(download_path) or os.path.isdir(download_path):
send2trash(download_path)
consoleLog(f"Deleted files for: {torrent_name}", True)
except Exception as e:
consoleLog(f"Error deleting files: {e}", True)
else:
consoleLog(f"Removed entry (files not found): {torrent_name}", True)
+6 -9
View File
@@ -17,6 +17,7 @@ from interface.utils.searchhelper import run_search
from interface.utils.tabhelper import create_tab
from utils.general.shutdown import closehelper
from utils.general.wrappers import run_thread
from utils.logging.logs import log_emitter
from interface.dialogs.image import Image
from utils.data.state import state
@@ -68,14 +69,12 @@ class CenteredDelegate(QStyledItemDelegate):
class MainWindow(QtWidgets.QMainWindow, QWidget):
eventFilter = eventFilter
log_signal = Signal(str)
search_results_signal = Signal(list)
_instance = None
def __init__(self):
super().__init__()
MainWindow._instance = self
self.log_signal.connect(self._on_log_signal)
self.search_results_signal.connect(self._on_search_results)
pixmap = QPixmap()
@@ -132,6 +131,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
self.consoleLog = QTextEdit()
self.statusbar = QStatusBar()
log_emitter.new_log.connect(self._on_log_signal)
flush_log_buffer()
self._tracker_elided_delegate = ElidedItemDelegate(lambda: self._tracker_hovered_row, self)
@@ -307,6 +307,10 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
table.setItemDelegateForColumn(i, self._tracker_hover_delegate)
def _start_search(self):
self.searchbar.setEnabled(False)
state.trackertable.setRowCount(0)
self.show_empty_results(False)
def _search_thread():
try:
run_search(self)
@@ -315,13 +319,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
self.search_results_signal.emit([])
run_thread(threading.Thread(target=_search_thread))
@staticmethod
def add_log(text):
if hasattr(MainWindow, "_instance") and MainWindow._instance:
MainWindow._instance.log_signal.emit(text)
return True
return False
def _on_log_signal(self, text):
if hasattr(self, 'consoleLog'):
self.consoleLog.append(text)
+2 -6
View File
@@ -6,9 +6,6 @@ for scraper in SCRAPERS:
state.trackers[scraper.name] = scraper
def run_search(self) -> None:
state.trackertable.setRowCount(0)
self.show_empty_results(False)
search_text = self.searchbar.text()
# Check for empty search
if search_text == "":
@@ -16,12 +13,11 @@ def run_search(self) -> None:
return
state.posts = []
self.searchbar.setEnabled(False)
consoleLog(f"User searched for: {search_text}")
# Get current tracker and call its search function
scraper = state.trackers[state.currenttracker]
state.posts = scraper.search(search_text)
# Update GUI headers to match the current scraper
self.search_results_signal.emit(scraper.headers)
+8 -6
View File
@@ -1,4 +1,3 @@
from network.libtorrent_misc import send_notification, update_log, check_deleted_files
from utils.logging.loghandler import split_data, check_completed, check_downloads
from network.interface import list_interfaces, init_interfaces
from PySide6.QtNetwork import QLocalServer, QLocalSocket
@@ -9,12 +8,13 @@ from utils.general.shutdown import closehelper
from utils.general.wrappers import run_thread
from interface.assets.base64_icons import logo_base64
from PySide6.QtWidgets import QSystemTrayIcon, QMenu
from network.libtorrent_misc import AppDaemons
from utils.general.shutdown import force_exit
from utils.config.config import read_config
from PySide6.QtGui import QAction, QPixmap
from utils.logging.logs import consoleLog
from interface.gui import MainWindow
from PySide6.QtCore import Qt, QObject
from PySide6.QtCore import Qt, QObject, QThread
from utils.data.state import state
from PySide6 import QtWidgets
import qdarktheme
@@ -45,7 +45,6 @@ class SingleInstance(QObject):
self.server.listen(SERVER_NAME)
self.server.newConnection.connect(self.handle_connection)
self.is_running = False
self.is_running = False
def handle_connection(self):
socket = self.server.nextPendingConnection()
@@ -143,9 +142,12 @@ def main():
init_interfaces()
consoleLog(f"Current Bound: {state.bound_interface}")
# Start background daemon threads
run_thread(threading.Thread(target=send_notification, args=(state.shutdown_event,), daemon=True))
run_thread(threading.Thread(target=update_log, args=(state.shutdown_event,), daemon=True))
run_thread(threading.Thread(target=check_deleted_files, args=(state.shutdown_event,), daemon=True))
app._daemon_thread = QThread()
app._daemons = AppDaemons()
app._daemons.moveToThread(app._daemon_thread)
app._daemon_thread.started.connect(app._daemons.start_all)
app.aboutToQuit.connect(app._daemon_thread.quit)
app._daemon_thread.start()
# Start background non-daemon threads
run_thread(threading.Thread(target=check_completed, args=(downloads, state.autoresume)))
run_thread(threading.Thread(target=check_downloads, args=(downloads,)))
+1 -1
View File
@@ -163,7 +163,7 @@ def add_seed(magnet_uri, file_path):
return False
with state.downloads_lock:
state.active_downloads[magnet_uri] = handle
state.seeded_magnets.add(magnet_uri)
state.seeded_magnets.add(magnet_uri)
return True
+54 -48
View File
@@ -1,5 +1,6 @@
from utils.logging.logs import update_download_completed_by_hash
from utils.logging.logs import consoleLog
from PySide6.QtCore import QObject, QTimer
from utils.data.state import state
from plyer import notification
import libtorrent as lt
@@ -19,55 +20,28 @@ def cleanup_session():
with state.downloads_lock:
state.active_downloads.clear()
def send_notification(shutdown_event):
notified = set()
while not shutdown_event.is_set():
try:
with state.downloads_lock:
items = list(state.active_downloads.items())
for magnet_uri, magnetdl in items:
if isinstance(magnetdl, dict):
continue
status = magnetdl.status()
if status.state == lt.torrent_status.seeding and magnet_uri not in notified:
notification.notify(
title="Download finished",
message=f"{status.name} has finished downloading.",
timeout=4
)
notified.add(magnet_uri)
except Exception as e:
consoleLog(f"Exception while sending notification: {e}")
time.sleep(5)
class AppDaemons(QObject):
def __init__(self):
super().__init__()
def update_log(shutdown_event):
updated = set()
while not shutdown_event.is_set():
try:
with state.downloads_lock:
items = list(state.active_downloads.items())
for magnet_uri, magnetdl in items:
if isinstance(magnetdl, dict):
continue
status = magnetdl.status()
if status.state == lt.torrent_status.seeding and magnet_uri not in updated and magnet_uri not in state.seeded_magnets:
consoleLog(f"Marking {status.name} as completed")
if hasattr(status, 'info_hashes'):
info_hash = str(status.info_hashes.v1)
else:
info_hash = str(status.info_hash)
update_download_completed_by_hash(info_hash, True)
updated.add(magnet_uri)
except Exception as e:
consoleLog(f"Exception while updating log file: {e}")
time.sleep(5)
self.notified_magnets = set()
self.updated_magnets = set()
def check_deleted_files(shutdown_event):
while not shutdown_event.is_set():
# Create Timers
self.deleted_files_timer = QTimer(self)
self.completed_downloads_timer = QTimer(self)
# Connect Timer Signals
self.deleted_files_timer.timeout.connect(self.check_deleted_files)
self.completed_downloads_timer.timeout.connect(self.check_completed_downloads)
def start_all(self):
consoleLog("Starting Timer: deleted_files")
self.deleted_files_timer.start(2000)
consoleLog("Starting Timer: completed_downloads")
self.completed_downloads_timer.start(5000)
def check_deleted_files(self):
try:
with state.downloads_lock:
items = list(state.active_downloads.items())
@@ -87,4 +61,36 @@ def check_deleted_files(shutdown_event):
del state.active_downloads[magnet_uri]
except Exception as e:
consoleLog(f"Exception while checking for file deletions: {e}")
time.sleep(5)
def check_completed_downloads(self):
try:
with state.downloads_lock:
items = list(state.active_downloads.items())
seeded = set(state.seeded_magnets)
for magnet_uri, magnetdl in items:
if isinstance(magnetdl, dict):
continue
status = magnetdl.status()
if status.state == lt.torrent_status.seeding:
if magnet_uri not in self.updated_magnets and magnet_uri not in seeded:
consoleLog(f"Marking {status.name} as completed")
if hasattr(status, 'info_hashes'):
info_hash = str(status.info_hashes.v1)
else:
info_hash = str(status.info_hash)
update_download_completed_by_hash(info_hash, True)
self.updated_magnets.add(magnet_uri)
if magnet_uri not in self.notified_magnets:
notification.notify(
title="Download finished",
message=f"{status.name} has finished downloading.",
timeout=4
)
self.notified_magnets.add(magnet_uri)
except Exception as e:
consoleLog(f"Exception while checking downloads: {e}")
+2 -1
View File
@@ -25,7 +25,7 @@ class AppState(QObject):
# GUI
self.window_transparency: bool = False
self.accent_color: str = ""
self.accent_color: str = "#fda7d7"
self.trackertable: QTableWidget
self.interfaces: List = []
self.active_interfaces: List = []
@@ -61,6 +61,7 @@ class AppState(QObject):
self.max_connections: int = 200
self.max_downloads: int = 10
self.downloads_lock = threading.RLock()
self._log_lock = threading.Lock()
@property
def image_path(self) -> str:
+14 -14
View File
@@ -1,4 +1,5 @@
from utils.data.models import Download, DownloadList
from PySide6.QtCore import QObject, Signal
from utils.data.state import state
from dataclasses import asdict
from datetime import datetime
@@ -7,6 +8,10 @@ import time
import os
import re
class LogSignal(QObject):
new_log = Signal(str)
log_emitter = LogSignal()
def _downloads_file_path() -> str:
return os.path.join(state.settings_path, "downloads.json")
@@ -187,27 +192,22 @@ def _update_download_completed_by_hash_inner(info_hash, completed) -> DownloadLi
def set_main_window(window):
state.main_window = window
def flush_log_buffer(): # credits to claude
if state.log_buffer:
try:
from interface.gui import MainWindow
for log_entry in state.log_buffer:
MainWindow.add_log(log_entry)
state.log_buffer = []
except Exception as e:
consoleLog(f"Exception while flushing log buffer: {e}")
def flush_log_buffer():
with state._log_lock:
for text in state.log_buffer:
log_emitter.new_log.emit(text)
state.log_buffer.clear()
def consoleLog(text, printAnyways = False):
now = datetime.now()
current_time = now.strftime("%H:%M:%S")
formatted_text = f"[{current_time}] {text}"
try:
from interface.gui import MainWindow
if not MainWindow.add_log(formatted_text):
state.log_buffer.append(formatted_text)
except Exception:
with state._log_lock:
state.log_buffer.append(formatted_text)
log_emitter.new_log.emit(formatted_text)
if state.debug or printAnyways:
print(formatted_text)
+31 -8
View File
@@ -2,13 +2,12 @@ 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
from PySide6.QtCore import Qt, QTimer, QEventLoop
from PySide6 import QtWidgets
import libtorrent as lt
import subprocess
import tempfile
import hashlib
import time
import sys
import os
@@ -42,7 +41,6 @@ def download_update(assets: list):
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)
@@ -55,14 +53,19 @@ def download_update(assets: list):
handle = DirectDownloadHandle(url, filename, tempfile.gettempdir())
handle.start()
while True:
QtWidgets.QApplication.processEvents()
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:
@@ -72,9 +75,25 @@ def download_update(assets: list):
progress.setLabelText(f"Downloading update... ({speed_mb:.1f} MB/s)")
if status.state == lt.torrent_status.seeding:
break
timer.stop()
loop.quit()
time.sleep(0.1)
if progress.wasCanceled():
state.down_speed_limit = original_limit
consoleLog("Update download cancelled by user.")
timer.stop()
loop.quit()
return
timer.timeout.connect(poll_progress)
timer.start()
loop.exec()
if progress.wasCanceled():
return
if handle.status().error:
return
state.down_speed_limit = original_limit
@@ -84,6 +103,11 @@ def download_update(assets: list):
else:
progress.close()
consoleLog("Error: Invalid file hash, file may be corrupted")
QtWidgets.QMessageBox.critical(
None,
"Update Failed",
"Error: Invalid file hash, file may be corrupted"
)
sys.exit(0)
else:
consoleLog("Skipping hash verification (no hash found for release)")
@@ -94,5 +118,4 @@ def download_update(assets: list):
closehelper()
subprocess.Popen([installer_path, "/VERYSILENT", "/SUPPRESSMSGBOXES", "/SP-", "/CLOSEAPPLICATIONS"])
time.sleep(1)
os._exit(0)