fix: add --assume-yes-for-downloads option to Nuitka build commands for improved automation

.github/workflows/dev.yml

@@ -57,13 +57,7 @@ jobs:
       - name: Install Python dependencies
         run: |
           uv pip install -r requirements.txt
-          uv pip install Pillow
-        env:
-          UV_SYSTEM_PYTHON: 1
-
-      - name: Install Nuitka (Windows only)
-        if: runner.os == 'Windows'
-        run: uv pip install nuitka
+          uv pip install nuitka
         env:
           UV_SYSTEM_PYTHON: 1
 
@@ -88,29 +82,29 @@ jobs:
           }
           EOF
 
-      - name: Install UPX (Windows)
-        if: runner.os == 'Windows'
+      - name: Install UPX
         shell: bash
         run: |
-          curl -sL https://github.com/upx/upx/releases/download/v5.1.0/upx-5.1.0-win64.zip -o upx.zip
-          7z x upx.zip -oupx-dir
-          UPX_DIR="$(pwd)/upx-dir/upx-5.1.0-win64"
-          echo "$UPX_DIR" >> $GITHUB_PATH
-          export PATH="$UPX_DIR:$PATH"
-          echo "UPX_BINARY=$UPX_DIR/upx.exe" >> $GITHUB_ENV
+          if [ "$RUNNER_OS" == "Windows" ]; then
+            curl -sL https://github.com/upx/upx/releases/download/v5.1.0/upx-5.1.0-win64.zip -o upx.zip
+            7z x upx.zip -oupx-dir
+            UPX_DIR="$(pwd)/upx-dir/upx-5.1.0-win64"
+            echo "$UPX_DIR" >> $GITHUB_PATH
+            export PATH="$UPX_DIR:$PATH"
+            echo "UPX_BINARY=$UPX_DIR/upx.exe" >> $GITHUB_ENV
+          elif [ "$RUNNER_OS" == "Linux" ]; then
+            curl -sL https://github.com/upx/upx/releases/download/v5.1.0/upx-5.1.0-amd64_linux.tar.xz -o upx.tar.xz
+            tar xf upx.tar.xz
+            UPX_DIR="$(pwd)/upx-5.1.0-amd64_linux"
+            echo "$UPX_DIR" >> $GITHUB_PATH
+            export PATH="$UPX_DIR:$PATH"
+            echo "UPX_BINARY=$UPX_DIR/upx" >> $GITHUB_ENV
+          else
+            brew install upx
+            echo "UPX_BINARY=$(which upx)" >> $GITHUB_ENV
+          fi
           upx --version | head -1
 
-      - name: Convert icon for Windows
-        if: runner.os == 'Windows'
-        shell: bash
-        run: |
-          python -c "
-          from PIL import Image
-          img = Image.open('src/core/interface/assets/logo.png')
-          img.save('app_icon.ico', format='ICO', sizes=[(256,256),(128,128),(64,64),(48,48),(32,32),(16,16)])
-          print('Icon converted successfully')
-          "
-
       - name: Build with Nuitka (Windows)
         if: runner.os == 'Windows'
         shell: bash
@@ -121,70 +115,52 @@ jobs:
             --onefile-tempdir-spec="{CACHE_DIR}/${{ env.APP_NAME }}/${{ env.VERSION }}" \
             --assume-yes-for-downloads \
             --windows-console-mode=disable \
-            --windows-icon-from-ico=app_icon.ico \
             --enable-plugin=pyside6 \
             --enable-plugin=upx \
             --upx-binary="${{ env.UPX_BINARY }}" \
-            --noinclude-qt-translations \
+            --include-data-dir=core/interface/assets=core/interface/assets \
             --include-data-files=build_info.json=build_info.json \
-            --include-data-files=build_info.json=src/build_info.json \
-            --include-data-files=build_info.json=src/core/interface/build_info.json \
+            --include-data-files=build_info.json=core/build_info.json \
+            --include-data-files=build_info.json=core/interface/build_info.json \
             --output-filename=${{ env.APP_NAME }}.exe \
-            src/main.py
+            main.py
 
-      - name: Build with PyInstaller (Linux)
-        if: runner.os == 'Linux'
+      - name: Build with Nuitka (Unix)
+        if: runner.os != 'Windows'
         shell: bash
         run: |
-          pyinstaller --onefile --windowed \
-            --add-data "build_info.json:." \
-            --add-data "build_info.json:src/core" \
-            --add-data "build_info.json:src/core/interface" \
-            --exclude-module PyQt6 \
-            --exclude-module PyQt5 \
-            --hidden-import=backports.tarfile \
-            --hidden-import=backports \
-            --hidden-import=jaraco.context \
-            --hidden-import=jaraco.text \
-            --hidden-import=jaraco.functools \
-            --name ${{ env.APP_NAME }} \
-            src/main.py
+          python -m nuitka \
+            --onefile \
+            --onefile-no-compression \
+            --onefile-tempdir-spec="{CACHE_DIR}/${{ env.APP_NAME }}/${{ env.VERSION }}" \
+            --assume-yes-for-downloads \
+            --enable-plugin=pyside6 \
+            --enable-plugin=upx \
+            --upx-binary="${{ env.UPX_BINARY }}" \
+            --include-data-dir=core/interface/assets=core/interface/assets \
+            --include-data-files=build_info.json=build_info.json \
+            --include-data-files=build_info.json=core/build_info.json \
+            --include-data-files=build_info.json=core/interface/build_info.json \
+            --output-filename=${{ env.APP_NAME }} \
+            main.py
 
