feat: enhance GUI layout and styling for better usability

Fully replace Aria2 with LibTorrent

.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

@@ -22,7 +22,7 @@ def settings_dialog(self):
         consoleLog("Settings dialog opened")
         dialog = QDialog(self)
         dialog.setWindowTitle("Settings")
-        dialog.setFixedSize(800, 400)
+        dialog.setFixedSize(800, 550)
 
         dialog.setLayout(QVBoxLayout())
         dialog.layout().addWidget(QLabel("Settings"))
@@ -60,31 +60,6 @@ def settings_dialog(self):
         autoresume_layout.addWidget(autoresume_checkbox)
         dialog.layout().addWidget(autoresume_container)
 
-        ##################
-        # THREAD SETTING #
-        ##################
-        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,24 +99,6 @@ def settings_dialog(self):
         download_path_layout.addWidget(browse_button)
         browse_button.clicked.connect(browse_download_path)
 
-        ##################
-        # SPEED LIMITING #
-        ##################
-
-        speed_limit_container = QWidget()
-        speed_limit_layout = QHBoxLayout()
-
-        speed_limit_layout.addWidget(QLabel("Max Download Speed (KiB, 0 for unlimited): "))
-        speed_limit = QSpinBox()
-        speed_limit.setMinimum(0)
-        speed_limit.setMaximum(10000000)
-        speed_limit.setValue(state.speed_limit)
-        speed_limit_container.setLayout(speed_limit_layout)
-        speed_limit_layout.addWidget(speed_limit)
-        speed_limit.setFixedWidth(180)
-        speed_limit.setFixedHeight(30)
-        dialog.layout().addWidget(speed_limit_container)
-
         ###############
         # IMAGE PATH #
         ###############
@@ -166,6 +123,74 @@ def settings_dialog(self):
         image_path_layout.addWidget(browse_button)
         browse_button.clicked.connect(browse_image_path)
 
+        ##################
+        # SPEED LIMITING #
+        ##################
+
+        down_speed_limit_container = QWidget()
+        down_speed_limit_layout = QHBoxLayout()
+
+        down_speed_limit_layout.addWidget(QLabel("Max Download Speed (KiB, 0 for unlimited): "))
+        down_speed_limit = QSpinBox()
+        down_speed_limit.setMinimum(0)
+        down_speed_limit.setMaximum(10000000)
+        down_speed_limit.setValue(state.down_speed_limit)
+        down_speed_limit_container.setLayout(down_speed_limit_layout)
+        down_speed_limit_layout.addWidget(down_speed_limit)
+        down_speed_limit.setFixedWidth(180)
+        down_speed_limit.setFixedHeight(30)
+        dialog.layout().addWidget(down_speed_limit_container)
+        
+        up_speed_limit_container = QWidget()
+        up_speed_limit_layout = QHBoxLayout()
+
+        up_speed_limit_layout.addWidget(QLabel("Max Upload Speed (KiB, 0 for unlimited): "))
+        up_speed_limit = QSpinBox()
+        up_speed_limit.setMinimum(0)
+        up_speed_limit.setMaximum(10000000)
+        up_speed_limit.setValue(state.up_speed_limit)
+        up_speed_limit_container.setLayout(up_speed_limit_layout)
+        up_speed_limit_layout.addWidget(up_speed_limit)
+        up_speed_limit.setFixedWidth(180)
+        up_speed_limit.setFixedHeight(30)
+        dialog.layout().addWidget(up_speed_limit_container)
+
+        ######################
+        # CONNECTION CONFIGS #
+        ######################
+
+        max_connections_container = QWidget()
+        max_connections_layout = QHBoxLayout()
+
+        max_connections_layout.addWidget(QLabel("Max Connections: "))
+        max_connections = QSpinBox()
+        max_connections.setMinimum(0)
+        max_connections.setMaximum(10000000)
+        max_connections.setValue(state.max_connections)
+        max_connections_container.setLayout(max_connections_layout)
+        max_connections_layout.addWidget(max_connections)
+        max_connections.setFixedWidth(180)
+        max_connections.setFixedHeight(30)
+        dialog.layout().addWidget(max_connections_container)
+
+        ####################
+        # DOWNLOAD CONFIGS #
+        ####################
+
+        max_downloads_container = QWidget()
+        max_downloads_layout = QHBoxLayout()
+
+        max_downloads_layout.addWidget(QLabel("Max Downloads: "))
+        max_downloads = QSpinBox()
+        max_downloads.setMinimum(0)
+        max_downloads.setMaximum(10000000)
+        max_downloads.setValue(state.max_downloads)
+        max_downloads_container.setLayout(max_downloads_layout)
+        max_downloads_layout.addWidget(max_downloads)
+        max_downloads.setFixedWidth(180)
+        max_downloads.setFixedHeight(30)
+        dialog.layout().addWidget(max_downloads_container)
+
         ###############
         # SAVE/CANCEL #
         ###############
