fixed updater

.github/workflows/dev.yml

@@ -25,16 +25,19 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            artifact_name: SoftwareManager-dev-linux
-            asset_name: SoftwareManager-dev-linux
+            artifact_name: SoftwareManager-dev-${{ github.sha }}-linux
+            asset_name: SoftwareManager-dev-${{ github.sha }}-linux
           - os: windows-latest
-            artifact_name: SoftwareManager-dev-windows.exe
-            asset_name: SoftwareManager-dev-windows.exe
+            artifact_name: SoftwareManager-dev-${{ github.sha }}-windows.exe
+            asset_name: SoftwareManager-dev-${{ github.sha }}-windows.exe
           - os: macos-latest
-            artifact_name: SoftwareManager-dev-macos
-            asset_name: SoftwareManager-dev-macos
+            artifact_name: SoftwareManager-dev-${{ github.sha }}-macos
+            asset_name: SoftwareManager-dev-${{ github.sha }}-macos
 
     runs-on: ${{ matrix.os }}
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+      short_sha: ${{ steps.version.outputs.short_sha }}
 
     steps:
       - name: Checkout code
@@ -66,12 +69,41 @@ jobs:
           pip install -r requirements.txt
           pip install pyinstaller
 
-      - name: Inject commit hash into code
+      - name: Generate version
+        id: version
+        shell: bash
         run: |
-          echo "version = '${GITHUB_SHA}'" > build_info.json
+          COMMIT_SHA=${{ github.sha }}
+          SHORT_SHA=${COMMIT_SHA:0:7}
+          VERSION="${SHORT_SHA}-dev"
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "short_sha=$SHORT_SHA" >> $GITHUB_OUTPUT
+          echo "Generated version: $VERSION"
 
-      - name: Build executable with PyInstaller
-        run: pyinstaller --onefile --windowed --add-data "build_info.json:." --name ${{ env.APP_NAME }} main.py
+      - name: Inject commit hash into code (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          $json = '{
+            "version": "' + $env:VERSION + '"
+          }'
+          $json | Out-File -Encoding utf8 build_info.json
+
+      - name: Download aria2c (Windows)
+        if: runner.os == 'Windows'
+        run: |
+          mkdir -p deps
+          C:\msys64\usr\bin\wget.exe https://github.com/aria2/aria2/releases/download/release-1.37.0/aria2-1.37.0-win-64bit-build1.zip
+          unzip -j aria2-1.37.0-win-64bit-build1.zip aria2-1.37.0-win-64bit-build1/aria2c.exe -d deps/
+
+      - name: Build executable with PyInstaller (Windows)
+        if: runner.os == 'Windows'
+        run: pyinstaller --onefile --windowed --add-data "build_info.json:." --add-data "deps/aria2c.exe:." --name ${{ env.APP_NAME }} main.py
+
+      - name: Build executable with PyInstaller (Unix)
+        if: runner.os != 'Windows'
+        run: pyinstaller --onefile --windowed --name ${{ env.APP_NAME }} main.py
 
       - name: Make executable (Unix)
         if: runner.os != 'Windows'
@@ -98,49 +130,29 @@ jobs:
     if: success()
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           path: artifacts
 
-      - name: Display downloaded artifacts
-        run: |
-          echo "Downloaded artifacts:"
-          find artifacts -type f
-          ls -la artifacts/
-
-      - name: Generate version
-        id: version
-        run: |
-          COMMIT_SHA=${{ github.sha }}
-          SHORT_SHA=${COMMIT_SHA:0:7}
-          VERSION="${SHORT_SHA}-dev"
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
-          echo "Generated version: ${VERSION}"
-
       - name: Prepare release files
         run: |
           mkdir -p release
-          cp artifacts/ubuntu-latest-build/SoftwareManager-dev-linux release/SoftwareManager-dev-linux
-          cp artifacts/windows-latest-build/SoftwareManager-dev-windows.exe release/SoftwareManager-dev-windows.exe
-          cp artifacts/macos-latest-build/SoftwareManager-dev-macos release/SoftwareManager-dev-macos
-          chmod +x release/SoftwareManager-dev-linux release/SoftwareManager-dev-macos
+          SHORT_SHA="${{ needs.build.outputs.short_sha }}"
+          cp artifacts/ubuntu-latest-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/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/
 
       - name: Create Release (Public)
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ steps.version.outputs.version }}
-          name: ${{ steps.version.outputs.version }}
-          draft: false
-          prerelease: false
+          tag_name: ${{ needs.build.outputs.version }}
+          name: ${{ needs.build.outputs.version }}
           files: |
