Merge branch 'main' of https://github.com/KeksPirates/SoftwareManager

.github/workflows/dev.yml

@@ -44,30 +44,22 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
-      - name: Install system dependencies (Linux)
+      - name: Install uv
-        if: runner.os == 'Linux'
+        uses: astral-sh/setup-uv@v7
-        run: |
+        with:
-          sudo apt-get update
+          version: "0.9.7"
-          sudo apt-get install -y \
+          enable-cache: true
-            libxcb-xinerama0 \
-            libxkbcommon-x11-0 \
-            libxcb-cursor0 \
-            libxcb-keysyms1 \
-            libxcb-render-util0 \
-            libxcb-icccm4 \
-            libxcb-image0 \
-            libxcb-shape0 \
-            libxcb-util1
 
       - name: Install Python dependencies
         run: |
-          python -m pip install --upgrade pip
+          uv pip install -r requirements.txt
-          pip install -r requirements.txt
+          uv pip install pyinstaller backports.tarfile pillow
-          pip install pyinstaller backports.tarfile pillow
+        env:
+          UV_SYSTEM_PYTHON: 1
 
       - name: Generate version
         id: version
@@ -90,13 +82,6 @@ jobs:
           }
           EOF
 
-      - 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'
         shell: bash
@@ -105,7 +90,6 @@ jobs:
             --add-data "build_info.json;." \
             --add-data "build_info.json;core" \
             --add-data "build_info.json;core/interface" \
-            --add-data "deps/aria2c.exe;." \
             --add-data "core/interface/assets;core/interface/assets" \
             --icon "core/interface/assets/logo.png" \
             --exclude-module PyQt6 \

core/interface/gui.py

@@ -198,6 +198,9 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                 if role == Qt.DisplayRole:
                     col = index.column()
 
+                    if index.row() >= len(state.active_downloads) or index.row() < 0:
+                        return None
+                    
                     magnet_link = list(state.active_downloads.keys())[index.row()]
                     magnetdl = state.active_downloads[magnet_link]
                     
@@ -263,6 +266,10 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                 return None
 
             def toggle_pause_resume(self, row):
+
+                if row >= len(state.active_downloads) or row < 0:
+                    return
+                    
                 magnet_link = list(state.active_downloads.keys())[row]
                 magnetdl = state.active_downloads[magnet_link]
                 status = magnetdl.status()
@@ -291,10 +298,9 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
             clicked = Signal(int)
 
             def setEditorData(self, editor, index):
-                download = state.downloads[index.row()]
                 button = editor.findChild(QtWidgets.QPushButton)
 
-                paused = index.data(Qt.UserRole)
+
                 
                 magnet_link = list(state.active_downloads.keys())[index.row()]
                 magnetdl = state.active_downloads[magnet_link]
@@ -309,7 +315,9 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
 
             def createEditor(self, parent, option, index):
-                download = state.downloads[index.row()]
+                magnet_link = list(state.active_downloads.keys())[index.row()]
+                magnetdl = state.active_downloads[magnet_link]
+                status = magnetdl.status()
 
                 widget = QWidget(parent)
                 widget.setStyleSheet("border: none;")

core/network/libtorrent_int.py

@@ -89,6 +89,9 @@ def dl_status_loop():
 
 def update_settings():
 
+    if state.dl_session is None:
+        return
+
     settings = {
         "upload_rate_limit": state.up_speed_limit,
         "download_rate_limit": state.down_speed_limit,
@@ -97,4 +100,4 @@ def update_settings():
     }
 
     state.dl_session.apply_settings(settings)
-    consoleLog("Updated Settings")
+

core/utils/config/settings.py

@@ -1,4 +1,6 @@
+from core.network.libtorrent_int import update_settings
 from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
 from .config import create_config
 
 
@@ -20,5 +22,8 @@ def save_settings(close=lambda: None, apiurl=None, download_path=None, down_spee
     if max_downloads is not None:
         state.max_downloads = max_downloads
     
+
+    update_settings()
+    consoleLog("Saved Settings")
     create_config()
     close()