@@ -174,7 +199,7 @@ 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(), image_path.text()))
+        save_btn.clicked.connect(lambda: save_settings(close_settings, api_url.text(), download_path.text(), down_speed_limit.value(), up_speed_limit.value(), image_path.text(), None, max_connections.value(), max_downloads.value()))
 
         cancel_btn.clicked.connect(dialog.reject)
         layout.addWidget(cancel_btn)

core/interface/gui.py

@@ -1,5 +1,5 @@
 from PySide6 import QtWidgets
-from PySide6.QtCore import Qt, QTimer, QModelIndex, QAbstractTableModel, Signal, QEvent
+from PySide6.QtCore import Qt, QTimer, QModelIndex, QAbstractTableModel, Signal, QEvent, QSize
 from PySide6.QtWidgets import (
     QLineEdit,
     QTableView,
@@ -29,6 +29,7 @@ import platform
 import requests as r
 import os
 import subprocess
+import libtorrent as lt
 import time
 import sys
 import json
@@ -37,18 +38,18 @@ from core.utils.general.wrappers import run_thread
 from core.utils.data.state import state
 from core.utils.network.download import download_selected
 from core.utils.network.update_checker import check_for_updates
-from core.utils.general.shutdown import closehelper
 from core.interface.utils.tabhelper import create_tab
 from core.interface.utils.searchhelper import return_pressed
 from core.interface.dialogs.settings import settings_dialog
-from core.network.aria2_integration import dlprogress
+from core.network.libtorrent_misc import cleanup_session
+from core.utils.general.shutdown import closehelper
 
 
 def download_update(latest_version):
     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"
 
-    consoleLog("Downloading update...", True)
+    print("Downloading update...", True)
     response = r.get(url, allow_redirects=True)
     with open(new_filename, "wb") as f:
         f.write(response.content)
@@ -160,6 +161,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.qtablewidget.verticalHeader().setVisible(False)
         self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
 
+        
+
         header = self.qtablewidget.horizontalHeader()
         header.setSectionResizeMode(0, QHeaderView.Stretch) 
         header.setSectionResizeMode(1, QHeaderView.Fixed)   
@@ -183,7 +186,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                 self.headers = ["Action", "Name", "Status", "Progress", "Speed", "Size", "Total Size"]
 
             def rowCount(self, parent=QModelIndex()):
-                return len(state.downloads)
+                return len(state.active_downloads)
             
             def columnCount(self, parent=QModelIndex()):
                 return len(self.headers)
@@ -194,36 +197,86 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                 return None
 
             def data(self, index, role=Qt.DisplayRole):
-                col = index.column()
-                download = state.downloads[index.row()]
                 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]
+                    
+                    status = magnetdl.status()
+                    
                     if col == 0:
-                        return "▶︎" if download.is_paused else "⏸︎"
+                        is_paused = magnetdl.status().paused
+                        return "▶︎" if is_paused else "⏸︎"
                     elif col == 1:
-                        return download.name
+                        return status.name if status.has_metadata else "Fetching metadata..."
                     elif col == 2:
-                        return getattr(download, 'status', 'Downloading')
+                        if status.state == lt.torrent_status.downloading:
+                            return "Downloading"
+                        elif status.state == lt.torrent_status.seeding:
+                            return "Seeding"
+                        elif status.paused:
+                            return "Paused"
+                        else:
+                            return "Queued"
                     elif col == 3:
-                        return f"{int(download.progress)}%"
+                        return f"{status.progress * 100:.1f}%"
                     elif col == 4:
-                        return f"{download.download_speed_string()}"
+                        speed_kbs = status.download_rate / 1024
+                        if speed_kbs > 1024:
+                            return f"{speed_kbs / 1024:.1f} MB/s"
+                        else:
+                            return f"{speed_kbs:.1f} kB/s"
                     elif col == 5:
-                        return f"{download.completed_length_string()}"
+                        downloaded_mb = status.total_wanted_done / (1024 * 1024)
+                        if downloaded_mb > 1024:
+                            return f"{downloaded_mb / 1024:.2f} GB"
+                        else:
+                            return f"{downloaded_mb:.1f} MB"
                     elif col == 6:
-                        return f"{download.total_length_string()}"
+                        total_mb = status.total_wanted / (1024 * 1024)
+                        if total_mb > 1024:
+                            return f"{total_mb / 1024:.2f} GB"
+                        else:
+                            return f"{total_mb:.1f} MB"
                     elif col == 7:
-                        return f"{download.eta_string()}"
+                        if status.download_rate > 0:
+                            bytes_left = status.total_wanted - status.total_wanted_done
+                            eta_seconds = bytes_left / status.download_rate
+                            
+                            if eta_seconds < 60:
+                                return f"{int(eta_seconds)}s"
+                            elif eta_seconds < 3600:
+                                minutes = int(eta_seconds / 60)
+                                seconds = int(eta_seconds % 60)
+                                return f"{minutes}m {seconds}s"
+                            else:
+                                hours = int(eta_seconds / 3600)
+                                minutes = int((eta_seconds % 3600) / 60)
+                                return f"{hours}h {minutes}m"
+                        else:
+                            return "∞" if status.paused else "Stalled"
+                
+                if role == Qt.UserRole and index.column() == 0:
+                    magnet_link = list(state.active_downloads.keys())[index.row()]
+                    magnetdl = state.active_downloads[magnet_link]
+                    return magnetdl.status().paused
                 
-                if role == Qt.UserRole and col == 0:
-                    return download.is_paused
-
                 return None
 
             def toggle_pause_resume(self, row):
-                download = state.downloads[row]
+
-                if download.progress == 100:
+                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()
+                
+                if status.state == lt.torrent_status.seeding:
                     if state.download_path is not None and os.path.exists(state.download_path):
                         if platform.system() == "Windows":
                             os.startfile(os.path.normpath(state.download_path))
@@ -231,21 +284,15 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                             subprocess.Popen(["xdg-open", state.download_path])
                         elif platform.system() == "Darwin":
                             subprocess.Popen(["open", state.download_path])
-                    else:
-                        if platform.system() == "Windows":
-                            os.startfile(os.path.normpath(os.getcwd()))
-                        elif platform.system() == "Linux":
-                            subprocess.Popen(["xdg-open", os.getcwd()])
-                        elif platform.system() == "Darwin":
-                            subprocess.Popen(["open", os.getcwd()])
                     return
-                    
+                
-                if download.is_paused:
+                if status.paused:
-                    download.resume()
+                    magnetdl.resume()
-                    consoleLog(f"Resumed download: {download.name}", True)
+                    consoleLog(f"Resumed download: {status.name}", True)
                 else:
-                    download.pause()
+                    magnetdl.pause()
-                    consoleLog(f"Paused download: {download.name}", True)
+                    consoleLog(f"Paused download: {status.name}", True)
+                
                 idx = self.index(row, 0)
                 self.dataChanged.emit(idx, idx, [Qt.ItemDataRole.DisplayRole, Qt.ItemDataRole.UserRole])
 
@@ -253,27 +300,31 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
             clicked = Signal(int)
 
             def setEditorData(self, editor, index):
-                download = state.downloads[index.row()]
                 button = editor.findChild(QtWidgets.QPushButton)
+                
+                magnet_link = list(state.active_downloads.keys())[index.row()]
+                magnetdl = state.active_downloads[magnet_link]
+                status = magnetdl.status()
 
                 if button:
-                    if download.progress == 100:
+                    if status.state == lt.torrent_status.seeding:
                         button.setText("📁")
                     else:
-                        button.setText("▶︎" if download.is_paused else "⏸︎")
+                        button.setText("▶︎" if status.paused else "⏸︎")
-
 
             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;")
                 layout = QHBoxLayout(widget)
                 layout.setContentsMargins(0, 0, 0, 0)
-                if download.progress == 100:
+                if status.state == lt.torrent_status.seeding:
                     btnPause = QtWidgets.QPushButton("📁")
                 else:
-                    btnPause = QtWidgets.QPushButton("▶︎" if download.is_paused else "⏸︎")
+                    btnPause = QtWidgets.QPushButton("▶︎" if status.paused else "⏸︎")
                 btnPause.setFixedSize(40, 30)
                 btnPause.clicked.connect(lambda: self.clicked.emit(index.row()))
                 layout.addStretch()
@@ -313,7 +364,13 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
         # Tabs
         self.tabs = QTabWidget()
-
+        self.tabs.setStyleSheet("""
+        QTabBar::tab {
+            font-size: 11px;
+            padding: 2px 8px;
+            height: 25px;
+        }
+        """)
         self.horizontal_layout = QHBoxLayout()
         self.horizontal_layout.addWidget(self.emptyResults, stretch=3)
         self.horizontal_layout.addWidget(self.qtablewidget)
@@ -336,41 +393,64 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
             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)
+        
+        self.corner_widget = QWidget()
+        self.corner_layout = QHBoxLayout(self.corner_widget)
+        self.corner_layout.setContentsMargins(0, 0, 0, 0)
 
-        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)
+        self.corner_layout.addWidget(self.tracker_list)
 
+        self.settings_btn = QtWidgets.QToolButton()
+        self.settings_btn.setIconSize(QSize(21, 21))
+        self.settings_btn.setStyleSheet("background: transparent;")
         if darkdetect.isDark():
-            settings_action = QAction(QIcon(get_asset_path("settings_white.png")), "Settings", self)
+            self.settings_btn.setIcon(QIcon(get_asset_path("settings_white.png")))
         else:
-            settings_action = QAction(QIcon(get_asset_path("settings_black.png")), "Settings", self)
+            self.settings_btn.setIcon(QIcon(get_asset_path("settings_black.png")))
+        self.settings_btn.setToolTip("Settings")
+        self.settings_btn.clicked.connect(lambda: settings_dialog(self))
 
-        settings_action.triggered.connect(lambda: settings_dialog(self))
-        toolbar.addAction(settings_action)
-        toolbar.addWidget(self.tracker_list)
 
-        toolbar.setMovable(False)
+        
+        self.corner_layout.addWidget(self.settings_btn)
+
+        
+
+
+        self.tab_wrapper = QWidget()
+        self.tab_layout = QVBoxLayout()
+        self.tab_layout.setContentsMargins(0, 0, 0, 0)
+        self.tab_layout.setSpacing(0)
+
+        self.tab_bar_layout = QHBoxLayout()
+        self.tab_bar_layout.setContentsMargins(0, 0, 0, 0)
+        self.tab_bar_layout.setSpacing(0)
+
+        self.tab_bar_layout.addWidget(self.tabs.tabBar(), stretch=0)
+        self.tab_bar_layout.addStretch()
+        self.tab_bar_layout.addWidget(self.corner_widget, stretch=0)
+
+        self.tab_layout.addLayout(self.tab_bar_layout)
+        self.tab_layout.addWidget(self.tabs)
+        
+
+        self.tab_wrapper.setLayout(self.tab_layout)
+        
+
+        containerLayout.addWidget(self.tab_wrapper)
+        containerLayout.setAlignment(Qt.AlignmentFlag.AlignTop)
 
-        # self.progressbar.setValue(0)
         self.consoleLog.setReadOnly(True)
         self.consoleLog.setFixedHeight(150)
         containerLayout.addWidget(self.consoleLog)
 
-        self.progress_timer = QTimer()
-        self.progress_timer.timeout.connect(lambda: run_thread(threading.Thread(target=self.update_progress)))
-        self.progress_timer.start(1000)
-
         self.download_timer = QTimer()
         self.download_timer.timeout.connect(self.download_list_update)
         self.download_timer.start(500)
@@ -414,10 +494,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
     def set_tracker(self, _):
         state.tracker = self.tracker_list.currentText()
 
-    def update_progress(self):
-        progress = dlprogress()
-        self.progressbar.setValue(progress)
-
     def show_empty_results(self, show: bool):
         if show:
             self.qtablewidget.hide()
@@ -427,7 +503,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
             self.emptyResults.hide()
 
     def show_empty_downloads(self):
-        if len(state.downloads) > 0:
+        if len(state.active_downloads) > 0:
             self.emptyDownload.hide()
             self.downloadList.show()
         else:
@@ -438,8 +514,4 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
     def resizeEvent(self, event):
         super().resizeEvent(event)
         table_width = self.qtablewidget.viewport().width()