-            release/SoftwareManager-dev-linux
-            release/SoftwareManager-dev-windows.exe
-            release/SoftwareManager-dev-macos
+            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 }}-macos
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

core/data/scrapers/uztracker.py

@@ -1,6 +1,5 @@
 import requests
 import asyncio
-import aiohttp
 from bs4 import BeautifulSoup
 from core.utils.data.state import state
 

core/interface/dialogs/settings.py

@@ -114,6 +114,21 @@ def settings_dialog(self):
         speed_limit.setFixedHeight(30)
         dialog.layout().addWidget(speed_limit_container)
 
+        ###############
+        # IMAGE PATH #
+        ###############
+
+        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)
+        dialog.layout().addWidget(image_path_container)
+
         ###############
         # SAVE/CANCEL #
         ###############
@@ -122,8 +137,8 @@ def settings_dialog(self):
 
         save_btn = QPushButton("Save")
         cancel_btn = QPushButton("Cancel")
-        save_btn.clicked.connect(lambda: save_settings(thread_box.value(), close_settings, api_url.text(), download_path.text(), speed_limit.value()))
-    
+        save_btn.clicked.connect(lambda: save_settings(thread_box.value(), close_settings, api_url.text(), download_path.text(), speed_limit.value(), image_path.text()))
+
         cancel_btn.clicked.connect(dialog.reject)
         layout.addWidget(cancel_btn)
         layout.addWidget(save_btn)

core/interface/gui.py

@@ -1,25 +1,24 @@
 from PySide6 import QtWidgets
 from PySide6 import QtCore
-from PySide6.QtCore import Qt, QTimer, QModelIndex, QAbstractTableModel
+from PySide6.QtCore import Qt, QTimer, QModelIndex, QAbstractTableModel, Signal
 from PySide6.QtWidgets import (
     QLineEdit,
-    QTableView, 
-    QWidget, 
-    QVBoxLayout, 
-    QListWidget, 
-    QToolBar, 
-    QLabel, 
+    QTableView,
+    QWidget,
+    QVBoxLayout,
+    QListWidget,
+    QToolBar,
+    QLabel,
     QHBoxLayout,
-    QComboBox, 
+    QComboBox,
     QTabWidget,
     QProgressBar,
     QHeaderView,
     QMessageBox,
     QTableWidget,
-    QTableWidgetItem
     )
 
-from PySide6.QtGui import QIcon, QAction, QCloseEvent, QPalette
+from PySide6.QtGui import QIcon, QAction, QCloseEvent, QImage, QPixmap
 import darkdetect
 import threading
 import platform
@@ -29,7 +28,6 @@ import subprocess
 import time
 import sys
 import json
-from core.utils.config.settings import save_settings
 from core.utils.general.wrappers import run_thread
 from core.utils.data.state import state
 from core.utils.network.download import download_selected
@@ -40,30 +38,39 @@ from core.interface.utils.searchhelper import return_pressed
 from core.interface.dialogs.settings import settings_dialog
 from core.network.aria2_integration import dlprogress
 
+
 def download_update(latest_version):
-    filename = "SoftwareManager-dev-windows.exe"
-    url = "https://github.com/KeksPirates/SoftwareManager/releases/latest/download/SoftwareManager-dev-windows.exe"
+    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"
 
     print("Downloading update...")
-    if os.path.exists(filename):
-        os.remove(filename)
     response = r.get(url, allow_redirects=True)
-    with open(filename, "wb") as f:
+    with open(new_filename, "wb") as f:
         f.write(response.content)
-    if not os.path.exists(filename):
-        raise FileNotFoundError(f"Executable not found")
-    subprocess.Popen([filename], shell=True)
+    if not os.path.exists(new_filename):
+        raise FileNotFoundError("Executable not found")
+    subprocess.Popen([new_filename], shell=True)
     time.sleep(0.5)
+
+    msg = QMessageBox()
+    msg.setIcon(QMessageBox.Information)
+    msg.setWindowTitle("New Version")
+    msg.setText("New version installed.")
+    msg.setInformativeText("Please remove the old exe.")
+    msg.setStandardButtons(QMessageBox.Ok)
+
     sys.exit(0)
 
+
 class MainWindow(QtWidgets.QMainWindow, QWidget):
     def __init__(self):
         super().__init__()
 
         build_info_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "build_info.json")
-        with open(build_info_path, "r") as f:
-            build_info = json.load(f)
-            state.version = build_info.get("version", "dev")
+        if os.path.exists(build_info_path):
+            with open(build_info_path, "r") as f:
+                build_info = json.load(f)
+                state.version = build_info.get("version")
 
         # Check for updates on Windows
         if state.ignore_updates is False:
@@ -75,8 +82,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                     msg = QMessageBox()
                     msg.setIcon(QMessageBox.Information)
                     msg.setWindowTitle("Update Available")
-                    msg.setText(f"A new version is available.")
-                    msg.setInformativeText("Please visit the GitHub releases page to download the latest version.")
+                    msg.setText("A new version is available.")
+                    msg.setInformativeText("Press Ok to download the update.")
                     msg.setStandardButtons(QMessageBox.Ok | QMessageBox.Ignore)
 
                     response = msg.exec_()
@@ -95,7 +102,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         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.dlbutton = QtWidgets.QPushButton("Download")
         self.libraryList = QListWidget()
 
@@ -103,7 +110,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.emptyResults.setAlignment(Qt.AlignCenter)
         self.emptyResults.hide()
 
-
         self.download_model = None
         self.downloadList = QTableView()
         self.emptyLibrary = QLabel("No items in library.")
@@ -132,13 +138,13 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
             def __init__(self):
                 super().__init__()
                 self.headers = ["Name", "Status", "Progress", "Speed", "Size", "Total Size"]
-            
+
             def rowCount(self, parent=QModelIndex()):
                 return len(state.downloads)
 
             def columnCount(self, parent=QModelIndex()):
                 return len(self.headers)
-            
+
             def headerData(self, section, orientation, role=Qt.DisplayRole):
                 if role == Qt.DisplayRole and orientation == Qt.Horizontal:
                     return self.headers[section]
@@ -148,7 +154,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                 if role == Qt.DisplayRole:
                     download = state.downloads[index.row()]
                     col = index.column()
-                    
+
                     if col == 0:
                         return download.name
                     elif col == 1:
@@ -183,28 +189,40 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.horizontal_layout = QHBoxLayout()
         self.horizontal_layout.addWidget(self.emptyResults, stretch=3)
         self.horizontal_layout.addWidget(self.qtablewidget)
-        
+
         self.tab1 = create_tab("Search", self.searchbar, self.qtablewidget, self.tabs, self.dlbutton, self.horizontal_layout)
         self.tab2 = create_tab("Library", self.emptyLibrary, self.libraryList, self.tabs, None, None)
         self.tab3 = create_tab("Downloads", self.emptyDownload, self.downloadList, self.tabs, None, None)
-        
-        
+
+        self.image = QImage(state.image_path)
+        self.pixmap = QPixmap.fromImage(self.image)
+        self.overlay_label = QLabel(self)
+        self.overlay_label.setPixmap(self.pixmap)
+        self.overlay_label.adjustSize()
+        self.overlay_label.raise_()
+
+        offset_x = -1350
+        offset_y = -550
+        x = self.width() - self.overlay_label.width() - offset_x
+        y = self.height() - self.overlay_label.height() - offset_y
+        self.overlay_label.move(x, y)
+
+        # temporarily disabled
+        # state.image_changed.connect(self.update_image_overlay)
 
         containerLayout.addWidget(self.tabs)
 
         containerLayout.setAlignment(Qt.AlignmentFlag.AlignBottom)
-
         toolbar = QToolBar("Main Toolbar")
         self.addToolBar(toolbar)
         toolbar.setLayoutDirection(Qt.RightToLeft)
-        
+
         self.tracker_list = QComboBox()
         self.tracker_list.addItems(["rutracker", "uztracker", "m0nkrus"])
         self.tracker_list.activated.connect(self.set_tracker)
 
         if darkdetect.isDark():
             settings_action = QAction(QIcon("core/interface/assets/settings_white.png"), "Settings", self)
-        else:
             settings_action = QAction(QIcon("core/interface/assets/settings_black.png"), "Settings", self)
 
         settings_action.triggered.connect(lambda: settings_dialog(self))
@@ -215,7 +233,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
         self.progressbar.setValue(0)
         containerLayout.addWidget(self.progressbar)
-        
+
         self.progress_timer = QTimer()
         self.progress_timer.timeout.connect(lambda: run_thread(threading.Thread(target=self.update_progress)))
         self.progress_timer.start(1000)
@@ -224,6 +242,13 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.download_timer.timeout.connect(lambda: run_thread(threading.Thread(target=self.download_list_update)))
         self.download_timer.start(500)
 
+    def update_image_overlay(self, new_image_path):
+        self.image = QImage(new_image_path)
+        self.pixmap = QPixmap.fromImage(self.image)
+
+        self.overlay_label.setPixmap(self.pixmap)
+        self.overlay_label.adjustSize()
+
     def download_list_update(self):
         if self.download_model:
             self.download_model.layoutAboutToBeChanged.emit()

