test new workflow

.github/workflows/dev.yml

@@ -28,8 +28,8 @@ jobs:
             artifact_name: SoftwareManager-dev-${{ github.sha }}-linux
             asset_name: SoftwareManager-dev-${{ github.sha }}-linux
           - os: windows-latest
-            artifact_name: SoftwareManager-dev-${{ github.sha }}-windows.exe
+            artifact_name: SoftwareManager-dev-${{ github.sha }}-windows.zip
-            asset_name: SoftwareManager-dev-${{ github.sha }}-windows.exe
+            asset_name: SoftwareManager-dev-${{ github.sha }}-windows.zip
           - os: macos-latest
             artifact_name: SoftwareManager-dev-${{ github.sha }}-macos
             asset_name: SoftwareManager-dev-${{ github.sha }}-macos
@@ -82,22 +82,14 @@ 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
         run: |
-          pyinstaller --onefile --windowed \
+          pyinstaller --onedir --windowed \
             --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 \
@@ -130,15 +122,21 @@ jobs:
             --name ${{ env.APP_NAME }} \
             main.py
 
-      - name: Make executable (Unix)
+      - name: Package and rename artifact (Windows)
-        if: runner.os != 'Windows'
+        if: runner.os == 'Windows'
-        run: chmod +x dist/${{ env.APP_NAME }}
+        shell: powershell
+        run: |
+          cd dist
+          Compress-Archive -Path '${{ env.APP_NAME }}' -DestinationPath '${{ matrix.artifact_name }}'
+          ls -la
 
-      - name: Rename artifact
+      - name: Rename artifact (Unix)
+        if: runner.os != 'Windows'
         shell: bash
         run: |
           cd dist
-          mv ${{ env.APP_NAME }}${{ runner.os == 'Windows' && '.exe' || '' }} ${{ matrix.artifact_name }}
+          chmod +x ${{ env.APP_NAME }}
+          mv ${{ env.APP_NAME }} ${{ matrix.artifact_name }}
           ls -la
 
       - name: Upload build artifact
@@ -165,7 +163,7 @@ jobs:
           mkdir -p release
           SHORT_SHA="${{ needs.build.outputs.short_sha }}"
           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/windows-latest-build/SoftwareManager-dev-*-windows.zip release/SoftwareManager-dev-${SHORT_SHA}-windows.zip
           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/
