fix: update asset path handling in MainWindow for improved compatibility with frozen applications

.github/workflows/dev.yml

@@ -57,13 +57,7 @@ jobs:
       - name: Install Python dependencies
         run: |
           uv pip install -r requirements.txt
-          uv pip install Pillow
+          uv pip install nuitka
-        env:
-          UV_SYSTEM_PYTHON: 1
-
-      - name: Install Nuitka (Windows only)
-        if: runner.os == 'Windows'
-        run: uv pip install nuitka
         env:
           UV_SYSTEM_PYTHON: 1
 
@@ -88,29 +82,29 @@ jobs:
           }
           EOF
 
-      - name: Install UPX (Windows)
+      - name: Install UPX
-        if: runner.os == 'Windows'
         shell: bash
         run: |
-          curl -sL https://github.com/upx/upx/releases/download/v5.1.0/upx-5.1.0-win64.zip -o upx.zip
+          if [ "$RUNNER_OS" == "Windows" ]; then
-          7z x upx.zip -oupx-dir
+            curl -sL https://github.com/upx/upx/releases/download/v5.1.0/upx-5.1.0-win64.zip -o upx.zip
-          UPX_DIR="$(pwd)/upx-dir/upx-5.1.0-win64"
+            7z x upx.zip -oupx-dir
-          echo "$UPX_DIR" >> $GITHUB_PATH
+            UPX_DIR="$(pwd)/upx-dir/upx-5.1.0-win64"
-          export PATH="$UPX_DIR:$PATH"
+            echo "$UPX_DIR" >> $GITHUB_PATH
-          echo "UPX_BINARY=$UPX_DIR/upx.exe" >> $GITHUB_ENV
+            export PATH="$UPX_DIR:$PATH"
+            echo "UPX_BINARY=$UPX_DIR/upx.exe" >> $GITHUB_ENV
+          elif [ "$RUNNER_OS" == "Linux" ]; then
+            curl -sL https://github.com/upx/upx/releases/download/v5.1.0/upx-5.1.0-amd64_linux.tar.xz -o upx.tar.xz
+            tar xf upx.tar.xz
+            UPX_DIR="$(pwd)/upx-5.1.0-amd64_linux"
+            echo "$UPX_DIR" >> $GITHUB_PATH
+            export PATH="$UPX_DIR:$PATH"
+            echo "UPX_BINARY=$UPX_DIR/upx" >> $GITHUB_ENV
+          else
+            brew install upx
+            echo "UPX_BINARY=$(which upx)" >> $GITHUB_ENV
+          fi
           upx --version | head -1
 
-      - name: Convert icon for Windows
-        if: runner.os == 'Windows'
-        shell: bash
-        run: |
-          python -c "
-          from PIL import Image
-          img = Image.open('src/core/interface/assets/logo.png')
-          img.save('app_icon.ico', format='ICO', sizes=[(256,256),(128,128),(64,64),(48,48),(32,32),(16,16)])
-          print('Icon converted successfully')
-          "
-
       - name: Build with Nuitka (Windows)
         if: runner.os == 'Windows'
         shell: bash
@@ -121,75 +115,49 @@ jobs:
             --onefile-tempdir-spec="{CACHE_DIR}/${{ env.APP_NAME }}/${{ env.VERSION }}" \
             --assume-yes-for-downloads \
             --windows-console-mode=disable \
-            --windows-icon-from-ico=app_icon.ico \
             --enable-plugin=pyside6 \
             --enable-plugin=upx \
             --upx-binary="${{ env.UPX_BINARY }}" \
-            --noinclude-qt-translations \
+            --include-data-dir=core/interface/assets=core/interface/assets \
-            --include-data-dir=src/core/interface/assets=src/core/interface/assets \
             --include-data-files=build_info.json=build_info.json \
-            --include-data-files=build_info.json=src/build_info.json \
+            --include-data-files=build_info.json=core/build_info.json \
-            --include-data-files=build_info.json=src/core/interface/build_info.json \
+            --include-data-files=build_info.json=core/interface/build_info.json \
             --output-filename=${{ env.APP_NAME }}.exe \
-            src/main.py
+            main.py
 
-      - name: Build with PyInstaller (Linux)
+      - name: Build with Nuitka (Unix)
-        if: runner.os == 'Linux'
+        if: runner.os != 'Windows'
         shell: bash
         run: |
-          pyinstaller --onefile --windowed \
+          python -m nuitka \
-            --add-data "build_info.json:." \
+            --onefile \
-            --add-data "build_info.json:src/core" \
+            --onefile-tempdir-spec="{CACHE_DIR}/${{ env.APP_NAME }}/${{ env.VERSION }}" \
-            --add-data "build_info.json:src/core/interface" \
+            --assume-yes-for-downloads \
-            --add-data "src/core/interface/assets:src/core/interface/assets" \
+            --enable-plugin=pyside6 \
-            --icon "src/core/interface/assets/logo.png" \
+            --include-data-dir=core/interface/assets=core/interface/assets \
-            --exclude-module PyQt6 \
+            --include-data-files=build_info.json=build_info.json \
-            --exclude-module PyQt5 \
+            --include-data-files=build_info.json=core/build_info.json \
-            --hidden-import=backports.tarfile \
+            --include-data-files=build_info.json=core/interface/build_info.json \
-            --hidden-import=backports \
+            --output-filename=${{ env.APP_NAME }} \
-            --hidden-import=jaraco.context \
+            main.py
-            --hidden-import=jaraco.text \
-            --hidden-import=jaraco.functools \
-            --name ${{ env.APP_NAME }} \
-            src/main.py
 
-      - name: Build with PyInstaller (macOS)
+      - name: Prepare artifact
-        if: runner.os == 'macOS'
         shell: bash
         run: |
