daily commit

# This is the 1st commit message:

fix: update Python version to 3.12 and switch from PyInstaller to Nuitka for building executables

# This is the commit message #2:

fix: correct UPX path for Windows installation in CI workflow

# This is the commit message #3:

fix: update UPX installation path handling for Windows and Linux in CI workflow

# This is the commit message #4:

fix: enhance UPX installation by setting UPX_BINARY environment variable for better compatibility

# This is the commit message #5:

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

# This is the commit message #6:

fix: update asset path handling in MainWindow for improved compatibility with frozen applications

# This is the commit message #7:

fix: update Nuitka build options and refine PySide6 dependency for improved compatibility

# This is the commit message #8:

fix: add Windows icon conversion step and update Nuitka build options for improved compatibility

# This is the commit message #9:

fix: refactor Nuitka and UPX installation steps for improved clarity and compatibility

.github/workflows/dev.yml

@@ -15,7 +15,7 @@ permissions:
   contents: write
 
 env:
-  PYTHON_VERSION: "3.11"
+  PYTHON_VERSION: "3.12"
   APP_NAME: "SoftwareManager"
 
 jobs:
@@ -57,7 +57,13 @@ jobs:
       - name: Install Python dependencies
         run: |
           uv pip install -r requirements.txt
-          uv pip install pyinstaller backports.tarfile pillow
+          uv pip install Pillow
+        env:
+          UV_SYSTEM_PYTHON: 1
+
+      - name: Install Nuitka (Windows only)
+        if: runner.os == 'Windows'
+        run: uv pip install nuitka
         env:
           UV_SYSTEM_PYTHON: 1
 
@@ -82,36 +88,58 @@ jobs:
           }
           EOF
 
-      - name: Build executable with PyInstaller (Windows)
+      - name: Install UPX (Windows)
         if: runner.os == 'Windows'
         shell: bash
         run: |
-          pyinstaller --onefile --windowed \
+          curl -sL https://github.com/upx/upx/releases/download/v5.1.0/upx-5.1.0-win64.zip -o upx.zip
-            --add-data "build_info.json;." \
+          7z x upx.zip -oupx-dir
-            --add-data "build_info.json;core" \
+          UPX_DIR="$(pwd)/upx-dir/upx-5.1.0-win64"
-            --add-data "build_info.json;core/interface" \
+          echo "$UPX_DIR" >> $GITHUB_PATH
-            --add-data "core/interface/assets;core/interface/assets" \
+          export PATH="$UPX_DIR:$PATH"
-            --icon "core/interface/assets/logo.png" \
+          echo "UPX_BINARY=$UPX_DIR/upx.exe" >> $GITHUB_ENV
-            --exclude-module PyQt6 \
+          upx --version | head -1
-            --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 }} \
-            main.py
 
-      - name: Build executable with PyInstaller (Unix)
+      - name: Convert icon for Windows
-        if: runner.os != '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
+        run: |
+          python -m nuitka \
+            --onefile \
+            --onefile-no-compression \
+            --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-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 \
+            --output-filename=${{ env.APP_NAME }}.exe \
+            src/main.py
+
+      - name: Build with PyInstaller (Linux)
+        if: runner.os == 'Linux'
         shell: bash
         run: |
           pyinstaller --onefile --windowed \
             --add-data "build_info.json:." \
-            --add-data "build_info.json:core" \
+            --add-data "build_info.json:src/core" \
-            --add-data "build_info.json:core/interface" \
+            --add-data "build_info.json:src/core/interface" \
-            --add-data "core/interface/assets:core/interface/assets" \
-            --icon "core/interface/assets/logo.png" \
             --exclude-module PyQt6 \
             --exclude-module PyQt5 \
             --hidden-import=backports.tarfile \
@@ -120,24 +148,43 @@ jobs:
             --hidden-import=jaraco.text \
             --hidden-import=jaraco.functools \
             --name ${{ env.APP_NAME }} \
-            main.py
+            src/main.py
 