@@ -183,7 +181,7 @@ jobs:
           
           ### Downloads
           - Linux: \`SoftwareManager-dev-${SHORT_SHA}-linux\`
-          - Windows: \`SoftwareManager-dev-${SHORT_SHA}-windows.exe\`
+          - Windows: \`SoftwareManager-dev-${SHORT_SHA}-windows.zip\`
           - macOS: \`SoftwareManager-dev-${SHORT_SHA}-macos\`
           EOF
           cat release_notes.md
@@ -196,7 +194,7 @@ jobs:
           body_path: release_notes.md
           files: |
             release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-linux
-            release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.exe
+            release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.zip
             release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

core/interface/dialogs/settings.py

@@ -60,30 +60,20 @@ 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)
 
+        # transparent window checkbox
+        transparent_window_container = QWidget()
+        transparent_window_layout = QHBoxLayout()
 
-        # container for tight space
+        transparent_window_checkbox = QCheckBox()
-        thread_container = QWidget()
+        transparent_window_container.setLayout(transparent_window_layout)
-        thread_layout = QHBoxLayout()
+        transparent_window_layout.addWidget(QLabel("Window Transparency (requires restart) (Linux/MacOS only): "))
 
-        thread_layout.addWidget(QLabel("Threads:"))
+        transparent_window_layout.addStretch()
-        thread_layout.addWidget(thread_box)
+        transparent_window_checkbox.setChecked(state.window_transparency)
-        thread_container.setLayout(thread_layout)
+        transparent_window_checkbox.toggled.connect(lambda checked: setattr(state, 'window_transparency', checked))
-        thread_container.setMaximumHeight(80)
+        transparent_window_layout.addWidget(transparent_window_checkbox)
-        
+        dialog.layout().addWidget(transparent_window_container)
-
-        # Dimensions
-        thread_box.setFixedWidth(90)
-        thread_box.setFixedHeight(30)
-
-        dialog.layout().addWidget(thread_container)
 
         ##################
         # SERVER SETTING #
@@ -124,6 +114,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 +206,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

@@ -1,12 +1,11 @@
 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,
     QWidget,
     QVBoxLayout,
     QListWidget,
-    QToolBar,
     QLabel,
     QHBoxLayout,
     QComboBox,
@@ -16,13 +15,10 @@ from PySide6.QtWidgets import (
     QMessageBox,
     QTableWidget,
     QTextEdit,
-    QStyle,
-    QStyleOptionButton,
     QStyledItemDelegate,
-    QApplication,
 )
 
-from PySide6.QtGui import QIcon, QAction, QCloseEvent, QImage, QPixmap
+from PySide6.QtGui import QIcon, QCloseEvent, QImage, QPixmap
 import darkdetect
 import threading
 import platform
@@ -138,6 +134,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         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.dlbutton.setCursor(Qt.PointingHandCursor)
         self.libraryList = QListWidget()
 
         self.emptyResults = QLabel("No Results")
@@ -161,6 +158,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)   
@@ -207,8 +206,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                     status = magnetdl.status()
                     
                     if col == 0:
-                        is_paused = magnetdl.status().paused
+                        pass
-                        return "▶︎" if is_paused else "⏸︎"
                     elif col == 1:
                         return status.name if status.has_metadata else "Fetching metadata..."
                     elif col == 2:
@@ -300,8 +298,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
             def setEditorData(self, editor, index):
                 button = editor.findChild(QtWidgets.QPushButton)
                 
-
-                
                 magnet_link = list(state.active_downloads.keys())[index.row()]
                 magnetdl = state.active_downloads[magnet_link]
                 status = magnetdl.status()
@@ -312,8 +308,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                     else:
                         button.setText("▶︎" if status.paused else "⏸︎")
 
-
-
             def createEditor(self, parent, option, index):
                 magnet_link = list(state.active_downloads.keys())[index.row()]
                 magnetdl = state.active_downloads[magnet_link]
@@ -366,6 +360,17 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
         # Tabs
         self.tabs = QTabWidget()
+        self.tabs = QTabWidget()
+        self.tabs.setStyleSheet("""
+            QTabBar::tab {
+                font-size: 11px;
+                padding: 2px 8px;
+                height: 25px;
+            }
+            QTabWidget::pane {
+                margin-top: -20px;
+            }
+        """)
 
         self.horizontal_layout = QHBoxLayout()
         self.horizontal_layout.addWidget(self.emptyResults, stretch=3)
@@ -389,33 +394,63 @@ 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)
         
-        containerLayout.setAlignment(Qt.AlignmentFlag.AlignBottom)
+        self.corner_widget = QWidget()
-        toolbar = QToolBar("Main Toolbar")
+        self.corner_layout = QHBoxLayout(self.corner_widget)
-        self.addToolBar(toolbar)
+        self.corner_layout.setContentsMargins(0, 0, 0, 0)
-        toolbar.setLayoutDirection(Qt.RightToLeft)
+
 
         self.tracker_list = QComboBox()
         self.tracker_list.addItems(["rutracker", "uztracker", "m0nkrus"])
+        self.tracker_list.setCursor(Qt.PointingHandCursor)
         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.setCursor(Qt.PointingHandCursor)
+        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.progressbar.setValue(0)
+        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.consoleLog.setReadOnly(True)
         self.consoleLog.setFixedHeight(150)
         containerLayout.addWidget(self.consoleLog)

core/network/libtorrent_int.py

@@ -100,4 +100,4 @@ def update_settings():
     }
 
     state.dl_session.apply_settings(settings)
-    consoleLog("Updated Settings")
+

core/utils/config/config.py

@@ -6,8 +6,19 @@ from core.utils.data.state import state
 def create_config():
     config = configparser.ConfigParser()
 
-    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}", 
+    config["General"] = {
-                         "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}"}
+        "debug": True,
+        "api_url": f"{state.api_url}",
+        "download_path": f"{state.download_path}",
+        "download_speed_limit": f"{state.down_speed_limit}",
+        "upload_speed_limit": f"{state.up_speed_limit}", 
+        "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}",
+        "window_transparency": f"{state.window_transparency}",
+    }
 
     if platform.system() == "Windows":
         config_dir = os.environ.get("APPDATA", os.path.expanduser("~\\AppData\\Roaming"))
@@ -48,5 +59,6 @@ def read_config():
     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)
+    state.window_transparency = config.getboolean("General", "window_transparency", fallback=state.window_transparency)
 
     create_config()

core/utils/config/settings.py

@@ -1,5 +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
 
 
@@ -21,6 +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,13 +23,10 @@ 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] = {}
+        self.window_transparency: bool = False
 
     @property
     def image_path(self) -> str:

main.py

@@ -8,9 +8,10 @@ from core.utils.general.wrappers import run_thread
 from core.utils.general.loghandler import split_data, check_completed
 from core.utils.config.config import read_config
 from PySide6 import QtWidgets
+from PySide6.QtCore import Qt
 import qdarktheme
-import darkdetect
 import threading
+import platform
 import signal
 import argparse
 import sys
@@ -21,16 +22,16 @@ parser.add_argument("--debug", action="store_true")
 args = parser.parse_args()
 
 def run_gui():
-    app = QtWidgets.QApplication([])
+    app = QtWidgets.QApplication.instance() or QtWidgets.QApplication(sys.argv)
-    if darkdetect.isDark:
+    qdarktheme.setup_theme("auto")
-        app.setStyleSheet(qdarktheme.load_stylesheet("dark"))
-    else:
-        app.setStyleSheet(qdarktheme.load_stylesheet("light"))
     widget = MainWindow()
     
+    if state.window_transparency and platform.system() != "Windows":
+        widget.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
+        widget.setStyleSheet("MainWindow { background: transparent; }")
+
     from core.utils.general.logs import set_main_window
     set_main_window(widget)
-
     widget.show()
     sys.exit(app.exec())
 

requirements.txt

@@ -1,9 +1,9 @@
 requests==2.32.2
 PySide6==6.10.1
 beautifulsoup4==4.13.5
-darkdetect==0.8.0
+darkdetect==0.7.1
 pyinstaller==6.15.0
-pyqtdarktheme==0.1.7
+PyQtDarkTheme-fork==2.3.4
 aiohttp==3.13.0
 plyer==2.1.0
 psutil==7.1.0