-        self.qtablewidget.setColumnWidth(1, int(table_width * 0.3))
+        self.qtablewidget.setColumnWidth(1, int(table_width * 0.3))
-
-
-
-    

core/interface/utils/tabhelper.py

@@ -12,6 +12,6 @@ def create_tab(title, searchbar, software_list, tabs, dlbutton, layout2):
         layout.addWidget(software_list)
     if dlbutton:
         layout.addWidget(dlbutton)
-    tab.setLayout(layout) 
+    tab.setLayout(layout)
     tabs.addTab(tab, title) 
     return tab

core/network/aria2_integration.py

@@ -1,109 +0,0 @@
-import aria2p
-import subprocess
-from core.utils.data.state import state
-from core.utils.general.logs import update_download_completed_by_hash
-from core.utils.general.logs import consoleLog
-from plyer import notification
-import socket
-import time
-import sys
-
-def run_aria2p():
-
-    state.aria2 = aria2p.API(
-        aria2p.Client(
-            host="http://localhost",
-            port=6800,
-            secret=""
-        )
-    )
-    
-    return state.aria2
-
-
-def aria2server():
-    download_path = state.download_path
-    speed_limit = state.speed_limit
-
-    cmd = [
-        "aria2c",
-        "--enable-rpc",
-        "--disable-ipv6", # added this since it caused problems with vpns
-        "--rpc-listen-all",
-        "--rpc-listen-port=6800",
-        f"--dir={download_path}",
-        f"--max-download-limit={speed_limit * 1024}",
-        "-x", str(state.aria2_threads),
-        "-s", str(state.aria2_threads),
-    ]
-    
-    aria2server = subprocess.Popen(
-        cmd,
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL,
-        creationflags=subprocess.CREATE_NO_WINDOW if sys.platform == 'win32' else 0
-    )
-
-    max_checks = 50
-    for check in range(max_checks):
-        try:
-            sock = socket.socket()
-            sock.settimeout(0.1)
-            sock.connect(("localhost", 6800))
-            sock.close()
-            break
-        except(ConnectionRefusedError, socket.timeout):
-            time.sleep(0.1)
-    else:
-        raise RuntimeError("Aria2 Server failed to start")
-
-    consoleLog("Aria2 Server started")
-    return aria2server
-
-def dlprogress():
-    try:
-        state.downloads = [download for download in state.aria2.get_downloads() if not download.is_metadata]
-        downloads = state.downloads
-        if downloads:
-            for download in downloads:
-                progress = download.progress_string(0)
-                progress_int = int(progress.strip('%'))
-                return progress_int
-        return 0
-    except:
-        return 0
-
-def send_notification(shutdown_event):
-    notified = set()
-    while not shutdown_event.is_set():
-        try:
-            for d in state.aria2.get_downloads():
-                if d.is_metadata:
-                    continue
-                if d.progress == 100 and d.gid not in notified:
-                    notification.notify(
-                        title="Download finished",
-                        message=f"{d.name} has finished downloading.",
-                        timeout=4
-                    )
-                    notified.add(d.gid)
-            state.downloads = [d for d in state.aria2.get_downloads() if d.is_active and not d.is_metadata]
-        except Exception:
-            pass
-        time.sleep(5)
-
-def update_log(shutdown_event):
-    updated = set()
-    while not shutdown_event.is_set():
-        try:
-            for d in state.aria2.get_downloads():
-                if d.is_metadata:
-                    continue
-                if d.progress == 100 and d.gid not in updated:
-                    consoleLog(f"Marking {d.name} as completed")
-                    update_download_completed_by_hash(d.info_hash, True)
-                    updated.add(d.gid)
-            state.downloads = [d for d in state.aria2.get_downloads() if d.is_active and not d.is_metadata]
-        except Exception:
-            pass
-        time.sleep(5)

core/network/aria2_wrapper.py

@@ -1,18 +0,0 @@
-from .aria2_integration import run_aria2p
-from core.utils.data.state import state
-from core.utils.general.logs import consoleLog
-
-def start_client():
-    global aria2
-    aria2 = run_aria2p()
-    consoleLog("Started Aria2p")
-
-def add_magnet(uri):
-    if uri is not None and uri.startswith("magnet:?"):  
-        aria2.add_magnet(uri)
-        consoleLog("Magnet URI added to Aria2")
-    else:
-        consoleLog(f"Invalid Magnet Link: {uri}")
-
-
-