-      - name: Make executable (Unix)
+      - name: Build with PyInstaller (macOS)
-        if: runner.os != 'Windows'
+        if: runner.os == 'macOS'
-        run: chmod +x dist/${{ env.APP_NAME }}
+        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: |
-          cd dist
+          mkdir -p dist-final
-          mv ${{ env.APP_NAME }}${{ runner.os == 'Windows' && '.exe' || '' }} ${{ matrix.artifact_name }}
+          if [ "$RUNNER_OS" == "Windows" ]; then
-          ls -la
+            mv ${{ env.APP_NAME }}.exe dist-final/${{ matrix.artifact_name }}
+          else
+            chmod +x dist/${{ env.APP_NAME }}
+            mv dist/${{ env.APP_NAME }} dist-final/${{ matrix.artifact_name }}
+          fi
+          ls -la dist-final/
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-build
-          path: dist/${{ matrix.artifact_name }}
+          path: dist-final/${{ matrix.artifact_name }}
           retention-days: 1
 
   release:
@@ -162,9 +209,16 @@ 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
           
@@ -177,6 +231,11 @@ 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
 
@@ -190,5 +249,6 @@ 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

@@ -1,11 +1,11 @@
-# SoftwareManager - A Download Manager/Launcher
+# SoftwareManager
-SoftwareManager is a Python-based GUI/TUI tool that simplifies downloading and managing free software from various sources.
+SoftwareManager is a Python-based GUI tool that simplifies searching and downloading software from various sources, including Rutracker, Uztracker and the official M0nkrus Telegram channel.
 
 ## Features
-- VPN Binding (impl. soon)
+- Searching & Downloading Software from various pages
-- Bandwidth/Download speed limiting
+- Network Interface Binding
-- Start downloads via a predefined magnet URI.
+- Simple UI, Speed Limiting etc.
-- View detailed download information (name, speed, and status).
+- No Logins required
 
 ## Installation
 1. Download the binary file for your operating system from releases 
@@ -14,18 +14,40 @@ SoftwareManager is a Python-based GUI/TUI tool that simplifies downloading and m
 
 ## Manual Installation
 1. Ensure Python 3.x is installed on your system.
+2. Clone the Repository:
+   ```bash
+   git clone https://github.com/KeksPirates/SoftwareManager.git && cd SoftwareManager
+   ```
 2. Install Dependencies:
    ```bash
    pip install -r requirements.txt
    ```
 3. Run main.py:
    ```bash
-   python3 main.py
+   python main.py
    ```
 
-## Notes
+## Additional Information
-- 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 its branch.
+- 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.
-- This tool is for educational purposes only. Use it responsibly.
+- 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.
+
+## Python Dependencies
+(also included in requirements.txt)
+
+   ```bash
+   requests (2.32.2)
+   PySide6 (6.10.1)
+   beautifulsoup (44.13.5)
+   darkdetect (0.7.1)
+   pyinstaller (6.15.0)
+   PyQtDarkTheme-fork (2.3.4)
+   aiohttp (3.13.0)
+   plyer (2.1.0)
+   psutil (7.1.0)
+   libtorrent (2.0.11)
+   libtorrent-windows-dll (0.0.3)
+   ```
 
 ## Activity
 
@@ -41,6 +63,11 @@ SoftwareManager is a Python-based GUI/TUI tool that simplifies downloading and m
  </picture>
 </a>
 
+## Contributors
+<a href="https://github.com/KeksPirates/SoftwareManager/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=KeksPirates/SoftwareManager" />
+</a>
+
 ---
 
 **Disclaimer:** SoftwareManager is intended for legal and ethical use only. Ensure compliance with applicable laws and regulations when using this tool.

requirements.txt

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

src/core/data/scrapers/uztracker.py

@@ -1,14 +1,16 @@
 import requests
 import asyncio
+import threading
 from bs4 import BeautifulSoup
 from core.utils.data.state import state
 from core.utils.general.logs import consoleLog
+from core.utils.general.wrappers import run_thread
 
 
 global url_uztracker
 url_uztracker = "https://uztracker.net/tracker.php?nm="
 
-async def init_uztracker():
+def init_uztracker():
     global up
     global soup
     try:
@@ -19,12 +21,12 @@ async def init_uztracker():
             up = False
             consoleLog(f"Uztracker seems down, status code: {response.status_code}")
     except requests.exceptions.RequestException as e:
-        consoleLog(f"\nRequest Exception on {url_uztracker}:")
+        consoleLog(f"Request Exception on {url_uztracker}:")
         consoleLog(str(e))
-        consoleLog("\nIs the Site down?")
+        consoleLog("Is the Site down?")
         up = False
 