-      - name: Build with PyInstaller (macOS)
-        if: runner.os == 'macOS'
+      - name: Prepare artifact
         shell: bash
         run: |
-          pyinstaller --onefile \
-            --add-data "build_info.json:." \
-            --add-data "build_info.json:src/core" \
-            --add-data "build_info.json:src/core/interface" \
-            --exclude-module PyQt6 \
-            --exclude-module PyQt5 \
-            --hidden-import=backports.tarfile \
-            --hidden-import=backports \
-            --hidden-import=jaraco.context \
-            --hidden-import=jaraco.text \
-            --hidden-import=jaraco.functools \
-            --name ${{ env.APP_NAME }} \
-            src/main.py
-
-      - name: Rename artifact
-        shell: bash
-        run: |
-          mkdir -p dist-final
+          mkdir -p dist
           if [ "$RUNNER_OS" == "Windows" ]; then
-            mv ${{ env.APP_NAME }}.exe dist-final/${{ matrix.artifact_name }}
+            mv ${{ env.APP_NAME }}.exe dist/${{ matrix.artifact_name }}
           else
-            chmod +x dist/${{ env.APP_NAME }}
-            mv dist/${{ env.APP_NAME }} dist-final/${{ matrix.artifact_name }}
+            mv ${{ env.APP_NAME }} dist/${{ matrix.artifact_name }}
+            chmod +x dist/${{ matrix.artifact_name }}
           fi
-          ls -la dist-final/
+          ls -la dist/
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-build
-          path: dist-final/${{ matrix.artifact_name }}
+          path: dist/${{ matrix.artifact_name }}
           retention-days: 1
 
   release:
@@ -209,16 +185,9 @@ jobs:
           chmod +x release/SoftwareManager-dev-*-linux release/SoftwareManager-dev-*-macos
           ls -la release/
 
-      - name: Generate checksums
-        run: |
-          cd release
-          sha256sum * > SHA256SUMS.txt
-          cat SHA256SUMS.txt
-
       - name: Generate release notes
         run: |
           SHORT_SHA="${{ needs.build.outputs.short_sha }}"
-          CHECKSUMS=$(cat release/SHA256SUMS.txt)
           cat > release_notes.md << EOF
           ## Development Build
           