core/network/libtorrent_int.py

@@ -0,0 +1,103 @@
+import time
+from core.utils.general.wrappers import run_thread
+import threading
+import libtorrent as lt
+from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
+
+
+global loop_running
+loop_running = False
+
+def init_session():
+    if state.dl_session is not None:
+        return
+
+    state.dl_session = lt.session()
+
+    settings = {
+        "upload_rate_limit": state.up_speed_limit,
+        "download_rate_limit": state.down_speed_limit,
+        "enable_dht": True,
+        "enable_lsd": True,
+        "enable_upnp": True,
+        "enable_natpmp": True,
+        "dht_bootstrap_nodes": "router.bittorrent.com:6881,dht.transmissionbt.com:6881",
+        "connections_limit": state.max_connections,
+        "active_downloads": state.max_downloads
+    }
+
+    
+
+    state.dl_session.apply_settings(settings)
+
+    consoleLog("Initialized Session")
+
+
+def add_download(magnet_uri, dl_path=state.download_path):
+
+    if state.active_downloads is None:
+        state.active_downloads = {}
+
+    init_session()
+
+    if magnet_uri in state.active_downloads:
+        consoleLog("Skipping, download already running...")
+        return
+
+
+    magnetdl = lt.parse_magnet_uri(magnet_uri)
+    magnetdl.save_path = dl_path
+
+    download = state.dl_session.add_torrent(magnetdl)
+    state.active_downloads[magnet_uri] = download
+    consoleLog(f"Added {magnet_uri} to downloads")
+
+    run_thread(threading.Thread(target=dl_status_loop))
+
+
+
+def dl_status_loop():
+    global loop_running
+    if loop_running == True:
+        return
+    
+    loop_running = True
+    completed_set = set()
+    
+    if not state.active_downloads:
+        consoleLog("No active downloads")
+        loop_running = False
+        return
+    
+    while state.active_downloads:
+        for magnet_uri, magnetdl in list(state.active_downloads.items()):
+            status = magnetdl.status()
+            
+            if status.state == lt.torrent_status.seeding and magnet_uri not in completed_set:
+                consoleLog(f"Download completed: {status.name}")
+                
+                completed_set.add(magnet_uri)
+        
+        if not state.active_downloads:
+            loop_running = False
+            break
+        
+        time.sleep(1)
+    
+    loop_running = False
+
+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,
+        "connections_limit": state.max_connections,
+        "active_downloads": state.max_downloads
+    }
+
+    state.dl_session.apply_settings(settings)
+

core/network/libtorrent_misc.py

@@ -0,0 +1,60 @@
+from core.utils.data.state import state
+from core.utils.general.logs import update_download_completed_by_hash
+from core.utils.general.logs import consoleLog
+from plyer import notification
+import libtorrent as lt
+import time
+
+
+def cleanup_session():
+    if state.dl_session is not None:
+        for magnetdl in state.active_downloads.values():
+            if hasattr(magnetdl, 'pause'):  # Check it's a handle
+                magnetdl.pause()
+        
+        del state.dl_session
+        state.dl_session = None
+        state.active_downloads.clear()
+
+
+
+
+def send_notification(shutdown_event):
+    notified = set()
+    while not shutdown_event.is_set():
+        try:
+            for magnet_uri, magnetdl in list(state.active_downloads.items()):
+                if isinstance(magnetdl, dict):
+                    continue
+                
+                status = magnetdl.status()
+                
+                if status.state == lt.torrent_status.seeding and magnet_uri not in notified:
+                    notification.notify(
+                        title="Download finished",
+                        message=f"{status.name} has finished downloading.",
+                        timeout=4
+                    )
+                    notified.add(magnet_uri)
+        except Exception:
+            pass
+        time.sleep(5)
+
+def update_log(shutdown_event):
+    updated = set()
+    while not shutdown_event.is_set():
+        try:
+            for magnet_uri, magnetdl in list(state.active_downloads.items()):
+                if isinstance(magnetdl, dict):
+                    continue
+                
+                status = magnetdl.status()
+                
+                if status.state == lt.torrent_status.seeding and magnet_uri not in updated:
+                    consoleLog(f"Marking {status.name} as completed")
+                    info_hash = str(status.info_hash)
+                    update_download_completed_by_hash(info_hash, True)
+                    updated.add(magnet_uri)
+        except Exception:
+            pass
+        time.sleep(5)