core/utils/config/config.py

@@ -7,7 +7,7 @@ def create_config():
     config = configparser.ConfigParser()
 
     config["General"] = {"debug": True, "api_url": f"{state.api_url}", "aria2_threads": f"{state.aria2_threads}", "download_path": f"{state.download_path}", f"speed_limit": f"{state.speed_limit}", 
-                         "ignore_updates": f"{state.ignore_updates}"}
+                         "ignore_updates": f"{state.ignore_updates}", "image_path": f"{state.image_path}"}
 
     if platform.system() == "Windows":
             config_dir = os.environ.get("APPDATA", os.path.expanduser("~\\AppData\\Roaming"))
@@ -37,9 +37,17 @@ def read_config():
 
     config.read(config_file)
 
-    state.debug = config.getboolean("General", "debug")
-    state.api_url = config.get("General", "api_url")
-    state.aria2_threads = config.getint("General", "aria2_threads")
-    state.download_path = config.get("General", "download_path")
-    state.speed_limit = config.getint("General", "speed_limit")
-    state.ignore_updates = config.getboolean("General", "ignore_updates")
+    if state.debug is not None:
+        state.debug = config.getboolean("General", "debug")
+    if state.api_url is not None:
+        state.api_url = config.get("General", "api_url")
+    if state.aria2_threads is not None:
+        state.aria2_threads = config.getint("General", "aria2_threads")
+    if state.download_path is not None:
+        state.download_path = config.get("General", "download_path")
+    if state.speed_limit is not None:
+        state.speed_limit = config.getint("General", "speed_limit")
+    if state.ignore_updates is not None:
+        state.ignore_updates = config.getboolean("General", "ignore_updates")
+    if state.image_path is not None:
+        state.image_path = config.get("General", "image_path")

core/utils/config/settings.py

@@ -13,7 +13,7 @@ def restart_aria2c():
     atexit.unregister(kill_aria2server)
     atexit.register(kill_aria2server)
 
-def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_path=None, speed_limit=None):
+def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_path=None, speed_limit=None, image_path=None):
     if thread_count is not None:
         state.aria2_threads = thread_count
     if apiurl is not None:
@@ -22,6 +22,8 @@ def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_p
         state.download_path = download_path
     if speed_limit is not None:
         state.speed_limit = speed_limit
+    if image_path is not None:
+        state.image_path = image_path
     
     create_config()
     restart_aria2c()

core/utils/data/state.py

@@ -1,24 +1,38 @@
-from dataclasses import dataclass
+from PySide6.QtCore import QObject, Signal
 from typing import Optional, Any, List, Dict
 from pathlib import Path
 
-@dataclass
-class AppState:
-    posts: List[Dict[str, Any]]
-    post_titles: List[str]
-    post_urls: List[str]
-    post_author: List[str]
-    downloads: List[str]
-    version: str
-    ignore_updates: bool = False
-    debug: bool = False
-    tracker: str = "rutracker"
-    api_url: str = "https://api.michijackson.xyz"
-    download_path:  str = str(Path.home() / "Downloads")
-    speed_limit: int = 0
-    aria2process: Optional[Any] = None
-    aria2: Any = None
-    aria2p: Any = None
-    aria2_threads: int = 4
+class AppState(QObject):
+    image_changed = Signal(str)
 
-state = AppState(posts=[], post_titles=[], post_urls=[], post_author=[], downloads=[], download_path="", version="")
+    def __init__(self):
+        super().__init__()
+        self.posts: List[Dict[str, Any]] = []
+        self.post_titles: List[str] = []
+        self.post_urls: List[str] = []
+        self.post_author: List[str] = []
+        self.downloads: List[str] = []
+        self.version: str
+        self._image_path: str = ""
+        self.ignore_updates: bool = False
+        self.debug: bool = False
+        self.tracker: str = "rutracker"
+        self.api_url: str = "https://api.michijackson.xyz"
+        self.download_path: str = str(Path.home() / "Downloads")
+        self.speed_limit: int = 0
+        self.aria2process: Optional[Any] = None
+        self.aria2: Any = None
+        self.aria2p: Any = None
+        self.aria2_threads: int = 4
+
+    @property
+    def image_path(self) -> str:
+        return self._image_path
+
+    @image_path.setter
+    def image_path(self, new_path: str):
+        if new_path != self._image_path:
+            self._image_path = new_path
+            self.image_changed.emit(new_path)
+
+state = AppState()