-asyncio.run(init_uztracker())
+run_thread(threading.Thread(target=init_uztracker))
 
 def scrape_uztracker(search):
     if up:

src/core/interface/dialogs/settings.py

@@ -4,7 +4,8 @@ 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 import QtWidgets, Qt
+from PySide6.QtCore import Qt
 from PySide6.QtWidgets import (
     QLineEdit, 
     QPushButton, 
@@ -31,6 +32,9 @@ def settings_dialog(self):
 
         dialog.setLayout(QVBoxLayout())
 
+        if state.window_transparency and platform.system() != "Windows":
+            dialog.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
+
         def close_settings():
             dialog.reject()
 

src/core/interface/gui.py

@@ -1,4 +1,4 @@
-from PySide6 import QtWidgets
+from PySide6 import QtWidgets, QtCore, QtGui
 from PySide6.QtCore import Qt, QTimer, QModelIndex, QAbstractTableModel, Signal, QEvent, QSize
 from PySide6.QtWidgets import (
     QLineEdit,
@@ -29,6 +29,7 @@ import libtorrent as lt
 import time
 import sys
 import json
+import base64
 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
@@ -37,6 +38,9 @@ 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
 
@@ -72,20 +76,10 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         MainWindow._instance = self
         self.log_signal.connect(self._on_log_signal)
 
-        def get_asset_path(filename):
+        pixmap = QPixmap()
-            if getattr(sys, 'frozen', False):
+        image_data = base64.b64decode(logo_base64)
-                base_path = sys._MEIPASS 
+        pixmap.loadFromData(image_data)
-            else:
+        self.setWindowIcon(QIcon(pixmap))
-                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:
@@ -102,23 +96,22 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                 state.version = build_info.get("version")
 
         # Check for updates on Windows
-        if state.ignore_updates is False:
+        if state.ignore_updates is False and platform.system() == "Windows":
-            if platform.system() == "Windows":
+            result = check_for_updates()
-                result = check_for_updates()
+            if result != (None, None):
-                if result != (None, None):
+                assets, latest_version = result
-                    assets, latest_version = result
 
-                    if assets:
+                if assets:
-                        msg = QMessageBox()
+                    msg = QMessageBox()
-                        msg.setIcon(QMessageBox.Icon.Information)
+                    msg.setIcon(QMessageBox.Icon.Information)
-                        msg.setWindowTitle("Update Available")
+                    msg.setWindowTitle("Update Available")
-                        msg.setText("A new version is available.")
+                    msg.setText("A new version is available.")
-                        msg.setInformativeText("Press Ok to download the update.")
+                    msg.setInformativeText("Press Ok to download the update.")
-                        msg.setStandardButtons(QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Ignore)
+                    msg.setStandardButtons(QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Ignore)
 
-                        response = msg.exec_()
+                    response = msg.exec_()
-                        if response == QMessageBox.StandardButton.Ok:
+                    if response == QMessageBox.StandardButton.Ok:
-                            download_update(latest_version)
+                        download_update(latest_version)
 
         self.setWindowTitle("Software Manager")
         self.setGeometry(100, 100, 800, 600)
@@ -285,10 +278,13 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                             subprocess.Popen(["open", save_path])
                     return
                 
-                if status.paused:
+                is_paused = bool(magnetdl.flags() & lt.torrent_flags.paused)
+                if is_paused:
+                    magnetdl.set_flags(lt.torrent_flags.auto_managed)
                     magnetdl.resume()
                     consoleLog(f"Resumed download: {status.name}", True)
                 else:
+                    magnetdl.unset_flags(lt.torrent_flags.auto_managed)
                     magnetdl.pause()
                     consoleLog(f"Paused download: {status.name}", True)
                 
@@ -383,16 +379,17 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
         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.SmoothTransformation)
             self.pixmap = QPixmap.fromImage(self.image)
             self.overlay_label = QLabel(self)
             self.overlay_label.setPixmap(self.pixmap)
             self.overlay_label.adjustSize()
             self.overlay_label.raise_()
 
-            offset_x = -1350
+            # offset_x = -1350
-            offset_y = -550
+            # offset_y = -550
-            x = self.width() - self.overlay_label.width() - offset_x
+            x = self.width() - self.overlay_label.width() # - offset_x
-            y = self.height() - self.overlay_label.height() - offset_y
+            y = self.height() - self.overlay_label.height() # - offset_y
             self.overlay_label.move(x, y)
         
         # temporarily disabled
@@ -413,10 +410,18 @@ 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():
-            self.settings_btn.setIcon(QIcon(get_asset_path("settings_white.png")))
+            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))
         else:
-            self.settings_btn.setIcon(QIcon(get_asset_path("settings_black.png")))
+            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.setToolTip("Settings")
         self.settings_btn.setCursor(Qt.CursorShape.PointingHandCursor)
         self.settings_btn.clicked.connect(lambda: settings_dialog(self))
@@ -471,10 +476,11 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
             MainWindow._instance.log_signal.emit(text)
     
     def _on_log_signal(self, text):
-        self.consoleLog.append(text)
+        if hasattr(self, 'consoleLog'):
-        self.consoleLog.verticalScrollBar().setValue(
+            self.consoleLog.append(text)
-            self.consoleLog.verticalScrollBar().maximum()
+            self.consoleLog.verticalScrollBar().setValue(
-        )
+                self.consoleLog.verticalScrollBar().maximum()
+            )
 
     def update_image_overlay(self, new_image_path):
         self.image = QImage(new_image_path)

src/core/interface/utils/searchhelper.py

@@ -3,7 +3,7 @@ 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
-from core.utils.network.jsonhandler import split_data, format_data
+from core.utils.network.jsonhandler import split_data, format_data, format_data_m0nkrus
 from core.utils.data.state import state
 
 def return_pressed(self):
@@ -72,7 +72,7 @@ def return_pressed(self):
             self.qtablewidget.clear()
             self.show_empty_results(True)
         else:
-            state.post_titles, _, state.post_author = format_data(state.posts)
+            state.post_titles, _, state.post_author = format_data_m0nkrus(state.posts)
             self.show_empty_results(False)
             self.qtablewidget.clear()
             self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])

src/core/network/libtorrent_int.py

@@ -36,7 +36,7 @@ def init_session():
             settings["listen_interfaces"] = f"{interface_ip}:6881"
             consoleLog(f"Binding to Interface IP: {interface_ip}")
         else:
-            consoleLog(f"Error finding IP for Interface {state.bound_interface}")
+            consoleLog(f"Skipping Binding, no Interface set. ({state.bound_interface})")
 
     state.dl_session.apply_settings(settings)
 
@@ -51,7 +51,7 @@ def add_download(magnet_uri, dl_path=state.download_path):
     init_session()
 
     if magnet_uri in state.active_downloads:
-        consoleLog("Skipping, download already running...")
+        consoleLog("Skipping Downloading, download already running...")
         return
 
     magnetdl = lt.parse_magnet_uri(magnet_uri)
@@ -114,7 +114,7 @@ def update_settings():
             settings["listen_interfaces"] = f"{interface_ip}:6881"
             consoleLog(f"Binding to Interface IP: {interface_ip}")
         else:
-            consoleLog(f"Error finding IP for Interface {state.bound_interface}")
+            consoleLog(f"Skipping Binding, no Interface set. ({state.bound_interface})")
 
     state.dl_session.apply_settings(settings)
 

src/core/utils/config/config.py

@@ -8,16 +8,23 @@ def create_config():
 
     config["General"] = {
         "debug": True,
+        "ignore_updates": f"{state.ignore_updates}",
+        "autoresume": f"{state.autoresume}",        
+        "window_transparency": f"{state.window_transparency}"
+    }
+
+    config["Network"] = {
         "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}", 
+        "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}",
+        "max_downloads": f"{state.max_downloads}"
-        "window_transparency": f"{state.window_transparency}",
+    }
+
+    config["Paths"] = {
+        "bound_interface": f"{state.bound_interface}",
+        "image_path": f"{state.image_path}"
     }
 
     if platform.system() == "Windows":
@@ -48,17 +55,23 @@ def read_config():
         return
 
     config.read(config_file)
-
+    
+    # General
     state.debug = config.getboolean("General", "debug", fallback=state.debug)
-    state.api_url = config.get("General", "api_url", fallback=state.api_url)
-    state.download_path = config.get("General", "download_path", fallback=state.download_path)
-    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)
     state.window_transparency = config.getboolean("General", "window_transparency", fallback=state.window_transparency)
 