core/network/libtorrent_wrapper.py

@@ -0,0 +1,12 @@
+from core.utils.general.logs import consoleLog
+from core.network.libtorrent_int import add_download
+
+def add_magnet(uri):
+    if uri is not None and uri.startswith("magnet:?"):  
+        add_download(uri)
+        consoleLog("Magnet URI added to LibTorrent")
+    else:
+        consoleLog(f"Invalid Magnet Link: {uri}")
+
+
+

core/utils/config/config.py

@@ -6,8 +6,8 @@ from core.utils.data.state import state
 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}", 
+    config["General"] = {"debug": True, "api_url": f"{state.api_url}", "download_path": f"{state.download_path}", f"download_speed_limit": f"{state.down_speed_limit}", f"upload_speed_limit": f"{state.up_speed_limit}", 
-                         "ignore_updates": f"{state.ignore_updates}", "image_path": f"{state.image_path}", "autoresume": f"{state.autoresume}"}
+                         "ignore_updates": f"{state.ignore_updates}", "image_path": f"{state.image_path}", "autoresume": f"{state.autoresume}", "max_connections": f"{state.max_connections}", "max_downloads": f"{state.max_downloads}"}
 
     if platform.system() == "Windows":
         config_dir = os.environ.get("APPDATA", os.path.expanduser("~\\AppData\\Roaming"))
@@ -40,11 +40,13 @@ def read_config():
 
     state.debug = config.getboolean("General", "debug", fallback=state.debug)
     state.api_url = config.get("General", "api_url", fallback=state.api_url)
-    state.aria2_threads = config.getint("General", "aria2_threads", fallback=state.aria2_threads)
     state.download_path = config.get("General", "download_path", fallback=state.download_path)
-    state.speed_limit = config.getint("General", "speed_limit", fallback=state.speed_limit)
+    state.down_speed_limit = config.getint("General", "download_speed_limit", fallback=state.down_speed_limit)
+    state.up_speed_limit = config.getint("General", "upload_speed_limit", fallback=state.up_speed_limit)
     state.ignore_updates = config.getboolean("General", "ignore_updates", fallback=state.ignore_updates)
     state.image_path = config.get("General", "image_path", fallback=state.image_path)
     state.autoresume = config.getboolean("General", "autoresume", fallback=state.autoresume)
+    state.max_connections = config.getint("General", "max_connections", fallback=state.max_connections)
+    state.max_downloads = config.getint("General", "max_downloads", fallback=state.max_downloads)
 
     create_config()

core/utils/config/settings.py

@@ -1,33 +1,29 @@
+from core.network.libtorrent_int import update_settings
 from core.utils.data.state import state
-from core.utils.general.shutdown import kill_aria2server
+from core.utils.general.logs import consoleLog
 from .config import create_config
 
-def restart_aria2c():
-    import main # had to do this because of circle import :(
-    import signal
-    import atexit
-    kill_aria2server()
-    state.aria2process.wait()
-    state.aria2process = main.run_aria2server()
-    signal.signal(signal.SIGINT, main.keyboardinterrupthandler)
-    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, image_path=None, autoresume=None):
+def save_settings(close=lambda: None, apiurl=None, download_path=None, down_speed_limit=None, up_speed_limit=None, image_path=None, autoresume=None, max_connections=None, max_downloads=None):
-    if thread_count is not None:
-        state.aria2_threads = thread_count
     if apiurl is not None:
         state.api_url = apiurl
     if download_path is not None:
         state.download_path = download_path
-    if speed_limit is not None:
+    if down_speed_limit is not None:
-        state.speed_limit = speed_limit
+        state.down_speed_limit = down_speed_limit
+    if up_speed_limit is not None:
+        state.up_speed_limit = up_speed_limit
     if image_path is not None:
         state.image_path = image_path
     if autoresume is not None:
         state.autoresume = autoresume
+    if max_connections is not None:
+        state.max_connections = max_connections
+    if max_downloads is not None:
+        state.max_downloads = max_downloads
     
-    
+
+    update_settings()
+    consoleLog("Saved Settings")
     create_config()
-    restart_aria2c()
     close()

core/utils/data/state.py

@@ -11,7 +11,6 @@ class AppState(QObject):
         self.post_titles: List[str] = []
         self.post_urls: List[str] = []
         self.post_author: List[str] = []