@@ -231,11 +200,6 @@ jobs:
           - Linux: \`SoftwareManager-dev-${SHORT_SHA}-linux\`
           - Windows: \`SoftwareManager-dev-${SHORT_SHA}-windows.exe\`
           - macOS: \`SoftwareManager-dev-${SHORT_SHA}-macos\`
-          
-          ### SHA-256 Checksums
-          \`\`\`
-          ${CHECKSUMS}
-          \`\`\`
           EOF
           cat release_notes.md
 
@@ -249,6 +213,5 @@ jobs:
             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 }}-macos
-            release/SHA256SUMS.txt
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -30,7 +30,7 @@ SoftwareManager is a Python-based GUI tool that simplifies searching and downloa
 ## Additional Information
 - SoftwareManager is still in Development and most likely contains issues. Please report any bugs you find via the Issues tab. Contributions are also greatly appreciated.
 - MacOS Builds haven't been properly tested - We're thankful to receive feedback.
-- If you want to host your own server, clone our [server repository](https://github.com/KeksPirates/SoftwareManager-Server), enter your cookie for rutracker.org and run server.py. Detailed Instructions on how to get your rutracker cookie are in the README of the server repo.
+- If you want to host your own server, clone the server branch of this repo, enter your cookie for rutracker.org and run server.py. Detailed Instructions on how to get your rutracker cookie are in the README of the server branch.
 
 ## Python Dependencies
 (also included in requirements.txt)

core/data/scrapers/monkrus.py

@@ -1,28 +1,16 @@
 from bs4 import BeautifulSoup
 import requests
-import time
+from core.utils.general.logs import consoleLog
 
-cache = {
-    "data": [],
-    "last_fetched": 0
-}
-
-cache_expiry = 300
-
-def _get_telegram_posts():
+def scrape_monkrus_telegram(query):
     post = 100
     max_posts = 250
-    posts = []
+    posts: list[dict] = []
     added = set()
-
-    current_time = time.time()
-
-    if cache["data"] and (current_time - cache["last_fetched"] < cache_expiry):
-        return cache["data"]
-
+    
     while post <= max_posts:
         url = f"https://t.me/s/real_monkrus/{post}"
-        response = requests.get(url, timeout=10)
+        response = requests.get(url)
         soup = BeautifulSoup(response.text, "html.parser")
         bubbles = soup.find_all("div", class_="tgme_widget_message_bubble")
         
@@ -37,7 +25,7 @@ def _get_telegram_posts():
             title = post_txt.b.text
             link = bubble.find("a", href=lambda x: x and x.startswith("https://uztracker.net"))
             
-            if link:
+            if query.lower() in title.lower() and link:
                 post_url = link["href"]
                 if post_url not in added:
                     added.add(post_url)
@@ -51,20 +39,4 @@ def _get_telegram_posts():
         post += 22
 
     posts.reverse()
-
-    cache["data"] = posts
-    cache["last_fetched"] = current_time
-
     return(posts)
-
-def scrape_monkrus_telegram(query):
-    posts = _get_telegram_posts()
-    filtered_posts = []
-
-    for post in posts:
-        if query.lower() in post["title"].lower():
-            filtered_post = post.copy()
-            filtered_post["id"] = len(filtered_posts) + 1
-            filtered_posts.append(filtered_post)
-
-    return filtered_posts

core/data/scrapers/rutracker.py

@@ -1,6 +1,6 @@
 import requests
 from core.utils.data.state import state
-from core.utils.logging.logs import consoleLog
+from core.utils.general.logs import consoleLog
 
 
 def scrape_rutracker(search_text):

core/data/scrapers/uztracker.py

@@ -1,8 +1,9 @@
 import requests
+import asyncio
 import threading
 from bs4 import BeautifulSoup
 from core.utils.data.state import state
-from core.utils.logging.logs import consoleLog
+from core.utils.general.logs import consoleLog
 from core.utils.general.wrappers import run_thread
 
 

core/interface/dialogs/settings.py

@@ -1,11 +1,10 @@
 from core.utils.config.settings import save_settings
 from core.utils.data.state import state
-from core.utils.logging.logs import consoleLog
+from core.utils.general.logs import consoleLog
 from core.interface.utils.tabhelper import general_tab
 from core.interface.utils.tabhelper import paths_tab
 from core.interface.utils.tabhelper import network_tab
 from PySide6 import QtWidgets
-from PySide6.QtCore import Qt
 from PySide6.QtWidgets import (
     QLineEdit, 
     QPushButton, 
@@ -32,9 +31,6 @@ def settings_dialog(self):
 
         dialog.setLayout(QVBoxLayout())
 
-        if state.window_transparency and platform.system() != "Windows" and dialog:
-            dialog.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
-
         def close_settings():
             dialog.reject()
 

core/interface/gui.py

@@ -1,5 +1,5 @@
 from PySide6 import QtWidgets
-from PySide6.QtCore import QPersistentModelIndex, Qt, QTimer, QModelIndex, QAbstractTableModel, Signal, QEvent, QSize
+from PySide6.QtCore import Qt, QTimer, QModelIndex, QAbstractTableModel, Signal, QEvent, QSize
 from PySide6.QtWidgets import (
     QLineEdit,
     QTableView,
@@ -18,7 +18,7 @@ from PySide6.QtWidgets import (
     QStyledItemDelegate,
 )
 
-from PySide6.QtGui import QIcon, QCloseEvent, QImage, QPixmap, QContextMenuEvent, QGuiApplication
+from PySide6.QtGui import QIcon, QCloseEvent, QImage, QPixmap, QContextMenuEvent
 import darkdetect
 import threading
 import platform
@@ -29,8 +29,7 @@ import libtorrent as lt
 import time
 import sys
 import json
-import base64
-from core.utils.logging.logs import consoleLog, remove_download_log, flush_log_buffer
+from core.utils.general.logs import consoleLog, remove_download_log, flush_log_buffer
 from core.utils.general.wrappers import run_thread
 from core.utils.data.state import state
 from core.utils.network.download import download_selected
@@ -38,9 +37,7 @@ from core.utils.network.update_checker import check_for_updates
 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.interface.assets.base64_icons import settings_black_base64
-from core.interface.assets.base64_icons import settings_white_base64
-from core.interface.assets.base64_icons import logo_base64
+from core.network.libtorrent_misc import cleanup_session
 from core.utils.general.shutdown import closehelper
 
 
@@ -67,9 +64,6 @@ def download_update(latest_version):
     sys.exit(0)
 
 
-def windowCloseHelper():
-    QGuiApplication.quit()
-    
 class MainWindow(QtWidgets.QMainWindow, QWidget):
     log_signal = Signal(str)  # Thread-safe signal for logging
     
@@ -78,10 +72,20 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         MainWindow._instance = self
         self.log_signal.connect(self._on_log_signal)
 
-        pixmap = QPixmap()
-        image_data = base64.b64decode(logo_base64)
-        pixmap.loadFromData(image_data)
-        self.setWindowIcon(QIcon(pixmap))
+        def get_asset_path(filename):
+            if getattr(sys, 'frozen', False):
+                base_path = sys._MEIPASS 
+            else:
+                base_path = os.path.dirname(__file__)
+
+            asset_path = os.path.join(base_path, 'core', 'interface', 'assets', filename)
+            if os.path.exists(asset_path):
+                return asset_path
+
+            return os.path.join('core', 'interface', 'assets', filename)
+        
+        self.setWindowIcon(QIcon(get_asset_path("logo.png")))
+
 
         if platform.system() == "Windows":
             try:
@@ -98,22 +102,23 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                 state.version = build_info.get("version")
 
         # Check for updates on Windows
-        if state.ignore_updates is False and platform.system() == "Windows":
-            result = check_for_updates()
-            if result != (None, None):
-                assets, latest_version = result
+        if state.ignore_updates is False:
+            if platform.system() == "Windows":
+                result = check_for_updates()
+                if result != (None, None):
+                    assets, latest_version = result
 
-                if assets:
-                    msg = QMessageBox()
-                    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.StandardButton.Ok | QMessageBox.StandardButton.Ignore)
+                    if assets:
+                        msg = QMessageBox()
+                        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.StandardButton.Ok | QMessageBox.StandardButton.Ignore)
 
-                    response = msg.exec_()
-                    if response == QMessageBox.StandardButton.Ok:
-                        download_update(latest_version)
+                        response = msg.exec_()
+                        if response == QMessageBox.StandardButton.Ok:
+                            download_update(latest_version)
 
         self.setWindowTitle("Software Manager")
         self.setGeometry(100, 100, 800, 600)
@@ -147,57 +152,51 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
         flush_log_buffer()
 
-        def create_tracker_table(headers):
-            table = QTableWidget()
-            table.setColumnCount(len(headers))
-            table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
-            table.verticalHeader().setVisible(False)
-            table.setHorizontalHeaderLabels(headers)
+        # Table Widget for Item List
+        self.qtablewidget = QTableWidget()
+        
+        self.qtablewidget.setColumnCount(4)
+        self.qtablewidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
+        self.qtablewidget.verticalHeader().setVisible(False)
+        self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author", "Seeders", "Leechers"])
 
-            header = table.horizontalHeader()
-            header.setSectionResizeMode(0, QHeaderView.ResizeMode.Stretch) 
-            header.setSectionResizeMode(1, QHeaderView.ResizeMode.Fixed)   
-            header.resizeSection(1, 200)
-            header.setStretchLastSection(False)
+        
 
-            return table
-            
+        header = self.qtablewidget.horizontalHeader()
+        header.setSectionResizeMode(0, QHeaderView.ResizeMode.Stretch) 
+        header.setSectionResizeMode(1, QHeaderView.ResizeMode.Fixed)   
+        header.setStretchLastSection(False)
 
-        self.rutrackerlist = create_tracker_table(["Post Title", "Author", "Seeders", "Leechers"])
-        self.uztrackerlist = create_tracker_table(["Post Title", "Author"])
-        self.monkruslist = create_tracker_table(["Post Title", "Author"])
+        self.qtablewidget.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
+        self.qtablewidget.viewport().setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) 
 
-        state.tracker_list.update({"rutracker": self.rutrackerlist, "uztracker": self.uztrackerlist, "m0nkrus": self.monkruslist})
-
-        self.rutrackerlist.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
-        self.rutrackerlist.viewport().setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
-
-        self.uztrackerlist.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
-        self.uztrackerlist.viewport().setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) 
+        header = self.qtablewidget.horizontalHeader()
+        header.setSectionResizeMode(1, QHeaderView.ResizeMode.Fixed) 
+        header.resizeSection(1, 500)
 
         container = QWidget()
         containerLayout = QVBoxLayout()
         containerLayout.addWidget(self.searchbar)
-        containerLayout.addWidget(state.tracker_list[state.tracker])
+        containerLayout.addWidget(self.qtablewidget)
 
         class DownloadModel(QAbstractTableModel):
             def __init__(self):
                 super().__init__()
                 self.headers = ["Action", "Name", "Status", "Progress", "Speed", "Size", "Total Size"]
 
-            def rowCount(self, parent: QModelIndex | QPersistentModelIndex = QModelIndex()) -> int:
+            def rowCount(self, parent=QModelIndex()):
                 return len(state.active_downloads)
             
-            def columnCount(self, parent: QModelIndex | QPersistentModelIndex = QModelIndex()):
+            def columnCount(self, parent=QModelIndex()):
                 return len(self.headers)
 
-            def headerData(self, section, orientation, role: int = Qt.ItemDataRole.DisplayRole): 
-                if role == Qt.ItemDataRole.DisplayRole and orientation == Qt.Orientation.Horizontal: 
+            def headerData(self, section, orientation, role=Qt.DisplayRole): 
+                if role == Qt.DisplayRole and orientation == Qt.Horizontal: 
                     return self.headers[section]
                 return None
 
-            def data(self, index: QModelIndex | QPersistentModelIndex, role: int = Qt.ItemDataRole.DisplayRole): 
-                if role == Qt.ItemDataRole.DisplayRole: 
+            def data(self, index, role=Qt.DisplayRole): 
+                if role == Qt.DisplayRole: 
                     col = index.column()
 
                     if index.row() >= len(state.active_downloads) or index.row() < 0:
@@ -213,9 +212,9 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                     elif col == 1:
                         return status.name if status.has_metadata else "Fetching metadata..."
                     elif col == 2:
-                        if status.state == lt.torrent_status.downloading:
+                        if status.state == lt.torrent_status.downloading: 
                             return "Downloading"
-                        elif status.state == lt.torrent_status.seeding:
+                        elif status.state == lt.torrent_status.seeding: 
                             return "Seeding"
                         elif status.paused:
                             return "Paused"
@@ -259,7 +258,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                         else:
                             return "∞" if status.paused else "Stalled"
                 
-                if role == Qt.ItemDataRole.UserRole and index.column() == 0: 
+                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
@@ -359,7 +358,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         delegate.clicked.connect(on_pause_resume_clicked)
 
         # download button triggers
-        self.dlbutton.clicked.connect(lambda: run_thread(threading.Thread(target=download_selected, args=(state.tracker_list[state.tracker].currentItem(), state.posts, state.post_titles))))
+        self.dlbutton.clicked.connect(lambda: run_thread(threading.Thread(target=download_selected, args=(self.qtablewidget.currentItem(), state.posts, state.post_titles))))
 
         container.setLayout(containerLayout)
         self.setCentralWidget(container)
@@ -379,16 +378,15 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
         self.horizontal_layout = QHBoxLayout()
         self.horizontal_layout.addWidget(self.emptyResults, stretch=3)
-        self.tracker_widget = state.tracker_list[state.tracker]
-        self.horizontal_layout.addWidget(self.tracker_widget)
+        self.horizontal_layout.addWidget(self.qtablewidget)
 
-        self.tab1 = create_tab("Search", self.searchbar, state.tracker_list[state.tracker], self.tabs, self.dlbutton, self.horizontal_layout)
+        self.tab1 = create_tab("Search", self.searchbar, self.qtablewidget, self.tabs, self.dlbutton, self.horizontal_layout)
         # self.tab2 = create_tab("Library", self.emptyLibrary, self.libraryList, self.tabs, None, None)
         self.tab3 = create_tab("Downloads", self.emptyDownload, self.downloadList, self.tabs, None, None)
 
         if state.image_path is not None and os.path.exists(state.image_path):
             self.image = QImage(state.image_path)
-            self.image = self.image.scaledToWidth(300, Qt.TransformationMode.SmoothTransformation)
+            self.image = self.image.scaledToWidth(300, Qt.SmoothTransformation)
             self.pixmap = QPixmap.fromImage(self.image)
             self.overlay_label = QLabel(self)
             self.overlay_label.setPixmap(self.pixmap)
@@ -419,18 +417,10 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.settings_btn = QtWidgets.QToolButton()
         self.settings_btn.setIconSize(QSize(21, 21))
         self.settings_btn.setStyleSheet("background: transparent;")
-
         if darkdetect.isDark():
-            settings_white_pixmap = QPixmap()
-            settings_white = base64.b64decode(settings_white_base64)
-            settings_white_pixmap.loadFromData(settings_white)
-            self.settings_btn.setIcon(QIcon(settings_white_pixmap))
+            self.settings_btn.setIcon(QIcon(get_asset_path("settings_white.png")))
         else:
-            settings_black_pixmap = QPixmap()
-            settings_black = base64.b64decode(settings_black_base64)
-            settings_black_pixmap.loadFromData(settings_black)
-            self.settings_btn.setIcon(QIcon(settings_black_pixmap))
-
+            self.settings_btn.setIcon(QIcon(get_asset_path("settings_black.png")))
         self.settings_btn.setToolTip("Settings")
         self.settings_btn.setCursor(Qt.CursorShape.PointingHandCursor)
         self.settings_btn.clicked.connect(lambda: settings_dialog(self))
@@ -485,11 +475,10 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
             MainWindow._instance.log_signal.emit(text)
     
     def _on_log_signal(self, text):
-        if hasattr(self, 'consoleLog'):
-            self.consoleLog.append(text)
-            self.consoleLog.verticalScrollBar().setValue(
-                self.consoleLog.verticalScrollBar().maximum()
-            )
+        self.consoleLog.append(text)
+        self.consoleLog.verticalScrollBar().setValue(
+            self.consoleLog.verticalScrollBar().maximum()
+        )
 
     def update_image_overlay(self, new_image_path):
         self.image = QImage(new_image_path)
@@ -515,20 +504,12 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
     def set_tracker(self, _):
         state.tracker = self.tracker_list.currentText()
 
-        while self.horizontal_layout.count():
-            item = self.horizontal_layout.takeAt(0)
-            if item.widget():
-                item.widget().setParent(None)
-
-        tracker_widget = state.tracker_list[state.tracker]
-        self.horizontal_layout.addWidget(tracker_widget)
-
     def show_empty_results(self, show: bool):
         if show:
-            state.tracker_list[state.tracker].hide()
+            self.qtablewidget.hide()
             self.emptyResults.show()
         else:
-            state.tracker_list[state.tracker].show()
+            self.qtablewidget.show()
             self.emptyResults.hide()
 
     def show_empty_downloads(self):
@@ -542,8 +523,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
     # thank you claude
     def resizeEvent(self, event):
         super().resizeEvent(event)
-        table_width = state.tracker_list[state.tracker].viewport().width()
-        state.tracker_list[state.tracker].setColumnWidth(1, int(table_width * 0.3))
+        table_width = self.qtablewidget.viewport().width()
+        self.qtablewidget.setColumnWidth(1, int(table_width * 0.3))
 
     def contextMenuEvent(self, event: QContextMenuEvent):
         if self.downloadList.underMouse():

core/interface/utils/searchhelper.py

@@ -1,5 +1,5 @@
 from PySide6.QtWidgets import QTableWidgetItem
-from core.utils.logging.logs import consoleLog
+from core.utils.general.logs import consoleLog
 from core.data.scrapers.uztracker import scrape_uztracker
 from core.data.scrapers.rutracker import scrape_rutracker
 from core.data.scrapers.monkrus import scrape_monkrus_telegram
@@ -17,22 +17,22 @@ def return_pressed(self):
         response = scrape_uztracker(search_text)
         if response:
             state.post_titles, state.post_urls = response
-            state.tracker_list[state.tracker].clear()
+            self.qtablewidget.clear()
             if state.post_titles and len(state.post_titles) > 0:
-                state.tracker_list[state.tracker].setHorizontalHeaderLabels(["Post Title", "Author"])
-                state.tracker_list[state.tracker].setRowCount(len(state.post_titles))
+                self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
+                self.qtablewidget.setRowCount(len(state.post_titles))
                 for i, author in enumerate(state.post_author):
-                    state.tracker_list[state.tracker].setItem(i, 1, QTableWidgetItem(author))
+                    self.qtablewidget.setItem(i, 1, QTableWidgetItem(author))
                 for i, title in enumerate(state.post_titles):
-                    state.tracker_list[state.tracker].setItem(i, 0, QTableWidgetItem(title))
+                    self.qtablewidget.setItem(i, 0, QTableWidgetItem(title))
                 self.show_empty_results(False)
             else:
                 consoleLog(f"No Results for {search_text}")
-                state.tracker_list[state.tracker].clear()
+                self.qtablewidget.clear()
                 self.show_empty_results(True)
         else:
             consoleLog(f"No response from uztracker")
-            state.tracker_list[state.tracker].clear()
+            self.qtablewidget.clear()
             self.show_empty_results(True)
     
     elif state.tracker == "rutracker":
@@ -41,27 +41,27 @@ def return_pressed(self):
             _, state.posts, _, _, cached = split_data(response)
             if state.posts == []:
                 consoleLog(f"No Results for {search_text}")
-                state.tracker_list[state.tracker].clear()
+                self.qtablewidget.clear()
                 self.show_empty_results(True)
             else:
                 state.post_titles, _, state.post_author, state.post_seeders, state.post_leechers = format_data(state.posts)
                 self.show_empty_results(False)
-                state.tracker_list[state.tracker].clear()
-                state.tracker_list[state.tracker].setHorizontalHeaderLabels(["Post Title", "Author", "Seeders", "Leechers"])
-                state.tracker_list[state.tracker].setRowCount(len(state.post_titles))
+                self.qtablewidget.clear()
+                self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author", "Seeders", "Leechers"])
+                self.qtablewidget.setRowCount(len(state.post_titles))
                 for i, author in enumerate(state.post_author):
-                    state.tracker_list[state.tracker].setItem(i, 1, QTableWidgetItem(author))
+                    self.qtablewidget.setItem(i, 1, QTableWidgetItem(author))
                 for i, title in enumerate(state.post_titles):
-                    state.tracker_list[state.tracker].setItem(i, 0, QTableWidgetItem(title))
+                    self.qtablewidget.setItem(i, 0, QTableWidgetItem(title))
                 for i, seeders in enumerate(state.post_seeders):
-                    state.tracker_list[state.tracker].setItem(i, 2, QTableWidgetItem(seeders))
+                    self.qtablewidget.setItem(i, 2, QTableWidgetItem(seeders))
                 for i, leechers in enumerate(state.post_leechers):
-                    state.tracker_list[state.tracker].setItem(i, 3, QTableWidgetItem(leechers))
+                    self.qtablewidget.setItem(i, 3, QTableWidgetItem(leechers))
                 if state.debug == True:
                     consoleLog(f"Response Cached: {cached}")
         else:
             consoleLog(f"No response from rutracker")
-            state.tracker_list[state.tracker].clear()
+            self.qtablewidget.clear()
             self.show_empty_results(True)
 
     elif state.tracker == "m0nkrus":
@@ -69,15 +69,15 @@ def return_pressed(self):
 
         if state.posts == []:
             consoleLog(f"No Results for {search_text}")
-            state.tracker_list[state.tracker].clear()
+            self.qtablewidget.clear()
             self.show_empty_results(True)
         else:
             state.post_titles, _, state.post_author = format_data_m0nkrus(state.posts)
             self.show_empty_results(False)
-            state.tracker_list[state.tracker].clear()
-            state.tracker_list[state.tracker].setHorizontalHeaderLabels(["Post Title", "Author"])
-            state.tracker_list[state.tracker].setRowCount(len(state.post_titles))
+            self.qtablewidget.clear()
+            self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
+            self.qtablewidget.setRowCount(len(state.post_titles))
             for i, author in enumerate(state.post_author):
-                state.tracker_list[state.tracker].setItem(i, 1, QTableWidgetItem(author))
+                self.qtablewidget.setItem(i, 1, QTableWidgetItem(author))
             for i, title in enumerate(state.post_titles):
-                state.tracker_list[state.tracker].setItem(i, 0, QTableWidgetItem(title))
+                self.qtablewidget.setItem(i, 0, QTableWidgetItem(title))

core/network/interface.py

@@ -1,4 +1,4 @@
-from core.utils.logging.logs import consoleLog
+from core.utils.general.logs import consoleLog
 from core.utils.data.state import state
 import psutil
 

core/network/libtorrent_int.py

@@ -4,7 +4,7 @@ from core.network.interface import get_interface_ip
 import threading
 import libtorrent as lt
 from core.utils.data.state import state
-from core.utils.logging.logs import consoleLog
+from core.utils.general.logs import consoleLog
 
 
 global loop_running

core/network/libtorrent_misc.py

@@ -1,6 +1,6 @@
 from core.utils.data.state import state
-from core.utils.logging.logs import update_download_completed_by_hash
-from core.utils.logging.logs import consoleLog
+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
@@ -57,4 +57,4 @@ def update_log(shutdown_event):
                     updated.add(magnet_uri)
         except Exception:
             pass
-        time.sleep(5)
+        time.sleep(5)

core/network/libtorrent_wrapper.py

@@ -1,4 +1,4 @@
-from core.utils.logging.logs import consoleLog
+from core.utils.general.logs import consoleLog
 from core.network.libtorrent_int import add_download
 
 def add_magnet(uri):

core/utils/config/settings.py

@@ -1,6 +1,6 @@
 from core.network.libtorrent_int import update_settings
 from core.utils.data.state import state
-from core.utils.logging.logs import consoleLog
+from core.utils.general.logs import consoleLog
 from .config import create_config
 
 

core/utils/data/models.py

@@ -7,7 +7,6 @@ class Download:
     title: str
     url: str
     magnet_uri: str
-    path: str
     completed: bool
 
 @dataclass

core/utils/data/state.py

@@ -1,5 +1,4 @@
 from PySide6.QtCore import QObject, Signal
-from PySide6.QtWidgets import QTableWidget
 from typing import Optional, Any, List, Dict
 from pathlib import Path
 
@@ -9,8 +8,8 @@ class AppState(QObject):
     def __init__(self):
         super().__init__()
         self.posts: List[Dict[str, Any]] = []
-        self.post_titles: Optional[List] = None
-        self.post_urls: Optional[List] = None
+        self.post_titles: List[str] = []
+        self.post_urls: List[str] = []
         self.post_author: List[str] = []
         self.post_seeders: List[str] = []
         self.post_leechers: List[str] = []
@@ -20,7 +19,6 @@ class AppState(QObject):
         self.debug: bool = False
         self.autoresume: bool = True
         self.tracker: str = "rutracker"
-        self.tracker_list: dict[str, QTableWidget] = {}
         self.api_url: str = "https://api.michijackson.xyz"
         self.download_path: str = str(Path.home() / "Downloads")
         self.up_speed_limit: int = 0
@@ -29,11 +27,11 @@ class AppState(QObject):
         self.max_downloads: int = 10
         self.settings_path: str = "" 
         self.dl_session: Any = None
-        self.active_downloads: Dict = {}
+        self.active_downloads: List[str] = {}
         self.window_transparency: bool = False
         self.interfaces: List = []
         self.active_interfaces: List = []
-        self.bound_interface: Any = None
+        self.bound_interface: str = None
 
     @property
     def image_path(self) -> str:

core/utils/data/tracker.py

@@ -1,7 +1,7 @@
 import requests
 from bs4 import BeautifulSoup
 from core.utils.data.state import state
-from core.utils.logging.logs import consoleLog
+from core.utils.general.logs import consoleLog
 from core.utils.network.jsonhandler import format_data
 
 

core/utils/general/loghandler.py

@@ -1,8 +1,6 @@
-from core.utils.logging.logs import consoleLog, remove_download_log
+from core.utils.general.logs import consoleLog
 from core.utils.network.download import run_download_direct
 
-import os
-
 def split_data(data):
 
     count = data.count
@@ -18,11 +16,6 @@ def check_completed(downloads, resume):
                 run_download_direct(download.magnet_uri)
                 consoleLog(f"Resuming {download.title}")
 
-def check_downloads(downloads):
-    for download in downloads:
-        if os.path.exists(download.path):
-            consoleLog(f"Existing Download: {download.title}")
-        else:
-            consoleLog(f"Inexistent Download: {download.title}")
-            remove_download_log(download.magnet_uri)
-            
+            
+
+

core/utils/general/logs.py

@@ -5,7 +5,6 @@ from datetime import datetime
 import json
 import os
 import re
-import time
 
 _log_buffer = []
 
@@ -22,21 +21,7 @@ def add_download_log(title, url, magnet_uri, completed) -> DownloadList:
             downloads = []
     else:
         downloads = []
-
-    magnetdl = state.active_downloads.get(magnet_uri)
-    if magnetdl:
-        status = magnetdl.status()
-        timeout = 60
-        start = time.time()
-        while not status.has_metadata and (time.time() - start) < timeout:
-            time.sleep(0.5)
-            status = magnetdl.status()
-        torrent_name = status.name
-        save_path = status.save_path
-        consoleLog(f"Torrent name (has_metadata={status.has_metadata}): {torrent_name}")
-        path = os.path.join(save_path, torrent_name)
-    else:
-        path = os.path.join(state.download_path, title)
+    
 
     if any(d.magnet_uri == magnet_uri or d.url == url for d in downloads):
         if magnet_uri in state.active_downloads:
@@ -52,8 +37,7 @@ def add_download_log(title, url, magnet_uri, completed) -> DownloadList:
         title=title,
         url=url,
         magnet_uri=magnet_uri,
-        path=path,
-        completed=completed
+        completed=completed,
     ))
 
     consoleLog(f"Added {title} to Log File")
@@ -77,12 +61,10 @@ def remove_download_log(magnet_uri) -> DownloadList:
     else:
         downloads = []
 
-
     magnet_link = (magnet_uri or "").strip()
-    title = next((getattr(d, 'title', 'Unknown') for d in downloads if (getattr(d, 'magnet_uri', None) or '').strip() == magnet_link or (getattr(d, 'url', None) or '').strip() == magnet_link))
     downloads = [d for d in downloads if (getattr(d, 'magnet_uri', None) or "").strip() != magnet_link and (getattr(d, 'url', None) or "").strip() != magnet_link]
 
-    consoleLog(f"Removed {title} from Log File")
+    consoleLog(f"Removed {magnet_link} from Log File")
 
     download_list = DownloadList(data=downloads, count=len(downloads))
     with open(downloads_file, "w") as file:

core/utils/network/download.py

@@ -1,11 +1,10 @@
 from core.utils.data.state import state
-from core.utils.logging.logs import consoleLog
+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.libtorrent_wrapper import add_download
 from core.utils.general.wrappers import run_thread
-from core.utils.logging.logs import add_download_log
-import time
+from core.utils.general.logs import add_download_log
 
 import threading
 
@@ -22,8 +21,8 @@ def run_download(item, posts, post_titles):
     consoleLog(f"Selected URL: {post_url}")
     magnet_uri = get_magnet_link(post_url)
 
-    add_download(magnet_uri)
     add_download_log(item, post_url, magnet_uri, False)
+    add_download(magnet_uri)
 
 def run_download_direct(magnet_uri):
     add_download(magnet_uri)    

core/utils/network/jsonhandler.py

@@ -32,4 +32,4 @@ def format_data_m0nkrus(data):
 
 
 
-# https://open.spotify.com/track/0F0fMcIdL2FmcC9eYqwazX
+# https://open.spotify.com/track/70vjXI7oBou5buTtgiJeRW?si=25640cc4243c4bf3

core/utils/network/update_checker.py

@@ -1,6 +1,6 @@
 import requests
 from core.utils.data.state import state
-from core.utils.logging.logs import consoleLog
+from core.utils.general.logs import consoleLog
 
 def check_for_updates():
     url = f"https://api.github.com/repos/KeksPirates/SoftwareManager/releases"

main.py

@@ -1,12 +1,13 @@
-from core.interface.gui import MainWindow, windowCloseHelper
+from core.interface.gui import MainWindow
 from core.utils.data.state import state
-from core.utils.logging.logs import consoleLog
+from core.utils.general.logs import consoleLog
 from core.network.libtorrent_misc import send_notification, update_log
-from core.utils.logging.logs import get_download_logs
+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
-from core.utils.logging.loghandler import split_data, check_completed, check_downloads
+from core.utils.general.loghandler import split_data, check_completed
 from core.network.interface import list_interfaces, init_interfaces
+from core.network.libtorrent_int import update_bound_interface
 from core.utils.config.config import read_config
 from PySide6 import QtWidgets
 from PySide6.QtCore import Qt
@@ -14,9 +15,15 @@ import qdarktheme
 import threading
 import platform
 import signal
+import argparse
 import sys
 import time
 
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--debug", action="store_true")
+args = parser.parse_args()
+
 def run_gui():
     app = QtWidgets.QApplication.instance() or QtWidgets.QApplication(sys.argv)
     qdarktheme.setup_theme("auto")
@@ -26,20 +33,21 @@ def run_gui():
         widget.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
         qdarktheme.setup_theme("auto", custom_colors={"background": "#00000000"})
 
-    from core.utils.logging.logs import set_main_window
+    from core.utils.general.logs import set_main_window
     set_main_window(widget)
     widget.show()
     sys.exit(app.exec())
 
 def keyboardinterrupthandler(signum, frame):
     closehelper()
-    windowCloseHelper()
 
-def main():
+if __name__ == "__main__":
     start_time = time.perf_counter()
     read_config()
     logs = get_download_logs()
     _, downloads = split_data(logs)
+    if args.debug:
+        state.debug = args.debug # override of read_config
     signal.signal(signal.SIGINT, keyboardinterrupthandler)
     consoleLog("Starting SoftwareManager...")
     consoleLog("Fetching Network Interfaces...")
@@ -53,10 +61,7 @@ def main():
     consoleLog("Started Thread: update_log")
     run_thread(threading.Thread(target=check_completed, args=(downloads, state.autoresume)))
     consoleLog("Started Thread: check_completed")
-    check_downloads(downloads)
     elapsed = time.perf_counter() - start_time
     consoleLog(f"Initialization completed in {elapsed:.2f}s. Launching GUI")
     run_gui()
 
-if __name__ == "__main__":
-    main()

requirements.txt

@@ -1,5 +1,5 @@
 requests==2.32.2
-PySide6-Essentials==6.10.1
+PySide6==6.10.1
 beautifulsoup4==4.13.5
 darkdetect==0.7.1
 pyinstaller==6.15.0