fix workflow with ubuntu 22.04

.github/workflows/dev.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
+          - os: ubuntu-22.04
             artifact_name: SoftwareManager-dev-${{ github.sha }}-linux
             asset_name: SoftwareManager-dev-${{ github.sha }}-linux
           - os: windows-latest
@@ -159,7 +159,7 @@ jobs:
   release:
     name: Create Release
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: success()
 
     steps:
@@ -172,7 +172,7 @@ jobs:
         run: |
           mkdir -p release
           SHORT_SHA="${{ needs.build.outputs.short_sha }}"
-          cp artifacts/ubuntu-latest-build/SoftwareManager-dev-*-linux release/SoftwareManager-dev-${SHORT_SHA}-linux
+          cp artifacts/ubuntu-22.04-build/SoftwareManager-dev-*-linux release/SoftwareManager-dev-${SHORT_SHA}-linux
           cp artifacts/windows-latest-build/SoftwareManager-dev-*-windows.exe release/SoftwareManager-dev-${SHORT_SHA}-windows.exe
           cp artifacts/macos-latest-build/SoftwareManager-dev-*-macos release/SoftwareManager-dev-${SHORT_SHA}-macos
           chmod +x release/SoftwareManager-dev-*-linux release/SoftwareManager-dev-*-macos
@@ -207,4 +207,4 @@ jobs:
             release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.exe
             release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

core/interface/gui.py

@@ -1,5 +1,5 @@
 from PySide6 import QtWidgets