-        self.downloads: List[str] = []
         self.version: str = "dev"
         self._image_path: str = ""
         self.ignore_updates: bool = False
@@ -20,12 +19,13 @@ class AppState(QObject):
         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.up_speed_limit: int = 0
-        self.aria2process: Optional[Any] = None
+        self.down_speed_limit: int = 0
-        self.aria2: Any = None
+        self.max_connections: int = 200
-        self.aria2p: Any = None
+        self.max_downloads: int = 10
-        self.aria2_threads: int = 4
         self.settings_path: str = None
+        self.dl_session: Any = None
+        self.active_downloads: List[str] = {}
 
     @property
     def image_path(self) -> str:

core/utils/general/shutdown.py

@@ -1,30 +1,9 @@
-from core.utils.data.state import state
-from core.utils.general.logs import consoleLog
 import threading
-import psutil
+from core.network.libtorrent_misc import cleanup_session
-import sys
+from core.utils.general.wrappers import run_thread
-
 
 shutdown_event = threading.Event()
 
-def kill_aria2server():
-    if sys.platform.startswith("win"):
-        process = "aria2c.exe"
-    else:
-        process = "aria2c"
-
-    if state.aria2process:
-        state.aria2process.kill()
-        consoleLog("Killed Aria2")
-            
-    try:
-        for proc in psutil.process_iter():
-            if proc.name() == process:
-                proc.kill()
-                consoleLog(f"Killed Aria2c (PID {proc.pid})")
-    except psutil.NoSuchProcess:
-        pass
-
 def closehelper():
-    shutdown_event.set()
+    run_thread(threading.Thread(target=cleanup_session))
-    kill_aria2server()
+    shutdown_event.set()

core/utils/network/download.py

@@ -2,8 +2,7 @@ from core.utils.data.state import state
 from core.utils.general.logs import consoleLog
 from core.utils.data.tracker import get_item_url
 from core.utils.data.tracker import get_magnet_link
-from core.network.aria2_wrapper import start_client
+from core.network.libtorrent_wrapper import add_download
-from core.network.aria2_wrapper import add_magnet
 from core.utils.general.wrappers import run_thread
 from core.utils.general.logs import add_download_log
 
@@ -21,13 +20,12 @@ def run_download(item, posts, post_titles):
     post_url = get_item_url(item, posts, post_titles)
     consoleLog(f"Selected URL: {post_url}")
     magnet_uri = get_magnet_link(post_url)
-    start_client()
+
     add_download_log(item, post_url, magnet_uri, False)
-    add_magnet(magnet_uri)
+    add_download(magnet_uri)
 
 def run_download_direct(magnet_uri):
-    start_client()
+    add_download(magnet_uri)    
-    add_magnet(magnet_uri)    
 
 
 

main.py

@@ -1,8 +1,7 @@
 from core.interface.gui import MainWindow
 from core.utils.data.state import state
 from core.utils.general.logs import consoleLog
-from core.network.aria2_integration import aria2server
+from core.network.libtorrent_misc import send_notification, update_log
-from core.network.aria2_integration import send_notification, update_log
 from core.utils.general.logs import get_download_logs
 from core.utils.general.shutdown import closehelper, shutdown_event
 from core.utils.general.wrappers import run_thread
@@ -35,10 +34,6 @@ def run_gui():
     widget.show()
     sys.exit(app.exec())
 
-def run_aria2server():
-    aria2process = aria2server()
-    return aria2process
-
 def keyboardinterrupthandler(signum, frame):
     closehelper()
 
@@ -48,8 +43,6 @@ if __name__ == "__main__":
     count, downloads = split_data(logs)
     if args.debug:
         state.debug = args.debug # override of read_config
-    consoleLog("Starting Aria2 Server")
-    state.aria2process = run_aria2server()
     signal.signal(signal.SIGINT, keyboardinterrupthandler)
     run_thread(threading.Thread(target=send_notification, args=(shutdown_event,), daemon=True))
     consoleLog("Started send_notification thread")

requirements.txt

@@ -2,9 +2,10 @@ requests==2.32.2
 PySide6==6.10.1
 beautifulsoup4==4.13.5
 darkdetect==0.8.0
-aria2p==0.12.1
 pyinstaller==6.15.0
 pyqtdarktheme==0.1.7
 aiohttp==3.13.0
 plyer==2.1.0
 psutil==7.1.0
+libtorrent==2.0.11
+libtorrent-windows-dll==0.0.3