+    # Network
+    state.api_url = config.get("Network", "api_url", fallback=state.api_url)
+    state.download_path = config.get("Network", "download_path", fallback=state.download_path)
+    state.down_speed_limit = config.getint("Network", "download_speed_limit", fallback=state.down_speed_limit)
+    state.up_speed_limit = config.getint("Network", "upload_speed_limit", fallback=state.up_speed_limit)
+    state.max_connections = config.getint("Network", "max_connections", fallback=state.max_connections)
+    state.max_downloads = config.getint("Network", "max_downloads", fallback=state.max_downloads)
+
+    # Paths
+    state.bound_interface = config.get("Paths", "bound_interface", fallback=state.bound_interface)
+    state.image_path = config.get("Paths", "image_path", fallback=state.image_path)
+    
     create_config()

src/core/utils/data/tracker.py

@@ -15,12 +15,12 @@ def get_item_url(item, posts, post_titles): # softwarelist currentitem, post lis
                 return item
             if state.tracker == "rutracker":                
                 item_dict = posts[post_index]
-                _, post_links, _ = format_data([item_dict])
+                _, post_links, _, _, _ = format_data([item_dict])
                 consoleLog(f"Found post URL: {post_links[0]}")
                 return post_links[0]
             if state.tracker == "m0nkrus":                
                 item_dict = posts[post_index]
-                _, post_links, _ = format_data([item_dict])
+                _, post_links, _, _, _,= format_data([item_dict])
                 consoleLog(f"Found post URL: {post_links[0]}")
                 return post_links[0]
 

src/core/utils/general/logs.py

@@ -24,7 +24,12 @@ def add_download_log(title, url, magnet_uri, completed) -> DownloadList:
     
 
     if any(d.magnet_uri == magnet_uri or d.url == url for d in downloads):
-        consoleLog("Skipped Logging, download already in file")
+        if magnet_uri in state.active_downloads:
+            consoleLog("Skipping Logging, download already running...")
+            return
+        consoleLog("File already in Log, updating Download State...")
+        hash = extract_hash_from_magnet(magnet_uri)
+        update_download_completed_by_hash(hash, False)
         return DownloadList(data=downloads, count=len(downloads)) # thanks again claude (im stupid)
         
     

src/core/utils/network/jsonhandler.py

@@ -11,7 +11,7 @@ def split_data(data):
 
     return count, posts, query, success, cached
 
-def format_data(data):
+def format_data(data): 
     post_author = [post["author"] for post in data]
     post_titles = [post["title"] for post in data]
     post_links = [post["url"] for post in data]
@@ -20,6 +20,16 @@ def format_data(data):
 
     return post_titles, post_links, post_author, post_seeders, post_leechers
 
+def format_data_m0nkrus(data): 
+    post_author = [post["author"] for post in data]
+    post_titles = [post["title"] for post in data]
+    post_links = [post["url"] for post in data]
+
+    return post_titles, post_links, post_author
+
+
+
+
 
 
 # https://open.spotify.com/track/70vjXI7oBou5buTtgiJeRW?si=25640cc4243c4bf3

src/main.py

@@ -17,6 +17,7 @@ import platform
 import signal
 import argparse
 import sys
+import time
 
 
 parser = argparse.ArgumentParser()
@@ -41,16 +42,17 @@ def keyboardinterrupthandler(signum, frame):
     closehelper()
 
 if __name__ == "__main__":
+    start_time = time.perf_counter()
     read_config()
     logs = get_download_logs()
-    count, downloads = split_data(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...")
     list_interfaces()
-    consoleLog("Initialiting Interface variables...")
+    consoleLog("Initializing Interface variables...")
     init_interfaces()
     consoleLog(f"Current Bound: {state.bound_interface}")
     run_thread(threading.Thread(target=send_notification, args=(shutdown_event,), daemon=True))
@@ -59,6 +61,7 @@ if __name__ == "__main__":
     consoleLog("Started Thread: update_log")
     run_thread(threading.Thread(target=check_completed, args=(downloads, state.autoresume)))
     consoleLog("Started Thread: check_completed")
-    consoleLog("Launching GUI")
+    elapsed = time.perf_counter() - start_time
+    consoleLog(f"Initialization completed in {elapsed:.2f}s. Launching GUI")
     run_gui()