From 4d1a639651299bff6fe89e8b2f1ff8a57a3b7b0e Mon Sep 17 00:00:00 2001 From: KeksNino Date: Sat, 7 Mar 2026 17:55:52 +0100 Subject: [PATCH 01/11] remove unused QProgressBar widget --- src/core/interface/gui.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py index 8ed66a4..8d7a648 100644 --- a/src/core/interface/gui.py +++ b/src/core/interface/gui.py @@ -10,7 +10,6 @@ from PySide6.QtWidgets import ( QHBoxLayout, QComboBox, QTabWidget, - QProgressBar, QHeaderView, QMessageBox, QTableWidget, @@ -143,7 +142,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): self.emptyDownload.setAlignment(Qt.AlignmentFlag.AlignCenter) self.consoleLog = QTextEdit() - self.progressbar = QProgressBar() flush_log_buffer() From fbc2225878fa9637706a220348e2610066cb9e0a Mon Sep 17 00:00:00 2001 From: Vxrtrauter <101264710+Vxrtrauter@users.noreply.github.com> Date: Sat, 7 Mar 2026 20:41:03 +0100 Subject: [PATCH 02/11] refactor: standardize version key in build_info.json and enhance download selection logic in download.py feat: add SVG icons for play, pause, and folder actions in gui.py; implement status bar for download speed display fix: remove unnecessary newline in libtorrent_misc.py and streamline update checker logic in update_checker.py --- src/build_info.json | 2 +- src/core/interface/gui.py | 256 +++++++++++++++++++++-- src/core/network/libtorrent_misc.py | 1 - src/core/utils/network/download.py | 15 +- src/core/utils/network/update_checker.py | 6 +- 5 files changed, 254 insertions(+), 26 deletions(-) diff --git a/src/build_info.json b/src/build_info.json index d405e53..fe645a3 100644 --- a/src/build_info.json +++ b/src/build_info.json @@ -1,3 +1,3 @@ { - "Version": "dev" + "version": "dev" } diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py index 8d7a648..e1b8261 100644 --- a/src/core/interface/gui.py +++ b/src/core/interface/gui.py @@ -1,5 +1,5 @@ from PySide6 import QtWidgets -from PySide6.QtCore import QPersistentModelIndex, Qt, QTimer, QModelIndex, QAbstractTableModel, Signal, QEvent, QSize +from PySide6.QtCore import QPersistentModelIndex, Qt, QTimer, QModelIndex, QAbstractTableModel, Signal, QEvent, QSize, QByteArray from PySide6.QtWidgets import ( QLineEdit, QTableView, @@ -15,9 +15,11 @@ from PySide6.QtWidgets import ( QTableWidget, QTextEdit, QStyledItemDelegate, + QStatusBar ) -from PySide6.QtGui import QIcon, QCloseEvent, QImage, QPixmap, QContextMenuEvent, QGuiApplication +from PySide6.QtGui import QIcon, QCloseEvent, QImage, QPixmap, QContextMenuEvent, QGuiApplication, QColor, QBrush +from PySide6.QtSvg import QSvgRenderer import darkdetect import threading import platform @@ -43,6 +45,22 @@ from core.interface.assets.base64_icons import logo_base64 from core.utils.general.shutdown import closehelper +def _svg_icon(svg_str, size=20): + renderer = QSvgRenderer(QByteArray(svg_str.encode())) + pixmap = QPixmap(size, size) + pixmap.fill(Qt.GlobalColor.transparent) + from PySide6.QtGui import QPainter + painter = QPainter(pixmap) + renderer.render(painter) + painter.end() + return QIcon(pixmap) + + +SVG_PLAY = '' +SVG_PAUSE = '' +SVG_FOLDER = '' + + def download_update(latest_version): new_filename = f"SoftwareManager-dev-{latest_version.replace('-dev', '')}-windows.exe" url = f"https://github.com/KeksPirates/SoftwareManager/releases/latest/download/SoftwareManager-dev-{latest_version.replace('-dev', '')}-windows.exe" @@ -137,26 +155,82 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): self.download_model = None self.downloadList = QTableView() + self.downloadList.setMouseTracking(True) + self._hovered_row = -1 + self._tracker_hovered_row = -1 + self._tracker_hovered_table = None + self.downloadList.viewport().installEventFilter(self) self.emptyLibrary = QLabel("No items in library.") self.emptyDownload = QLabel("No items in downloads.") self.emptyDownload.setAlignment(Qt.AlignmentFlag.AlignCenter) self.consoleLog = QTextEdit() + self.statusbar = QStatusBar() flush_log_buffer() + class TrackerHoverDelegate(QStyledItemDelegate): + def paint(self, painter, option, index): + if index.row() == MainWindow._instance._tracker_hovered_row: + painter.save() + painter.fillRect(option.rect, QColor(255, 255, 255, 15)) + painter.restore() + super().paint(painter, option, index) + + self._tracker_hover_delegate = TrackerHoverDelegate(self) + def create_tracker_table(headers): table = QTableWidget() table.setColumnCount(len(headers)) table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) table.verticalHeader().setVisible(False) table.setHorizontalHeaderLabels(headers) + table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) + table.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) header = table.horizontalHeader() header.setSectionResizeMode(0, QHeaderView.ResizeMode.Stretch) header.setSectionResizeMode(1, QHeaderView.ResizeMode.Fixed) header.resizeSection(1, 500) header.setStretchLastSection(False) + header.setDefaultAlignment(Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter) + header.setHighlightSections(False) + + table.setShowGrid(False) + table.setStyleSheet(""" + QTableWidget { + border: none; + outline: 0; + font-size: 13px; + } + QTableWidget::item { + border-bottom: 1px solid rgba(255, 255, 255, 0.06); + padding: 6px 14px; + } + QTableWidget::item:selected { + background: rgba(255, 255, 255, 0.04); + } + QHeaderView { + background: transparent; + } + QHeaderView::section { + background: transparent; + color: rgba(255, 255, 255, 0.5); + font-weight: normal; + border: none; + border-bottom: 1px solid rgba(255, 255, 255, 0.1); + padding: 6px 14px; + } + QHeaderView::section:checked { + background: transparent; + color: rgba(255, 255, 255, 0.5); + font-weight: normal; + } + """) + + table.setMouseTracking(True) + table.viewport().setMouseTracking(True) + table.setItemDelegate(self._tracker_hover_delegate) return table @@ -173,6 +247,12 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): self.uztrackerlist.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) self.uztrackerlist.viewport().setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) + self.monkruslist.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) + self.monkruslist.viewport().setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) + + for tbl in (self.rutrackerlist, self.uztrackerlist, self.monkruslist): + tbl.viewport().installEventFilter(self) + container = QWidget() containerLayout = QVBoxLayout() containerLayout.addWidget(self.searchbar) @@ -222,11 +302,11 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): elif col == 3: return f"{status.progress * 100:.1f}%" elif col == 4: - speed_kbs = status.download_rate / 1024 - if speed_kbs > 1024: - return f"{speed_kbs / 1024:.1f} MB/s" - else: - return f"{speed_kbs:.1f} kB/s" + down_kb = status.download_rate / 1024 + up_kb = status.upload_rate / 1024 + down_text = f"{down_kb / 1024:.1f} MB/s" if down_kb > 1024 else f"{down_kb:.1f} kB/s" + up_text = f"{up_kb / 1024:.1f} MB/s" if up_kb > 1024 else f"{up_kb:.1f} kB/s" + return f"↓ {down_text} ↑ {up_text}" elif col == 5: downloaded_mb = status.total_wanted_done / (1024 * 1024) if downloaded_mb > 1024: @@ -297,9 +377,24 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): idx = self.index(row, 0) self.dataChanged.emit(idx, idx, [Qt.ItemDataRole.DisplayRole, Qt.ItemDataRole.UserRole]) + class HoverRowDelegate(QStyledItemDelegate): + def paint(self, painter, option, index): + if index.row() == MainWindow._instance._hovered_row: + painter.save() + painter.fillRect(option.rect, QColor(255, 255, 255, 15)) + painter.restore() + super().paint(painter, option, index) + class PauseResumeDelegate(QStyledItemDelegate): clicked = Signal(int) + def paint(self, painter, option, index): + if index.row() == MainWindow._instance._hovered_row: + painter.save() + painter.fillRect(option.rect, QColor(255, 255, 255, 15)) + painter.restore() + super().paint(painter, option, index) + def setEditorData(self, editor, index): button = editor.findChild(QtWidgets.QPushButton) @@ -309,9 +404,11 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): if button: if status.state == lt.torrent_status.seeding: - button.setText("πŸ“") + button.setIcon(_svg_icon(SVG_FOLDER, 18)) + button.setText("") else: - button.setText("β–ΆοΈŽ" if status.paused else "⏸︎") + button.setIcon(_svg_icon(SVG_PLAY if status.paused else SVG_PAUSE, 18)) + button.setText("") def createEditor(self, parent, option, index): magnet_link = list(state.active_downloads.keys())[index.row()] @@ -319,14 +416,25 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): status = magnetdl.status() widget = QWidget(parent) - widget.setStyleSheet("border: none;") + widget.setStyleSheet("border: none; background: transparent;") layout = QHBoxLayout(widget) layout.setContentsMargins(0, 0, 0, 0) if status.state == lt.torrent_status.seeding: - btnPause = QtWidgets.QPushButton("πŸ“") + btnPause = QtWidgets.QPushButton() + btnPause.setIcon(_svg_icon(SVG_FOLDER, 18)) else: - btnPause = QtWidgets.QPushButton("β–ΆοΈŽ" if status.paused else "⏸︎") - btnPause.setFixedSize(40, 30) + btnPause = QtWidgets.QPushButton() + btnPause.setIcon(_svg_icon(SVG_PLAY if status.paused else SVG_PAUSE, 18)) + btnPause.setIconSize(QSize(18, 18)) + btnPause.setFixedSize(30, 30) + btnPause.setCursor(Qt.CursorShape.PointingHandCursor) + btnPause.setStyleSheet(""" + QPushButton { + border: none; + background: transparent; + padding: 0px; + } + """) btnPause.clicked.connect(lambda: self.clicked.emit(index.row())) layout.addStretch() layout.addWidget(btnPause) @@ -342,8 +450,51 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): self.download_model = DownloadModel() self.downloadList.setModel(self.download_model) self.downloadList.horizontalHeader().setStretchLastSection(False) + self.downloadList.horizontalHeader().setSectionResizeMode(0, QHeaderView.ResizeMode.Fixed) + self.downloadList.horizontalHeader().resizeSection(0, 70) self.downloadList.horizontalHeader().setSectionResizeMode(1, QHeaderView.ResizeMode.Stretch) + self.downloadList.horizontalHeader().setSectionResizeMode(4, QHeaderView.ResizeMode.ResizeToContents) + self.downloadList.horizontalHeader().setSectionResizeMode(5, QHeaderView.ResizeMode.ResizeToContents) + self.downloadList.horizontalHeader().setSectionResizeMode(6, QHeaderView.ResizeMode.ResizeToContents) + self.downloadList.horizontalHeader().setMinimumSectionSize(60) + self.downloadList.verticalHeader().setDefaultSectionSize(40) self.downloadList.setSelectionBehavior(QTableView.SelectionBehavior.SelectRows) + self.downloadList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) + self.downloadList.verticalHeader().setVisible(False) + self.downloadList.horizontalHeader().setDefaultAlignment(Qt.AlignmentFlag.AlignLeft | Qt.AlignmentFlag.AlignVCenter) + self.downloadList.horizontalHeader().setHighlightSections(False) + self.downloadList.setMouseTracking(True) + self.downloadList.setShowGrid(False) + self.downloadList.setStyleSheet(""" + QTableView { + border: none; + outline: 0; + font-size: 13px; + } + QTableView::item { + border-bottom: 1px solid rgba(255, 255, 255, 0.06); + padding: 6px 14px; + } + QTableView::item:selected { + background: rgba(255, 255, 255, 0.04); + } + QHeaderView { + background: transparent; + } + QHeaderView::section { + background: transparent; + color: rgba(255, 255, 255, 0.5); + font-weight: normal; + border: none; + border-bottom: 1px solid rgba(255, 255, 255, 0.1); + padding: 6px 14px; + } + QHeaderView::section:checked { + background: transparent; + color: rgba(255, 255, 255, 0.5); + font-weight: normal; + } + """) self.downloadList.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) self.downloadList.viewport().setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) @@ -352,12 +503,16 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): def on_pause_resume_clicked(row): download_model.toggle_pause_resume(row) + self.downloadList.viewport().setMouseTracking(True) + hover_delegate = HoverRowDelegate(self.downloadList) + self.downloadList.setItemDelegate(hover_delegate) + delegate = PauseResumeDelegate(self.downloadList) self.downloadList.setItemDelegateForColumn(0, delegate) delegate.clicked.connect(on_pause_resume_clicked) # download button triggers - self.dlbutton.clicked.connect(lambda: run_thread(threading.Thread(target=download_selected, args=(state.tracker_list[state.tracker].currentItem(), state.posts, state.post_titles)))) + self.dlbutton.clicked.connect(lambda: run_thread(threading.Thread(target=download_selected, args=(state.tracker_list[state.tracker].selectedItems(), state.posts, state.post_titles)))) container.setLayout(containerLayout) self.setCentralWidget(container) @@ -461,8 +616,21 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): self.consoleLog.setReadOnly(True) self.consoleLog.setFixedHeight(150) + self.consoleLog.setStyleSheet("margin-bottom: 0px; background: transparent;") containerLayout.addWidget(self.consoleLog) + self.statusbar.show() + self.statusbar.setStyleSheet("background: transparent; border: none; padding-right: 1px; padding-left: 6px; padding-bottom: 1px; margin-top: -8px") + + self.version = QLabel(f"Version: {state.version}") + self.statusbar.addPermanentWidget(self.version, Qt.AlignmentFlag.AlignLeft) + + self.speed_label = QLabel("↓ 0.0 kB/s ↑ 0.0 kB/s") + self.speed_label.setStyleSheet("padding-right: 6px;") + self.statusbar.addPermanentWidget(self.speed_label) + + self.setStatusBar(self.statusbar) + self.download_timer = QTimer() self.download_timer.timeout.connect(self.download_list_update) self.download_timer.start(500) @@ -504,12 +672,72 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): idx = self.download_model.index(row, 0) self.downloadList.closePersistentEditor(idx) self.downloadList.openPersistentEditor(idx) + self._update_speed_label() + + def _update_speed_label(self): + total_down = 0 + total_up = 0 + for handle in state.active_downloads.values(): + try: + s = handle.status() + total_down += s.download_rate + total_up += s.upload_rate + except Exception: + pass + down_kb = total_down / 1024 + up_kb = total_up / 1024 + down_text = f"{down_kb / 1024:.1f} MB/s" if down_kb > 1024 else f"{down_kb:.1f} kB/s" + up_text = f"{up_kb / 1024:.1f} MB/s" if up_kb > 1024 else f"{up_kb:.1f} kB/s" + self.speed_label.setText(f"↓ {down_text} ↑ {up_text}") + def mousePressEvent(self, event): + self.rutrackerlist.clearSelection() + self.uztrackerlist.clearSelection() + self.monkruslist.clearSelection() + self.downloadList.clearSelection() + super().mousePressEvent(event) + def closeEvent(self, event: QCloseEvent): closehelper() event.accept() + def eventFilter(self, obj, event): + for tbl in (self.rutrackerlist, self.uztrackerlist, self.monkruslist): + if obj == tbl.viewport(): + if event.type() == QEvent.Type.MouseMove: + pos = event.position().toPoint() if hasattr(event, 'position') else event.pos() + idx = tbl.indexAt(pos) + new_row = idx.row() if idx.isValid() else -1 + if new_row != self._tracker_hovered_row or tbl is not self._tracker_hovered_table: + self._tracker_hovered_row = new_row + self._tracker_hovered_table = tbl + tbl.viewport().update() + elif event.type() == QEvent.Type.Leave: + self._tracker_hovered_row = -1 + self._tracker_hovered_table = None + tbl.viewport().update() + break + if obj == self.downloadList.viewport(): + if event.type() == QEvent.Type.MouseMove: + pos = event.position().toPoint() if hasattr(event, 'position') else event.pos() + idx = self.downloadList.indexAt(pos) + new_row = idx.row() if idx.isValid() else -1 + if new_row != self._hovered_row: + old_row = self._hovered_row + self._hovered_row = new_row + self._invalidate_hover_row(old_row) + self._invalidate_hover_row(new_row) + elif event.type() == QEvent.Type.Leave: + old_row = self._hovered_row + self._hovered_row = -1 + self._invalidate_hover_row(old_row) + return super().eventFilter(obj, event) + + def _invalidate_hover_row(self, row): + if row >= 0 and self.download_model: + self.downloadList.viewport().update() + def set_tracker(self, _): old_tracker = state.tracker state.tracker = self.tracker_list.currentText() diff --git a/src/core/network/libtorrent_misc.py b/src/core/network/libtorrent_misc.py index 54a06b4..6a2fa6d 100644 --- a/src/core/network/libtorrent_misc.py +++ b/src/core/network/libtorrent_misc.py @@ -76,7 +76,6 @@ def check_deleted_files(shutdown_event): consoleLog(f"Registered File Deletion: {status.name}") state.dl_session.remove_torrent(magnetdl) del state.active_downloads[magnet_uri] - except Exception: pass time.sleep(5) \ No newline at end of file diff --git a/src/core/utils/network/download.py b/src/core/utils/network/download.py index 35f94d0..c9d6578 100644 --- a/src/core/utils/network/download.py +++ b/src/core/utils/network/download.py @@ -8,12 +8,17 @@ from core.network.libtorrent_int import add_seed import threading -def download_selected(item, posts, post_titles): - if item is not None: - consoleLog(f"Downloading {item.text()}") - run_thread(threading.Thread(target=run_download, args=(item.text(), posts, post_titles))) - else: +def download_selected(items, posts, post_titles): + if not items: consoleLog("No item selected for download.") + return + seen = set() + for item in items: + text = item.text() + if text and text not in seen: + seen.add(text) + consoleLog(f"Downloading {text}") + run_thread(threading.Thread(target=run_download, args=(text, posts, post_titles))) def run_download(item, posts, post_titles): post_url = get_item_url(item, posts, post_titles) diff --git a/src/core/utils/network/update_checker.py b/src/core/utils/network/update_checker.py index f0acb5d..31955a9 100644 --- a/src/core/utils/network/update_checker.py +++ b/src/core/utils/network/update_checker.py @@ -17,11 +17,7 @@ def check_for_updates(): latest_version = latest_release["name"] assets = latest_release["assets"] - - if state.version == "dev": - consoleLog("Dev release detected, skipping version check") - return None, None - elif latest_version != state.version: + if latest_version != state.version: consoleLog(f"New release available: {latest_version}") if assets: consoleLog("Assets:") From b2a30af5cd035263f06522c99d66d0e669efa44c Mon Sep 17 00:00:00 2001 From: Vxrtrauter <101264710+Vxrtrauter@users.noreply.github.com> Date: Sat, 7 Mar 2026 20:46:41 +0100 Subject: [PATCH 03/11] fix: prevent processing of non-downloadable items in download_selected function --- src/core/utils/network/download.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/utils/network/download.py b/src/core/utils/network/download.py index c9d6578..69082b0 100644 --- a/src/core/utils/network/download.py +++ b/src/core/utils/network/download.py @@ -14,6 +14,8 @@ def download_selected(items, posts, post_titles): return seen = set() for item in items: + if item.column() != 0: + continue text = item.text() if text and text not in seen: seen.add(text) From bd5ccc768850277d9aad231c04787b544e6998b6 Mon Sep 17 00:00:00 2001 From: Vxrtrauter <101264710+Vxrtrauter@users.noreply.github.com> Date: Sat, 7 Mar 2026 21:36:11 +0100 Subject: [PATCH 04/11] fix: improve download status handling and enhance thread safety in logging functions --- src/core/interface/gui.py | 97 ++++++++++++++++++++++------------ src/core/utils/logging/logs.py | 46 +++++++++++----- 2 files changed, 96 insertions(+), 47 deletions(-) diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py index e1b8261..d382d04 100644 --- a/src/core/interface/gui.py +++ b/src/core/interface/gui.py @@ -296,7 +296,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): elif status.state == lt.torrent_status.seeding: return "Seeding" elif status.paused: - return "Paused" + is_auto = bool(magnetdl.flags() & lt.torrent_flags.auto_managed) + return "Queued" if is_auto else "Paused" else: return "Queued" elif col == 3: @@ -407,7 +408,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): button.setIcon(_svg_icon(SVG_FOLDER, 18)) button.setText("") else: - button.setIcon(_svg_icon(SVG_PLAY if status.paused else SVG_PAUSE, 18)) + is_user_paused = status.paused and not bool(magnetdl.flags() & lt.torrent_flags.auto_managed) + button.setIcon(_svg_icon(SVG_PLAY if is_user_paused else SVG_PAUSE, 18)) button.setText("") def createEditor(self, parent, option, index): @@ -424,7 +426,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): btnPause.setIcon(_svg_icon(SVG_FOLDER, 18)) else: btnPause = QtWidgets.QPushButton() - btnPause.setIcon(_svg_icon(SVG_PLAY if status.paused else SVG_PAUSE, 18)) + is_user_paused = status.paused and not bool(magnetdl.flags() & lt.torrent_flags.auto_managed) + btnPause.setIcon(_svg_icon(SVG_PLAY if is_user_paused else SVG_PAUSE, 18)) btnPause.setIconSize(QSize(18, 18)) btnPause.setFixedSize(30, 30) btnPause.setCursor(Qt.CursorShape.PointingHandCursor) @@ -442,9 +445,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): widget.setLayout(layout) return widget def editorEvent(self, event, model, option, index): - if index.column() == 0 and event.type() == QEvent.Type.MouseButtonPress: - self.clicked.emit(index.row()) - return True return False self.download_model = DownloadModel() @@ -453,6 +453,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): self.downloadList.horizontalHeader().setSectionResizeMode(0, QHeaderView.ResizeMode.Fixed) self.downloadList.horizontalHeader().resizeSection(0, 70) self.downloadList.horizontalHeader().setSectionResizeMode(1, QHeaderView.ResizeMode.Stretch) + self.downloadList.horizontalHeader().setSectionResizeMode(2, QHeaderView.ResizeMode.ResizeToContents) + self.downloadList.horizontalHeader().setSectionResizeMode(3, QHeaderView.ResizeMode.ResizeToContents) self.downloadList.horizontalHeader().setSectionResizeMode(4, QHeaderView.ResizeMode.ResizeToContents) self.downloadList.horizontalHeader().setSectionResizeMode(5, QHeaderView.ResizeMode.ResizeToContents) self.downloadList.horizontalHeader().setSectionResizeMode(6, QHeaderView.ResizeMode.ResizeToContents) @@ -666,12 +668,34 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): def download_list_update(self): if self.download_model: - self.download_model.layoutAboutToBeChanged.emit() - self.download_model.layoutChanged.emit() - for row in range(self.download_model.rowCount()): - idx = self.download_model.index(row, 0) - self.downloadList.closePersistentEditor(idx) - self.downloadList.openPersistentEditor(idx) + row_count = self.download_model.rowCount() + if row_count > 0: + top_left = self.download_model.index(0, 0) + bottom_right = self.download_model.index(row_count - 1, self.download_model.columnCount() - 1) + self.download_model.dataChanged.emit(top_left, bottom_right, [Qt.ItemDataRole.DisplayRole, Qt.ItemDataRole.UserRole]) + + if not hasattr(self, '_last_dl_row_count'): + self._last_dl_row_count = 0 + if row_count != self._last_dl_row_count: + + for row in range(row_count, self._last_dl_row_count): + idx = self.download_model.index(row, 0) + self.downloadList.closePersistentEditor(idx) + self._last_dl_row_count = row_count + self.download_model.layoutAboutToBeChanged.emit() + self.download_model.layoutChanged.emit() + for row in range(row_count): + idx = self.download_model.index(row, 0) + self.downloadList.closePersistentEditor(idx) + self.downloadList.openPersistentEditor(idx) + else: + + delegate = self.downloadList.itemDelegateForColumn(0) + for row in range(row_count): + idx = self.download_model.index(row, 0) + editor = self.downloadList.indexWidget(idx) + if editor and delegate: + delegate.setEditorData(editor, idx) self._update_speed_label() def _update_speed_label(self): @@ -703,35 +727,38 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): event.accept() def eventFilter(self, obj, event): - for tbl in (self.rutrackerlist, self.uztrackerlist, self.monkruslist): - if obj == tbl.viewport(): + try: + for tbl in (self.rutrackerlist, self.uztrackerlist, self.monkruslist): + if obj == tbl.viewport(): + if event.type() == QEvent.Type.MouseMove: + pos = event.position().toPoint() if hasattr(event, 'position') else event.pos() + idx = tbl.indexAt(pos) + new_row = idx.row() if idx.isValid() else -1 + if new_row != self._tracker_hovered_row or tbl is not self._tracker_hovered_table: + self._tracker_hovered_row = new_row + self._tracker_hovered_table = tbl + tbl.viewport().update() + elif event.type() == QEvent.Type.Leave: + self._tracker_hovered_row = -1 + self._tracker_hovered_table = None + tbl.viewport().update() + break + if obj == self.downloadList.viewport(): if event.type() == QEvent.Type.MouseMove: pos = event.position().toPoint() if hasattr(event, 'position') else event.pos() - idx = tbl.indexAt(pos) + idx = self.downloadList.indexAt(pos) new_row = idx.row() if idx.isValid() else -1 - if new_row != self._tracker_hovered_row or tbl is not self._tracker_hovered_table: - self._tracker_hovered_row = new_row - self._tracker_hovered_table = tbl - tbl.viewport().update() + if new_row != self._hovered_row: + old_row = self._hovered_row + self._hovered_row = new_row + self._invalidate_hover_row(old_row) + self._invalidate_hover_row(new_row) elif event.type() == QEvent.Type.Leave: - self._tracker_hovered_row = -1 - self._tracker_hovered_table = None - tbl.viewport().update() - break - if obj == self.downloadList.viewport(): - if event.type() == QEvent.Type.MouseMove: - pos = event.position().toPoint() if hasattr(event, 'position') else event.pos() - idx = self.downloadList.indexAt(pos) - new_row = idx.row() if idx.isValid() else -1 - if new_row != self._hovered_row: old_row = self._hovered_row - self._hovered_row = new_row + self._hovered_row = -1 self._invalidate_hover_row(old_row) - self._invalidate_hover_row(new_row) - elif event.type() == QEvent.Type.Leave: - old_row = self._hovered_row - self._hovered_row = -1 - self._invalidate_hover_row(old_row) + except RuntimeError: + pass return super().eventFilter(obj, event) def _invalidate_hover_row(self, row): diff --git a/src/core/utils/logging/logs.py b/src/core/utils/logging/logs.py index b7a43c2..b8186d2 100644 --- a/src/core/utils/logging/logs.py +++ b/src/core/utils/logging/logs.py @@ -6,23 +6,14 @@ import json import os import re import time +import threading _log_buffer = [] +_downloads_lock = threading.RLock() def add_download_log(title, url, magnet_uri, completed) -> DownloadList: - downloads_file = os.path.join(state.settings_path, "downloads.json") - - if os.path.exists(downloads_file) and os.path.getsize(downloads_file) > 0: - try: - with open(downloads_file, "r") as file: - existing_data = json.load(file) - downloads = [Download(**d) for d in existing_data.get("data", [])] - except json.JSONDecodeError: - downloads = [] - else: - downloads = [] - + # wait for metadata outside the lock to avoid blocking other threads magnetdl = state.active_downloads.get(magnet_uri) if magnetdl: status = magnetdl.status() @@ -37,6 +28,21 @@ def add_download_log(title, url, magnet_uri, completed) -> DownloadList: path = os.path.join(save_path, torrent_name) else: path = os.path.join(state.download_path, title) + with _downloads_lock: + return _add_download_log_inner(title, url, magnet_uri, completed, path) + +def _add_download_log_inner(title, url, magnet_uri, completed, path) -> DownloadList: + downloads_file = os.path.join(state.settings_path, "downloads.json") + + if os.path.exists(downloads_file) and os.path.getsize(downloads_file) > 0: + try: + with open(downloads_file, "r") as file: + existing_data = json.load(file) + downloads = [Download(**d) for d in existing_data.get("data", [])] + except json.JSONDecodeError: + downloads = [] + else: + downloads = [] if any(d.magnet_uri == magnet_uri or d.url == url for d in downloads): if magnet_uri in state.active_downloads: @@ -65,6 +71,10 @@ def add_download_log(title, url, magnet_uri, completed) -> DownloadList: return download_list def remove_download_log(magnet_uri) -> DownloadList: + with _downloads_lock: + return _remove_download_log_inner(magnet_uri) + +def _remove_download_log_inner(magnet_uri) -> DownloadList: downloads_file = os.path.join(state.settings_path, "downloads.json") if os.path.exists(downloads_file) and os.path.getsize(downloads_file) > 0: @@ -91,6 +101,10 @@ def remove_download_log(magnet_uri) -> DownloadList: return download_list def update_download_completed(magnet_uri, completed) -> DownloadList: + with _downloads_lock: + return _update_download_completed_inner(magnet_uri, completed) + +def _update_download_completed_inner(magnet_uri, completed) -> DownloadList: downloads_file = os.path.join(state.settings_path, "downloads.json") if os.path.exists(downloads_file) and os.path.getsize(downloads_file) > 0: @@ -143,6 +157,10 @@ def update_download_completed(magnet_uri, completed) -> DownloadList: def get_download_logs() -> DownloadList: + with _downloads_lock: + return _get_download_logs_inner() + +def _get_download_logs_inner() -> DownloadList: downloads_file = os.path.join(state.settings_path, "downloads.json") if os.path.exists(downloads_file) and os.path.getsize(downloads_file) > 0: @@ -166,6 +184,10 @@ def extract_hash_from_magnet(magnet_uri): # full credits to claude for this def update_download_completed_by_hash(info_hash, completed) -> DownloadList: + with _downloads_lock: + return _update_download_completed_by_hash_inner(info_hash, completed) + +def _update_download_completed_by_hash_inner(info_hash, completed) -> DownloadList: downloads_file = os.path.join(state.settings_path, "downloads.json") if os.path.exists(downloads_file) and os.path.getsize(downloads_file) > 0: From eccdb2f068c573a4caddd5dbdafd900189d939c9 Mon Sep 17 00:00:00 2001 From: KeksNino Date: Sat, 7 Mar 2026 21:56:07 +0100 Subject: [PATCH 05/11] fix file deletion when seeding --- src/core/interface/gui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py index d382d04..858f31a 100644 --- a/src/core/interface/gui.py +++ b/src/core/interface/gui.py @@ -881,15 +881,15 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): if download_path and os.path.exists(download_path): try: if os.path.isfile(download_path): + remove_download_log(magnet_link) os.remove(download_path) del state.active_downloads[magnet_link] - remove_download_log(magnet_link) consoleLog(f"Deleted files for: {magnetdl.status().name}", True) else: import shutil - shutil.rmtree(download_path) del state.active_downloads[magnet_link] remove_download_log(magnet_link) + shutil.rmtree(download_path) consoleLog(f"Deleted files for: {magnetdl.status().name}", True) except Exception as e: consoleLog(f"Error deleting files: {e}", True) From f030795f106cfc910a0603f3202f26259208e4e0 Mon Sep 17 00:00:00 2001 From: Vxrtrauter <101264710+Vxrtrauter@users.noreply.github.com> Date: Sat, 7 Mar 2026 22:10:45 +0100 Subject: [PATCH 06/11] fix: implement forced exit on shutdown and enhance shutdown handling --- src/core/interface/gui.py | 2 ++ src/core/network/libtorrent_int.py | 8 ++++++-- src/core/utils/general/shutdown.py | 9 +++++---- src/main.py | 3 ++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py index 858f31a..77fb881 100644 --- a/src/core/interface/gui.py +++ b/src/core/interface/gui.py @@ -725,6 +725,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): def closeEvent(self, event: QCloseEvent): closehelper() event.accept() + from core.utils.general.shutdown import force_exit + force_exit() def eventFilter(self, obj, event): try: diff --git a/src/core/network/libtorrent_int.py b/src/core/network/libtorrent_int.py index 4ed623a..d19e4fb 100644 --- a/src/core/network/libtorrent_int.py +++ b/src/core/network/libtorrent_int.py @@ -6,6 +6,7 @@ import threading import libtorrent as lt from core.utils.data.state import state from core.utils.logging.logs import consoleLog +from core.utils.general.shutdown import shutdown_event global loop_running @@ -116,9 +117,12 @@ def dl_status_loop(): loop_running = False return - while state.active_downloads: + while state.active_downloads and not shutdown_event.is_set(): for magnet_uri, magnetdl in list(state.active_downloads.items()): - status = magnetdl.status() + try: + status = magnetdl.status() + except RuntimeError: + continue if status.state == lt.torrent_status.seeding and magnet_uri not in completed_set: consoleLog(f"Download completed: {status.name}") diff --git a/src/core/utils/general/shutdown.py b/src/core/utils/general/shutdown.py index 28ab513..1834f45 100644 --- a/src/core/utils/general/shutdown.py +++ b/src/core/utils/general/shutdown.py @@ -1,9 +1,10 @@ import threading -from core.network.libtorrent_misc import cleanup_session -from core.utils.general.wrappers import run_thread +import os shutdown_event = threading.Event() def closehelper(): - run_thread(threading.Thread(target=cleanup_session)) - shutdown_event.set() \ No newline at end of file + shutdown_event.set() + +def force_exit(): + os._exit(0) \ No newline at end of file diff --git a/src/main.py b/src/main.py index 72a2ec1..097f67d 100644 --- a/src/main.py +++ b/src/main.py @@ -33,7 +33,8 @@ def run_gui(): def keyboardinterrupthandler(signum, frame): closehelper() - windowCloseHelper() + from core.utils.general.shutdown import force_exit + force_exit() def main(): start_time = time.perf_counter() From 3db9d9c8e4040e27b8f183c8b4d93f3944326fb1 Mon Sep 17 00:00:00 2001 From: Vxrtrauter <101264710+Vxrtrauter@users.noreply.github.com> Date: Sat, 7 Mar 2026 22:31:38 +0100 Subject: [PATCH 07/11] fix: improve white / dark mode support and enhance table styling --- src/core/interface/gui.py | 154 +++++++++++++++++++++----------------- 1 file changed, 86 insertions(+), 68 deletions(-) diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py index 77fb881..53bccaa 100644 --- a/src/core/interface/gui.py +++ b/src/core/interface/gui.py @@ -45,8 +45,81 @@ from core.interface.assets.base64_icons import logo_base64 from core.utils.general.shutdown import closehelper +def _is_dark_mode(): + return darkdetect.isDark() + + +def _theme_colors(): + dark = _is_dark_mode() + if dark: + return { + "text": "rgba(255, 255, 255, 0.9)", + "border": "rgba(255, 255, 255, 0.06)", + "selected": "rgba(255, 255, 255, 0.04)", + "header_text": "rgba(255, 255, 255, 0.5)", + "header_border": "rgba(255, 255, 255, 0.1)", + "hover": QColor(255, 255, 255, 15), + } + else: + return { + "text": "rgba(0, 0, 0, 0.87)", + "border": "rgba(0, 0, 0, 0.08)", + "selected": "rgba(0, 0, 0, 0.06)", + "header_text": "rgba(0, 0, 0, 0.6)", + "header_border": "rgba(0, 0, 0, 0.12)", + "hover": QColor(0, 0, 0, 15), + } + + +def _table_stylesheet(view_type="QTableWidget"): + c = _theme_colors() + dark = _is_dark_mode() + color_rule = "" if dark else f"color: {c['text']};" + return f""" + {view_type} {{ + border: none; + outline: 0; + font-size: 13px; + {color_rule} + }} + {view_type}::item {{ + border-bottom: 1px solid {c["border"]}; + padding: 6px 14px; + {color_rule} + }} + {view_type}::item:selected {{ + background: {c["selected"]}; + }} + QHeaderView {{ + background: transparent; + }} + QHeaderView::section {{ + background: transparent; + color: {c["header_text"]}; + font-weight: normal; + border: none; + border-bottom: 1px solid {c["header_border"]}; + padding: 6px 14px; + }} + QHeaderView::section:checked {{ + background: transparent; + color: {c["header_text"]}; + font-weight: normal; + }} + """ + + def _svg_icon(svg_str, size=20): - renderer = QSvgRenderer(QByteArray(svg_str.encode())) + app = QtWidgets.QApplication.instance() + if app: + if _is_dark_mode(): + color = "white" + else: + color = "#555555" + else: + color = "white" + svg = svg_str.replace("{color}", color) + renderer = QSvgRenderer(QByteArray(svg.encode())) pixmap = QPixmap(size, size) pixmap.fill(Qt.GlobalColor.transparent) from PySide6.QtGui import QPainter @@ -56,9 +129,9 @@ def _svg_icon(svg_str, size=20): return QIcon(pixmap) -SVG_PLAY = '' -SVG_PAUSE = '' -SVG_FOLDER = '' +SVG_PLAY = '' +SVG_PAUSE = '' +SVG_FOLDER = '' def download_update(latest_version): @@ -173,7 +246,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): def paint(self, painter, option, index): if index.row() == MainWindow._instance._tracker_hovered_row: painter.save() - painter.fillRect(option.rect, QColor(255, 255, 255, 15)) + painter.fillRect(option.rect, _theme_colors()["hover"]) painter.restore() super().paint(painter, option, index) @@ -197,36 +270,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): header.setHighlightSections(False) table.setShowGrid(False) - table.setStyleSheet(""" - QTableWidget { - border: none; - outline: 0; - font-size: 13px; - } - QTableWidget::item { - border-bottom: 1px solid rgba(255, 255, 255, 0.06); - padding: 6px 14px; - } - QTableWidget::item:selected { - background: rgba(255, 255, 255, 0.04); - } - QHeaderView { - background: transparent; - } - QHeaderView::section { - background: transparent; - color: rgba(255, 255, 255, 0.5); - font-weight: normal; - border: none; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); - padding: 6px 14px; - } - QHeaderView::section:checked { - background: transparent; - color: rgba(255, 255, 255, 0.5); - font-weight: normal; - } - """) + table.setStyleSheet(_table_stylesheet("QTableWidget")) table.setMouseTracking(True) table.viewport().setMouseTracking(True) @@ -382,7 +426,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): def paint(self, painter, option, index): if index.row() == MainWindow._instance._hovered_row: painter.save() - painter.fillRect(option.rect, QColor(255, 255, 255, 15)) + painter.fillRect(option.rect, _theme_colors()["hover"]) painter.restore() super().paint(painter, option, index) @@ -392,7 +436,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): def paint(self, painter, option, index): if index.row() == MainWindow._instance._hovered_row: painter.save() - painter.fillRect(option.rect, QColor(255, 255, 255, 15)) + painter.fillRect(option.rect, _theme_colors()["hover"]) painter.restore() super().paint(painter, option, index) @@ -467,36 +511,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): self.downloadList.horizontalHeader().setHighlightSections(False) self.downloadList.setMouseTracking(True) self.downloadList.setShowGrid(False) - self.downloadList.setStyleSheet(""" - QTableView { - border: none; - outline: 0; - font-size: 13px; - } - QTableView::item { - border-bottom: 1px solid rgba(255, 255, 255, 0.06); - padding: 6px 14px; - } - QTableView::item:selected { - background: rgba(255, 255, 255, 0.04); - } - QHeaderView { - background: transparent; - } - QHeaderView::section { - background: transparent; - color: rgba(255, 255, 255, 0.5); - font-weight: normal; - border: none; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); - padding: 6px 14px; - } - QHeaderView::section:checked { - background: transparent; - color: rgba(255, 255, 255, 0.5); - font-weight: normal; - } - """) + self.downloadList.setStyleSheet(_table_stylesheet("QTableView")) self.downloadList.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) self.downloadList.viewport().setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) @@ -627,7 +642,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): self.version = QLabel(f"Version: {state.version}") self.statusbar.addPermanentWidget(self.version, Qt.AlignmentFlag.AlignLeft) - self.speed_label = QLabel("↓ 0.0 kB/s ↑ 0.0 kB/s") + self.speed_label = QLabel("\u2193 0.0 kB/s \u2191 0.0 kB/s") self.speed_label.setStyleSheet("padding-right: 6px;") self.statusbar.addPermanentWidget(self.speed_label) @@ -722,6 +737,9 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): self.downloadList.clearSelection() super().mousePressEvent(event) + def changeEvent(self, event): + super().changeEvent(event) + def closeEvent(self, event: QCloseEvent): closehelper() event.accept() From a602d17d3d1639d272f979a88db50eb2888516fb Mon Sep 17 00:00:00 2001 From: shayaa <101264710+Vxrtrauter@users.noreply.github.com> Date: Sat, 7 Mar 2026 22:38:20 +0100 Subject: [PATCH 08/11] Create LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 351bd041b8051b1b36b6aa697be761e74dcdb76e Mon Sep 17 00:00:00 2001 From: Vxrtrauter <101264710+Vxrtrauter@users.noreply.github.com> Date: Sat, 7 Mar 2026 22:40:38 +0100 Subject: [PATCH 09/11] fix: enhance Windows build process with installer and ZIP packaging --- .github/workflows/dev.yml | 56 ++++++++++++++++++++++++++++------- installer.iss | 62 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 10 deletions(-) create mode 100644 installer.iss diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index bb9d9cd..a802c7c 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -28,8 +28,8 @@ jobs: artifact_name: SoftwareManager-dev-${{ github.sha }}-linux asset_name: SoftwareManager-dev-${{ github.sha }}-linux - os: windows-latest - artifact_name: SoftwareManager-dev-${{ github.sha }}-windows.exe - asset_name: SoftwareManager-dev-${{ github.sha }}-windows.exe + artifact_name: SoftwareManager-dev-${{ github.sha }}-windows + asset_name: SoftwareManager-dev-${{ github.sha }}-windows - os: macos-latest artifact_name: SoftwareManager-dev-${{ github.sha }}-macos asset_name: SoftwareManager-dev-${{ github.sha }}-macos @@ -116,9 +116,7 @@ jobs: shell: bash run: | python -m nuitka \ - --onefile \ - --onefile-no-compression \ - --onefile-tempdir-spec="{CACHE_DIR}/${{ env.APP_NAME }}/${{ env.VERSION }}" \ + --standalone \ --assume-yes-for-downloads \ --windows-console-mode=disable \ --windows-icon-from-ico=app_icon.ico \ @@ -130,6 +128,7 @@ jobs: --include-data-files=build_info.json=src/build_info.json \ --include-data-files=build_info.json=src/core/interface/build_info.json \ --output-filename=${{ env.APP_NAME }}.exe \ + --output-dir=nuitka-build \ src/main.py - name: Build with PyInstaller (Linux) @@ -173,14 +172,48 @@ jobs: run: | mkdir -p dist-final if [ "$RUNNER_OS" == "Windows" ]; then - mv ${{ env.APP_NAME }}.exe dist-final/${{ matrix.artifact_name }} + mv nuitka-build/main.dist dist-final/${{ env.APP_NAME }} + ls -la dist-final/${{ env.APP_NAME }}/ else chmod +x dist/${{ env.APP_NAME }} mv dist/${{ env.APP_NAME }} dist-final/${{ matrix.artifact_name }} fi ls -la dist-final/ - - name: Upload build artifact + - name: Create ZIP (Windows) + if: runner.os == 'Windows' + shell: pwsh + run: | + Compress-Archive -Path "dist-final/${{ env.APP_NAME }}/*" -DestinationPath "dist-final/${{ matrix.artifact_name }}.zip" + Write-Host "Created ZIP: ${{ matrix.artifact_name }}.zip" + + - name: Build Installer (Windows) + if: runner.os == 'Windows' + shell: bash + run: | + SHORT_SHA="${{ github.sha }}" + SHORT_SHA="${SHORT_SHA:0:7}" + SETUP_NAME="SoftwareManager-dev-${SHORT_SHA}-windows-setup" + iscc //DMyAppVersion="${{ env.VERSION }}" \ + //DMySourceDir="dist-final\\${{ env.APP_NAME }}" \ + //DMyOutputDir="dist-final" \ + //DMyOutputFilename="${SETUP_NAME}" \ + installer.iss + echo "SETUP_NAME=${SETUP_NAME}" >> $GITHUB_ENV + ls -la dist-final/ + + - name: Upload build artifact (Windows) + if: runner.os == 'Windows' + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.os }}-build + path: | + dist-final/${{ matrix.artifact_name }}.zip + dist-final/${{ env.SETUP_NAME }}.exe + retention-days: 1 + + - name: Upload build artifact (Linux/macOS) + if: runner.os != 'Windows' uses: actions/upload-artifact@v4 with: name: ${{ matrix.os }}-build @@ -204,7 +237,8 @@ jobs: mkdir -p release SHORT_SHA="${{ needs.build.outputs.short_sha }}" cp artifacts/ubuntu-22.04-build/SoftwareManager-dev-*-linux release/SoftwareManager-dev-${SHORT_SHA}-linux - cp artifacts/windows-latest-build/SoftwareManager-dev-*-windows.exe release/SoftwareManager-dev-${SHORT_SHA}-windows.exe + cp artifacts/windows-latest-build/SoftwareManager-dev-*-windows.zip release/SoftwareManager-dev-${SHORT_SHA}-windows.zip + cp artifacts/windows-latest-build/SoftwareManager-dev-*-windows-setup.exe release/SoftwareManager-dev-${SHORT_SHA}-windows-setup.exe cp artifacts/macos-latest-build/SoftwareManager-dev-*-macos release/SoftwareManager-dev-${SHORT_SHA}-macos chmod +x release/SoftwareManager-dev-*-linux release/SoftwareManager-dev-*-macos ls -la release/ @@ -229,7 +263,8 @@ jobs: ### Downloads - Linux: \`SoftwareManager-dev-${SHORT_SHA}-linux\` - - Windows: \`SoftwareManager-dev-${SHORT_SHA}-windows.exe\` + - Windows (Portable ZIP): \`SoftwareManager-dev-${SHORT_SHA}-windows.zip\` + - Windows (Installer): \`SoftwareManager-dev-${SHORT_SHA}-windows-setup.exe\` - macOS: \`SoftwareManager-dev-${SHORT_SHA}-macos\` ### SHA-256 Checksums @@ -247,7 +282,8 @@ jobs: body_path: release_notes.md files: | release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-linux - release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.exe + release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.zip + release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows-setup.exe release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos release/SHA256SUMS.txt env: diff --git a/installer.iss b/installer.iss new file mode 100644 index 0000000..8b112a6 --- /dev/null +++ b/installer.iss @@ -0,0 +1,62 @@ +#define MyAppName "SoftwareManager" +#define MyAppPublisher "KeksPirates" +#define MyAppURL "https://github.com/KeksPirates/SoftwareManager" +#define MyAppExeName "SoftwareManager.exe" + +; Version is passed via /D on the command line: iscc /DMyAppVersion=... +#ifndef MyAppVersion + #define MyAppVersion "dev" +#endif + +; SourceDir is passed via /D on the command line +#ifndef MySourceDir + #define MySourceDir "dist-final\SoftwareManager" +#endif + +; OutputDir is passed via /D on the command line +#ifndef MyOutputDir + #define MyOutputDir "dist-final" +#endif + +; OutputFilename is passed via /D on the command line +#ifndef MyOutputFilename + #define MyOutputFilename "SoftwareManager-setup" +#endif + +[Setup] +AppId={{8F2E4B6A-1C3D-4E5F-9A7B-0D8E6F2C4A1B} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL}/issues +DefaultDirName={autopf}\{#MyAppName} +DefaultGroupName={#MyAppName} +AllowNoIcons=yes +OutputDir={#MyOutputDir} +OutputBaseFilename={#MyOutputFilename} +Compression=lzma2 +SolidCompression=yes +WizardStyle=modern +PrivilegesRequired=lowest +PrivilegesRequiredOverridesAllowed=dialog +UninstallDisplayIcon={app}\{#MyAppExeName} +ArchitecturesAllowed=x64compatible +ArchitecturesInstallIn64BitMode=x64compatible + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +Source: "{#MySourceDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs + +[Icons] +Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" +Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon + +[Run] +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent From dbf396a1873b022152df9c1b75610a93aa43975f Mon Sep 17 00:00:00 2001 From: KeksNino Date: Sat, 7 Mar 2026 23:28:00 +0100 Subject: [PATCH 10/11] fix: update updater to silently install new setup file --- src/core/interface/gui.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py index 53bccaa..332f153 100644 --- a/src/core/interface/gui.py +++ b/src/core/interface/gui.py @@ -135,8 +135,8 @@ SVG_FOLDER = ' Date: Sat, 7 Mar 2026 23:33:05 +0100 Subject: [PATCH 11/11] feat: auto restart application after update has finished --- installer.iss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/installer.iss b/installer.iss index 8b112a6..bf95032 100644 --- a/installer.iss +++ b/installer.iss @@ -43,6 +43,8 @@ PrivilegesRequiredOverridesAllowed=dialog UninstallDisplayIcon={app}\{#MyAppExeName} ArchitecturesAllowed=x64compatible ArchitecturesInstallIn64BitMode=x64compatible +CloseApplications=yes +RestartApplications=yes [Languages] Name: "english"; MessagesFile: "compiler:Default.isl"