-from PySide6.QtCore import Qt, QTimer, QModelIndex, QAbstractTableModel, Signal
+from PySide6.QtCore import Qt, QTimer, QModelIndex, QAbstractTableModel, Signal, QEvent
 from PySide6.QtWidgets import (
     QLineEdit,
     QTableView,
@@ -16,6 +16,10 @@ from PySide6.QtWidgets import (
     QMessageBox,
     QTableWidget,
     QTextEdit,
+    QStyle,
+    QStyleOptionButton,
+    QStyledItemDelegate,
+    QApplication,
     )
 
 from PySide6.QtGui import QIcon, QAction, QCloseEvent, QImage, QPixmap
@@ -54,11 +58,11 @@ def download_update(latest_version):
     time.sleep(0.5)
 
     msg = QMessageBox()
-    msg.setIcon(QMessageBox.Information)
+    msg.setIcon(QMessageBox.Icon.Information)
     msg.setWindowTitle("New Version")
     msg.setText("New version installed.")
     msg.setInformativeText("Please remove the old exe.")
-    msg.setStandardButtons(QMessageBox.Ok)
+    msg.setStandardButtons(QMessageBox.StandardButton.Ok)
 
     sys.exit(0)
 
@@ -89,8 +93,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         if platform.system() == "Windows":
             try:
                 import ctypes
-                myappid = 'SoftwareManager.App.1'
-                ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+                appid = 'SoftwareManager'
+                ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(appid)
             except Exception as e:
                 consoleLog(f"Could not set app ID: {e}")
 
@@ -109,14 +113,14 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
                     if assets:
                         msg = QMessageBox()
-                        msg.setIcon(QMessageBox.Information)
+                        msg.setIcon(QMessageBox.Icon.Information)
                         msg.setWindowTitle("Update Available")
                         msg.setText("A new version is available.")
                         msg.setInformativeText("Press Ok to download the update.")
-                        msg.setStandardButtons(QMessageBox.Ok | QMessageBox.Ignore)
+                        msg.setStandardButtons(QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Ignore)
 
                         response = msg.exec_()
-                        if response == QMessageBox.Ok:
+                        if response == QMessageBox.StandardButton.Ok:
                             download_update(latest_version)
 
         self.setWindowTitle("Software Manager")
@@ -143,6 +147,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.downloadList = QTableView()
         self.emptyLibrary = QLabel("No items in library.")
         self.emptyDownload = QLabel("No items in downloads.")
+        self.emptyDownload.setAlignment(Qt.AlignCenter)
 
         self.consoleLog = QTextEdit()
         self.progressbar = QProgressBar()
@@ -175,11 +180,11 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         class DownloadModel(QAbstractTableModel):
             def __init__(self):
                 super().__init__()
-                self.headers = ["Name", "Status", "Progress", "Speed", "Size", "Total Size"]
+                self.headers = ["Action", "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)
 
@@ -189,32 +194,88 @@ 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:
-                    download = state.downloads[index.row()]
                     col = index.column()
 
                     if col == 0:
-                        return download.name
+                        return "▶︎" if download.is_paused else "⏸︎"
                     elif col == 1:
-                        return getattr(download, 'status', 'Downloading')
+                        return download.name
                     elif col == 2:
-                        return f"{int(download.progress)}%"
+                        return getattr(download, 'status', 'Downloading')
                     elif col == 3:
-                        return f"{download.download_speed_string()}"
+                        return f"{int(download.progress)}%"
                     elif col == 4:
-                        pass
+                        return f"{download.download_speed_string()}"
                     elif col == 5:
+                        pass
+                    elif col == 6:
                         return f"{download.total_length_string()}"
+                
+                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.is_paused:
+                    download.resume()
+                else:
+                    download.pause()
+                idx = self.index(row, 0)
+                self.dataChanged.emit(idx, idx, [Qt.DisplayRole, Qt.UserRole])
+
+        class PauseResumeDelegate(QStyledItemDelegate):
+            clicked = Signal(int)
+
+            def paint(self, painter, option, index):
+                if index.column() != 0:
+                    super().paint(painter, option, index)
+                    return
+
+                paused = index.data(Qt.UserRole)
+
+                button = QStyleOptionButton()
+                button.rect = option.rect
+                button.text = "▶︎" if paused else "⏸︎"
+                button.state = QStyle.State_Enabled
+
+                QApplication.style().drawControl(
+                    QStyle.CE_PushButton, button, painter
+                )
+
+            def editorEvent(self, event, model, option, index):
+                if index.column() == 0 and event.type() == QEvent.Type.MouseButtonPress:
+                    self.clicked.emit(index.row())
+                    return True
+                return False
+
         self.download_model = DownloadModel()
         self.downloadList.setModel(self.download_model)
         self.downloadList.horizontalHeader().setStretchLastSection(False)
-        self.downloadList.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch)
+        self.downloadList.horizontalHeader().setSectionResizeMode(1, QHeaderView.Stretch)
         self.downloadList.setSelectionBehavior(QTableView.SelectRows)
         self.downloadList.setAttribute(Qt.WA_TranslucentBackground)
         self.downloadList.viewport().setAttribute(Qt.WA_TranslucentBackground)
 
+        download_model = self.download_model
+
+        def on_pause_resume_clicked(row):
+            download_model.toggle_pause_resume(row)
+
+            download = state.downloads[row]
+            if download.is_paused:
+                download.pause()
+            else:
+                download.resume() 
+
+        delegate = PauseResumeDelegate(self.downloadList)
+        self.downloadList.setItemDelegateForColumn(0, delegate)
+        delegate.clicked.connect(on_pause_resume_clicked)
+
         # download button triggers
         self.dlbutton.clicked.connect(lambda: run_thread(threading.Thread(target=download_selected, args=(self.qtablewidget.currentItem(), state.posts, state.post_titles))))
 
@@ -285,6 +346,10 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.download_timer.timeout.connect(lambda: run_thread(threading.Thread(target=self.download_list_update)))
         self.download_timer.start(500)
 
+        self.active_timer = QTimer()
+        self.active_timer.timeout.connect(self.show_empty_downloads)
+        self.active_timer.start(500)
+
     @staticmethod
     def add_log(text):
         if MainWindow._instance:
@@ -307,6 +372,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         if self.download_model:
             self.download_model.layoutAboutToBeChanged.emit()
             self.download_model.layoutChanged.emit()
+        
 
     def closeEvent(self, event: QCloseEvent):
         closehelper()
@@ -324,9 +390,16 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
             self.qtablewidget.hide()
             self.emptyResults.show()
         else:
-            self.emptyResults.hide()
             self.qtablewidget.show()
+            self.emptyResults.hide()
 
+    def show_empty_downloads(self):
+        if len(state.downloads) > 0:
+            self.emptyDownload.hide()
+            self.downloadList.show()
+        else:
+            self.emptyDownload.show()
+            self.downloadList.hide()
 
     # thank you claude
     def resizeEvent(self, event):
@@ -336,4 +409,4 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
 
 
-    
+    

core/network/aria2_integration.py

@@ -4,6 +4,7 @@ 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
 
@@ -42,6 +43,21 @@ def aria2server():
         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():

core/network/aria2_wrapper.py

@@ -8,8 +8,11 @@ def start_client():
     consoleLog("Started Aria2p")
 
 def add_magnet(uri):
-    aria2.add_magnet(uri)
-    consoleLog("Magnet URI added to Aria2")
+    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/utils/general/loghandler.py

@@ -1,4 +1,3 @@
-from core.utils.data.state import state
 from core.utils.general.logs import consoleLog
 from core.utils.network.download import run_download_direct