fix aria2c dependency in pyinstaller

.github/workflows/dev.yml

@@ -25,18 +25,19 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            artifact_name: SoftwareManager-dev-linux
+            artifact_name: SoftwareManager-dev-${{ github.sha }}-linux
-            asset_name: SoftwareManager-dev-linux
+            asset_name: SoftwareManager-dev-${{ github.sha }}-linux
           - os: windows-latest
-            artifact_name: SoftwareManager-dev-windows.exe
+            artifact_name: SoftwareManager-dev-${{ github.sha }}-windows.exe
-            asset_name: SoftwareManager-dev-windows.exe
+            asset_name: SoftwareManager-dev-${{ github.sha }}-windows.exe
           - os: macos-latest
-            artifact_name: SoftwareManager-dev-macos
+            artifact_name: SoftwareManager-dev-${{ github.sha }}-macos
-            asset_name: SoftwareManager-dev-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
@@ -89,9 +90,16 @@ jobs:
           }'
           $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:." --name ${{ env.APP_NAME }} main.py
+        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'
@@ -130,10 +138,11 @@ jobs:
       - name: Prepare release files
         run: |
           mkdir -p release
-          cp artifacts/ubuntu-latest-build/SoftwareManager-dev-linux release/
+          SHORT_SHA="${{ needs.build.outputs.short_sha }}"
-          cp artifacts/windows-latest-build/SoftwareManager-dev-windows.exe release/
+          cp artifacts/ubuntu-latest-build/SoftwareManager-dev-*-linux release/SoftwareManager-dev-${SHORT_SHA}-linux
-          cp artifacts/macos-latest-build/SoftwareManager-dev-macos release/
+          cp artifacts/windows-latest-build/SoftwareManager-dev-*-windows.exe release/SoftwareManager-dev-${SHORT_SHA}-windows.exe
-          chmod +x release/SoftwareManager-dev-linux release/SoftwareManager-dev-macos
+          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)
@@ -142,8 +151,8 @@ jobs:
           tag_name: ${{ needs.build.outputs.version }}
           name: ${{ needs.build.outputs.version }}
           files: |
-            release/SoftwareManager-dev-linux
+            release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-linux
-            release/SoftwareManager-dev-windows.exe
+            release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.exe
-            release/SoftwareManager-dev-macos
+            release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

core/interface/gui.py

@@ -3,14 +3,14 @@ from PySide6 import QtCore
 from PySide6.QtCore import Qt, QTimer, QModelIndex, QAbstractTableModel
 from PySide6.QtWidgets import (
     QLineEdit,
-    QTableView, 
+    QTableView,
-    QWidget, 
+    QWidget,
-    QVBoxLayout, 
+    QVBoxLayout,
-    QListWidget, 
+    QListWidget,
-    QToolBar, 
+    QToolBar,
-    QLabel, 
+    QLabel,
     QHBoxLayout,
-    QComboBox, 
+    QComboBox,
     QTabWidget,
     QProgressBar,
     QHeaderView,
@@ -38,22 +38,25 @@ 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():
+
-    filename = "SoftwareManager-dev-windows.exe"
+def download_update(latest_version):
-    url = "https://github.com/KeksPirates/SoftwareManager/releases/latest/download/SoftwareManager-dev-windows.exe"
+    old_filename = f"SoftwareManager-dev-{state.version.replace('-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):
+    if os.path.exists(old_filename):
-        os.remove(filename)
+        os.remove(old_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):
+    if not os.path.exists(new_filename):
-        raise FileNotFoundError(f"Executable not found")
+        raise FileNotFoundError("Executable not found")
-    subprocess.Popen([filename], shell=True)
+    subprocess.Popen([new_filename], shell=True)
     time.sleep(0.5)
     sys.exit(0)
 
+
 class MainWindow(QtWidgets.QMainWindow, QWidget):
     def __init__(self):
         super().__init__()
@@ -74,7 +77,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                     msg = QMessageBox()
                     msg.setIcon(QMessageBox.Information)
                     msg.setWindowTitle("Update Available")
-                    msg.setText(f"A new version is available.")
+                    msg.setText("A new version is available.")
                     msg.setInformativeText("Please visit the GitHub releases page to download the latest version.")
                     msg.setStandardButtons(QMessageBox.Ok | QMessageBox.Ignore)
 
@@ -94,7 +97,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()
 
@@ -102,7 +105,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.")
@@ -131,13 +133,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]
@@ -147,7 +149,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:
@@ -182,12 +184,12 @@ 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)
-        
+
-        
+
 
         containerLayout.addWidget(self.tabs)
 
@@ -196,7 +198,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         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)
@@ -214,7 +216,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)