feat: remove toolbar, will be improved later

.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/dialogs/settings.py

@@ -60,31 +60,6 @@ def settings_dialog(self):
         autoresume_layout.addWidget(autoresume_checkbox)
         dialog.layout().addWidget(autoresume_container)
 
-        #####################
-        # DOWNLOAD SETTINGS #
-        #####################
-        thread_box = QSpinBox()
-        thread_box.setMinimum(1)
-        thread_box.setMaximum(16)
-        thread_box.setValue(state.aria2_threads)
-        
-
-        # container for tight space
-        thread_container = QWidget()
-        thread_layout = QHBoxLayout()
-
-        thread_layout.addWidget(QLabel("Threads:"))
-        thread_layout.addWidget(thread_box)
-        thread_container.setLayout(thread_layout)
-        thread_container.setMaximumHeight(80)
-        
-
-        # Dimensions
-        thread_box.setFixedWidth(90)
-        thread_box.setFixedHeight(30)
-
-        dialog.layout().addWidget(thread_container)
-
         ##################
         # SERVER SETTING #
         ##################
@@ -124,6 +99,30 @@ def settings_dialog(self):
         download_path_layout.addWidget(browse_button)
         browse_button.clicked.connect(browse_download_path)
 
+        ###############
+        # 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)
+
+        def browse_image_path():
+            file_path = QFileDialog.getOpenFileName(dialog, "Select Image File", state.image_path, "Image Files (*.png *.jpg)")[0]
+            if file_path:
+                image_path.setText(file_path)
+
+        browse_button = QPushButton("📁")
+        image_path_layout.addWidget(browse_button)
+        browse_button.clicked.connect(browse_image_path)
+
         ##################
         # SPEED LIMITING #
         ##################
@@ -192,31 +191,6 @@ def settings_dialog(self):
         max_downloads.setFixedHeight(30)
         dialog.layout().addWidget(max_downloads_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)
-
-        def browse_image_path():
-            file_path = QFileDialog.getOpenFileName(dialog, "Select Image File", state.image_path, "Image Files (*.png *.jpg)")[0]
-            if file_path:
-                image_path.setText(file_path)
-
-        browse_button = QPushButton("📁")
-        image_path_layout.addWidget(browse_button)
-        browse_button.clicked.connect(browse_image_path)
-
         ###############
         # SAVE/CANCEL #
         ###############

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;")
@@ -385,29 +393,29 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         # 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.setFixedSize(90, 30)
         self.tracker_list.activated.connect(self.set_tracker)
 
+        topLayout = QHBoxLayout()
+        
         if darkdetect.isDark():
-            settings_action = QAction(QIcon(get_asset_path("settings_white.png")), "Settings", self)
+            settings_button = QtWidgets.QPushButton(QIcon(get_asset_path("settings_white.png")), "")
         else:
-            settings_action = QAction(QIcon(get_asset_path("settings_black.png")), "Settings", self)
+            settings_button = QtWidgets.QPushButton(QIcon(get_asset_path("settings_black.png")), "")
         
-        settings_action.triggered.connect(lambda: settings_dialog(self))
+        settings_button.clicked.connect(lambda: settings_dialog(self))
-        toolbar.addAction(settings_action)
+        settings_button.setFixedSize(32, 32)
-        toolbar.addWidget(self.tracker_list)
+        settings_button.setToolTip("Settings")
         
-        toolbar.setMovable(False)
+        topLayout.addWidget(self.tracker_list)
+        topLayout.addStretch()
+        topLayout.addWidget(settings_button)
+        
+        containerLayout.addLayout(topLayout)
+        containerLayout.addWidget(self.tabs)
 
-        # self.progressbar.setValue(0)
         self.consoleLog.setReadOnly(True)
         self.consoleLog.setFixedHeight(150)
         containerLayout.addWidget(self.consoleLog)

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()

core/utils/data/state.py

@@ -23,10 +23,6 @@ class AppState(QObject):
         self.down_speed_limit: int = 0
         self.max_connections: int = 200
         self.max_downloads: int = 10
-        self.aria2process: Optional[Any] = None
-        self.aria2: Any = None
-        self.aria2p: Any = None
-        self.aria2_threads: int = 4
         self.settings_path: str = None
         self.dl_session: Any = None
         self.active_downloads: List[str] = {}