-          pyinstaller --onefile \
+          mkdir -p dist
-            --add-data "build_info.json:." \
-            --add-data "build_info.json:src/core" \
-            --add-data "build_info.json:src/core/interface" \
-            --add-data "src/core/interface/assets:src/core/interface/assets" \
-            --icon "src/core/interface/assets/fr logo.png" \
-            --exclude-module PyQt6 \
-            --exclude-module PyQt5 \
-            --hidden-import=backports.tarfile \
-            --hidden-import=backports \
-            --hidden-import=jaraco.context \
-            --hidden-import=jaraco.text \
-            --hidden-import=jaraco.functools \
-            --name ${{ env.APP_NAME }} \
-            src/main.py
-
-      - name: Rename artifact
-        shell: bash
-        run: |
-          mkdir -p dist-final
           if [ "$RUNNER_OS" == "Windows" ]; then
-            mv ${{ env.APP_NAME }}.exe dist-final/${{ matrix.artifact_name }}
+            mv ${{ env.APP_NAME }}.exe dist/${{ matrix.artifact_name }}
           else
-            chmod +x dist/${{ env.APP_NAME }}
+            mv ${{ env.APP_NAME }} dist/${{ matrix.artifact_name }}
-            mv dist/${{ env.APP_NAME }} dist-final/${{ matrix.artifact_name }}
+            chmod +x dist/${{ matrix.artifact_name }}
           fi
-          ls -la dist-final/
+          ls -la dist/
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-build
-          path: dist-final/${{ matrix.artifact_name }}
+          path: dist/${{ matrix.artifact_name }}
           retention-days: 1
 
   release:

README.md

@@ -30,7 +30,7 @@ SoftwareManager is a Python-based GUI tool that simplifies searching and downloa
 ## Additional Information
 - SoftwareManager is still in Development and most likely contains issues. Please report any bugs you find via the Issues tab. Contributions are also greatly appreciated.
 - MacOS Builds haven't been properly tested - We're thankful to receive feedback.
-- If you want to host your own server, clone our [server repository](https://github.com/KeksPirates/SoftwareManager-Server), enter your cookie for rutracker.org and run server.py. Detailed Instructions on how to get your rutracker cookie are in the README of the server repo.
+- If you want to host your own server, clone the server branch of this repo, enter your cookie for rutracker.org and run server.py. Detailed Instructions on how to get your rutracker cookie are in the README of the server branch.
 
 ## Python Dependencies
 (also included in requirements.txt)

core/interface/gui.py

@@ -29,7 +29,6 @@ import libtorrent as lt
 import time
 import sys
 import json
-import asyncio
 from core.utils.general.logs import consoleLog, remove_download_log, flush_log_buffer
 from core.utils.general.wrappers import run_thread
 from core.utils.data.state import state
@@ -80,11 +79,11 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                 return asset_path
 
             if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
-                asset_path = os.path.join(sys._MEIPASS, 'src', 'core', 'interface', 'assets', filename)
+                asset_path = os.path.join(sys._MEIPASS, 'core', 'interface', 'assets', filename)
                 if os.path.exists(asset_path):
                     return asset_path
 
-            return os.path.join('src', 'core', 'interface', 'assets', filename)
+            return os.path.join('core', 'interface', 'assets', filename)
         
         self.setWindowIcon(QIcon(get_asset_path("logo.png")))
 
@@ -104,22 +103,23 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                 state.version = build_info.get("version")
 
         # Check for updates on Windows
-        if state.ignore_updates is False and platform.system() == "Windows":
+        if state.ignore_updates is False:
-            result = check_for_updates()
+            if platform.system() == "Windows":
-            if result != (None, None):
+                result = check_for_updates()
-                assets, latest_version = result
+                if result != (None, None):
+                    assets, latest_version = result
 
-                if assets:
+                    if assets:
-                    msg = QMessageBox()
+                        msg = QMessageBox()
-                    msg.setIcon(QMessageBox.Icon.Information)
+                        msg.setIcon(QMessageBox.Icon.Information)
-                    msg.setWindowTitle("Update Available")
+                        msg.setWindowTitle("Update Available")
-                    msg.setText("A new version is available.")
+                        msg.setText("A new version is available.")
-                    msg.setInformativeText("Press Ok to download the update.")
+                        msg.setInformativeText("Press Ok to download the update.")
-                    msg.setStandardButtons(QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Ignore)
+                        msg.setStandardButtons(QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Ignore)
 
-                    response = msg.exec_()
+                        response = msg.exec_()
-                    if response == QMessageBox.StandardButton.Ok:
+                        if response == QMessageBox.StandardButton.Ok:
-                        download_update(latest_version)
+                            download_update(latest_version)
 
         self.setWindowTitle("Software Manager")
         self.setGeometry(100, 100, 800, 600)
@@ -476,11 +476,10 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
             MainWindow._instance.log_signal.emit(text)
     
     def _on_log_signal(self, text):
-        if hasattr(self, 'consoleLog'):
+        self.consoleLog.append(text)
-            self.consoleLog.append(text)
+        self.consoleLog.verticalScrollBar().setValue(
-            self.consoleLog.verticalScrollBar().setValue(
+            self.consoleLog.verticalScrollBar().maximum()
-                self.consoleLog.verticalScrollBar().maximum()
+        )
-            )
 
     def update_image_overlay(self, new_image_path):
         self.image = QImage(new_image_path)

requirements.txt

@@ -1,5 +1,5 @@
 requests==2.32.2
-PySide6-Essentials==6.10.1
+PySide6==6.10.1
 beautifulsoup4==4.13.5
 darkdetect==0.7.1
 pyinstaller==6.15.0