diff --git a/installer.iss b/installer.iss index bf95032..8d58c9e 100644 --- a/installer.iss +++ b/installer.iss @@ -27,24 +27,30 @@ AppId={{8F2E4B6A-1C3D-4E5F-9A7B-0D8E6F2C4A1B} AppName={#MyAppName} AppVersion={#MyAppVersion} +AppVerName={#MyAppName} {#MyAppVersion} AppPublisher={#MyAppPublisher} AppPublisherURL={#MyAppURL} AppSupportURL={#MyAppURL}/issues +AppUpdatesURL={#MyAppURL}/releases DefaultDirName={autopf}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes +LicenseFile=LICENSE OutputDir={#MyOutputDir} OutputBaseFilename={#MyOutputFilename} Compression=lzma2 SolidCompression=yes WizardStyle=modern +DisableWelcomePage=no PrivilegesRequired=lowest PrivilegesRequiredOverridesAllowed=dialog UninstallDisplayIcon={app}\{#MyAppExeName} +UninstallDisplayName={#MyAppName} ArchitecturesAllowed=x64compatible ArchitecturesInstallIn64BitMode=x64compatible CloseApplications=yes RestartApplications=yes +ShowLanguageDialog=auto [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" @@ -62,3 +68,4 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de [Run] Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent +Filename: "{app}\{#MyAppExeName}"; Flags: nowait skipifnotsilent diff --git a/src/core/data/scrapers/monkrus.py b/src/core/data/scrapers/monkrus.py index b6baa5b..e3757b4 100644 --- a/src/core/data/scrapers/monkrus.py +++ b/src/core/data/scrapers/monkrus.py @@ -83,5 +83,5 @@ Metadata = { "scrapeSearches" : True, } -if __name__ != "__main__": +def init_m0nkrus(): state.trackers.update({Metadata["name"] : Metadata}) diff --git a/src/core/data/scrapers/rutracker.py b/src/core/data/scrapers/rutracker.py index 46255fb..32be176 100644 --- a/src/core/data/scrapers/rutracker.py +++ b/src/core/data/scrapers/rutracker.py @@ -38,6 +38,5 @@ Metadata = { } - -if __name__ != "__main__": +def init_rutracker(): state.trackers.update({Metadata["name"] : Metadata}) diff --git a/src/core/data/scrapers/steamrip.py b/src/core/data/scrapers/steamrip.py index 961ca59..96621a9 100644 --- a/src/core/data/scrapers/steamrip.py +++ b/src/core/data/scrapers/steamrip.py @@ -102,7 +102,7 @@ Metadata = { "scrapeFunc" : filter_steamrip, } -if __name__ != "__main__": +def init_steamrip(): state.trackers.update({Metadata["name"] : Metadata}) if __name__ == "__main__": diff --git a/src/core/data/scrapers/uztracker.py b/src/core/data/scrapers/uztracker.py index f66d415..43c3baa 100644 --- a/src/core/data/scrapers/uztracker.py +++ b/src/core/data/scrapers/uztracker.py @@ -21,7 +21,9 @@ def scrape_uztracker(query): links = soup.find_all('tr', class_="tCenter hl-tr", id=lambda x: x and x.startswith('tor_')) for link in links: - theme_link = link.find('a', class_="genmed tLink", href=lambda x: x and x.startswith('./viewtopic')) + theme_link = link.find('a', class_="genmed tLink", href=lambda x: x and x.startswith('./viewtopic')) + if not theme_link or not theme_link.b: + continue url = urljoin(base_url, theme_link['href']) title = theme_link.b.text author_link = link.find('a', class_="med") @@ -47,5 +49,5 @@ Metadata = { "scrapeSearches" : True, } -if __name__ != "__main__": +def init_uztracker(): state.trackers.update({Metadata["name"] : Metadata}) diff --git a/src/core/interface/dialogs/settings.py b/src/core/interface/dialogs/settings.py index bf2f0e8..a50efdc 100644 --- a/src/core/interface/dialogs/settings.py +++ b/src/core/interface/dialogs/settings.py @@ -121,24 +121,24 @@ def settings_dialog(self): # IMAGE PATH # ############### - image_path_container = QWidget() - image_path_layout = QHBoxLayout() + # image_path_container = QWidget() + # image_path_layout = QHBoxLayout() - image_path = QLineEdit() - image_path_layout.addWidget(QLabel("Image Path (requires restart):")) - image_path_layout.addWidget(image_path) - image_path_container.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) - image_path_container.setLayout(image_path_layout) - image_path.setText(state.image_path) + # image_path = QLineEdit() + # image_path_layout.addWidget(QLabel("Image Path (requires restart):")) + # image_path_layout.addWidget(image_path) + # image_path_container.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed) + # image_path_container.setLayout(image_path_layout) + # image_path.setText(state.image_path) - def browse_image_path(): - file_path = QFileDialog.getOpenFileName(dialog, "Select Image File", state.image_path, "Image Files (*.png *.jpg)")[0] - if file_path: - image_path.setText(file_path) + # def browse_image_path(): + # file_path = QFileDialog.getOpenFileName(dialog, "Select Image File", state.image_path, "Image Files (*.png *.jpg)")[0] + # if file_path: + # image_path.setText(file_path) - browse_button = QPushButton("📁") - image_path_layout.addWidget(browse_button) - browse_button.clicked.connect(browse_image_path) + # browse_button = QPushButton("📁") + # image_path_layout.addWidget(browse_button) + # browse_button.clicked.connect(browse_image_path) ################## # SPEED LIMITING # @@ -224,8 +224,6 @@ def settings_dialog(self): else: interface_select.setCurrentIndex(0) - interface_select.setFixedWidth(180) - interface_select.setFixedHeight(30) interface_select.setFixedWidth(180) interface_select.setFixedHeight(30) interface_layout.addWidget(interface_select) @@ -246,7 +244,7 @@ def settings_dialog(self): download_path.text(), down_speed_limit.value(), up_speed_limit.value(), - image_path.text(), + None, autoresume_checkbox.isChecked(), max_connections.value(), max_downloads.value(), @@ -258,7 +256,7 @@ def settings_dialog(self): self.tabs = QTabWidget() self.tab1 = general_tab("General", autoresume_container, update_checkbox_container, transparent_window_container, self.tabs) - self.tab2 = paths_tab("Paths", download_path_container, image_path_container, self.tabs) + self.tab2 = paths_tab("Paths", download_path_container, self.tabs) self.tab3 = network_tab("Network", interface_container, max_connections_container, max_downloads_container, up_speed_limit_container, down_speed_limit_container, api_url_container, self.tabs) dialog.layout().addWidget(self.tabs) diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py index acb469b..1815954 100644 --- a/src/core/interface/gui.py +++ b/src/core/interface/gui.py @@ -28,7 +28,6 @@ import requests as r import os import subprocess import libtorrent as lt -import time import sys import json import base64 @@ -86,10 +85,16 @@ def _table_stylesheet(view_type="QTableWidget"): {view_type}::item {{ border-bottom: 1px solid {c["border"]}; padding: 6px 14px; + outline: none; {color_rule} }} {view_type}::item:selected {{ background: {c["selected"]}; + outline: none; + }} + {view_type}::item:focus {{ + outline: none; + border: none; }} QHeaderView {{ background: transparent; @@ -136,25 +141,46 @@ SVG_FOLDER = ' 0: + progress.setValue(int(downloaded * 100 / total)) + QtWidgets.QApplication.processEvents() + + if not os.path.exists(installer_path): + progress.close() raise FileNotFoundError("Executable not found") - subprocess.run([new_filename, "/VERYSILENT", "/SUPPRESSMSGBOXES", "/NORESTART", "/SP-"]) - time.sleep(0.5) - msg = QMessageBox() - msg.setIcon(QMessageBox.Icon.Information) - msg.setWindowTitle("New Version") - msg.setText("New version installed.") - msg.setInformativeText("Please remove the old exe.") - msg.setStandardButtons(QMessageBox.StandardButton.Ok) + progress.setLabelText("Installing update...") + progress.setValue(100) + QtWidgets.QApplication.processEvents() + subprocess.Popen([installer_path, "/VERYSILENT", "/SUPPRESSMSGBOXES", "/SP-", "/CLOSEAPPLICATIONS"]) + time.sleep(1) sys.exit(0) @@ -219,7 +245,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): self.searchbar.setPlaceholderText("Search for software...") self.searchbar.setClearButtonEnabled(True) self.searchbar.setMinimumHeight(30) - self.searchbar.returnPressed.connect(lambda: run_thread(threading.Thread(target=return_pressed, args=(self,)))) # Triggers data function thread on enter + self.searchbar.returnPressed.connect(self._start_search) self.dlbutton = QtWidgets.QPushButton("Download") self.dlbutton.setCursor(Qt.CursorShape.PointingHandCursor) @@ -269,6 +295,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): containerLayout = QVBoxLayout() containerLayout.addWidget(self.searchbar) containerLayout.addWidget(state.trackertable) + search_row = QHBoxLayout() + search_row.addWidget(self.searchbar) class DownloadModel(QAbstractTableModel): def __init__(self): @@ -630,6 +658,12 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): self.context_menu.addAction("Cancel Download", self.cancelDownloadAction) self.context_menu.addAction("Delete File", self.deleteFileAction) + def _start_search(self): + self.searchbar.setEnabled(False) + def _search_thread(): + return_pressed(self) + run_thread(threading.Thread(target=_search_thread)) + @staticmethod def add_log(text): if MainWindow._instance: @@ -659,6 +693,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): self._resize_tracker_columns() self.show_empty_results(False) + self.searchbar.setEnabled(True) + self.searchbar.setFocus() def update_image_overlay(self, new_image_path): self.image = QImage(new_image_path) diff --git a/src/core/interface/utils/searchhelper.py b/src/core/interface/utils/searchhelper.py index b1e548d..967872e 100644 --- a/src/core/interface/utils/searchhelper.py +++ b/src/core/interface/utils/searchhelper.py @@ -1,11 +1,15 @@ from PySide6.QtWidgets import QTableWidgetItem, QHeaderView from core.utils.logging.logs import consoleLog -from core.data.scrapers.rutracker import scrape_rutracker -from core.data.scrapers.uztracker import scrape_uztracker -from core.data.scrapers.monkrus import scrape_m0nkrus -from core.data.scrapers.steamrip import filter_steamrip +from core.data.scrapers.rutracker import init_rutracker +from core.data.scrapers.uztracker import init_uztracker +from core.data.scrapers.monkrus import init_m0nkrus +from core.data.scrapers.steamrip import init_steamrip from core.utils.data.state import state -from core.interface.gui import MainWindow + +init_rutracker() +init_uztracker() +init_m0nkrus() +init_steamrip() def return_pressed(self): self.show_empty_results(False) @@ -21,4 +25,5 @@ def return_pressed(self): state.posts = scrapefunc(search_text) + from core.interface.gui import MainWindow MainWindow._instance.search_results_signal.emit(tracker["headers"]) diff --git a/src/core/interface/utils/tabhelper.py b/src/core/interface/utils/tabhelper.py index 74c4dd1..2d6c53f 100644 --- a/src/core/interface/utils/tabhelper.py +++ b/src/core/interface/utils/tabhelper.py @@ -30,11 +30,11 @@ def general_tab(title, autoresume, update_checkbox, transparent_window, tabs): tabs.addTab(tab, title) return tab -def paths_tab(title, download_path, image_path, tabs): +def paths_tab(title, download_path, tabs): tab = QWidget() layout = QVBoxLayout() layout.addWidget(download_path) - layout.addWidget(image_path) + # layout.addWidget(image_path) layout.addStretch() tab.setLayout(layout) tabs.addTab(tab, title) diff --git a/src/core/network/libtorrent_int.py b/src/core/network/libtorrent_int.py index d19e4fb..9160b66 100644 --- a/src/core/network/libtorrent_int.py +++ b/src/core/network/libtorrent_int.py @@ -74,10 +74,13 @@ def add_download(magnet_uri, dl_path=state.download_path): consoleLog("Skipping Downloading, download already running... ") return False - magnetdl = lt.parse_magnet_uri(magnet_uri) - magnetdl.save_path = dl_path - - download = state.dl_session.add_torrent(magnetdl) + try: + magnetdl = lt.parse_magnet_uri(magnet_uri) + magnetdl.save_path = dl_path + download = state.dl_session.add_torrent(magnetdl) + except Exception as e: + consoleLog(f"Failed to add torrent: {e}") + return False state.active_downloads[magnet_uri] = download consoleLog(f"Added {magnet_uri} to downloads") @@ -95,10 +98,13 @@ def add_seed(magnet_uri, file_path): consoleLog("Already seeding this torrent") return False - magnetdl = lt.parse_magnet_uri(magnet_uri) - magnetdl.save_path = os.path.dirname(file_path) - - handle = state.dl_session.add_torrent(magnetdl) + try: + magnetdl = lt.parse_magnet_uri(magnet_uri) + magnetdl.save_path = os.path.dirname(file_path) + handle = state.dl_session.add_torrent(magnetdl) + except Exception as e: + consoleLog(f"Failed to add seed: {e}") + return False state.active_downloads[magnet_uri] = handle state.seeded_magnets.add(magnet_uri) return True diff --git a/src/core/utils/data/tracker.py b/src/core/utils/data/tracker.py index 962fa38..79ed98f 100644 --- a/src/core/utils/data/tracker.py +++ b/src/core/utils/data/tracker.py @@ -30,7 +30,7 @@ def get_item_url(item, posts, post_titles): # softwarelist currentitem, post lis def get_magnet_link(post_url): try: - response = requests.get(post_url) # eventually impl. cloudscraper + response = requests.get(post_url, timeout=15) # eventually impl. cloudscraper consoleLog("Sent Request to retrieve Magnet Link...") response.raise_for_status() soup = BeautifulSoup(response.text, 'html.parser') diff --git a/src/core/utils/logging/loghandler.py b/src/core/utils/logging/loghandler.py index b48c81d..5d48d10 100644 --- a/src/core/utils/logging/loghandler.py +++ b/src/core/utils/logging/loghandler.py @@ -22,7 +22,10 @@ def check_downloads(downloads): for download in downloads: if os.path.exists(download.path): consoleLog(f"Existing Download: {download.title}") - seed_magnet(download.magnet_uri, download.path) + try: + seed_magnet(download.magnet_uri, download.path) + except Exception as e: + consoleLog(f"Failed to seed {download.title}: {e}") else: consoleLog(f"Inexistent Download: {download.title}") remove_download_log(download.magnet_uri) diff --git a/src/core/utils/logging/logs.py b/src/core/utils/logging/logs.py index b8186d2..c78fd7c 100644 --- a/src/core/utils/logging/logs.py +++ b/src/core/utils/logging/logs.py @@ -89,7 +89,7 @@ def _remove_download_log_inner(magnet_uri) -> DownloadList: magnet_link = (magnet_uri or "").strip() - title = next((getattr(d, 'title', 'Unknown') for d in downloads if (getattr(d, 'magnet_uri', None) or '').strip() == magnet_link or (getattr(d, 'url', None) or '').strip() == magnet_link)) + title = next((getattr(d, 'title', 'Unknown') for d in downloads if (getattr(d, 'magnet_uri', None) or '').strip() == magnet_link or (getattr(d, 'url', None) or '').strip() == magnet_link), 'Unknown') downloads = [d for d in downloads if (getattr(d, 'magnet_uri', None) or "").strip() != magnet_link and (getattr(d, 'url', None) or "").strip() != magnet_link] consoleLog(f"Removed {title} from Log File") diff --git a/src/core/utils/network/update_checker.py b/src/core/utils/network/update_checker.py index 31955a9..a250884 100644 --- a/src/core/utils/network/update_checker.py +++ b/src/core/utils/network/update_checker.py @@ -4,11 +4,11 @@ from core.utils.logging.logs import consoleLog def check_for_updates(): url = f"https://api.github.com/repos/KeksPirates/SoftwareManager/releases" - response = requests.get(url) + response = requests.get(url, timeout=15) if response.status_code != 200: consoleLog(f"Failed to fetch releases: {response.status_code}") - exit(1) + return None, None releases = response.json() releases.sort(key=lambda r: r["published_at"], reverse=True) diff --git a/src/main.py b/src/main.py index 097f67d..8101f87 100644 --- a/src/main.py +++ b/src/main.py @@ -56,7 +56,8 @@ def main(): consoleLog("Started Thread: check_completed") run_thread(threading.Thread(target=check_deleted_files, args=(shutdown_event,), daemon=True)) consoleLog("Started Thread: check_deleted_files") - check_downloads(downloads) + run_thread(threading.Thread(target=check_downloads, args=(downloads,))) + consoleLog("Started Thread: check_downloads") elapsed = time.perf_counter() - start_time consoleLog(f"Initialization completed in {elapsed:.2f}s. Launching GUI") run_gui()