feat: enhance GUI layout and styling for better usability

Fully replace Aria2 with LibTorrent

.github/workflows/dev.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
+          - os: ubuntu-22.04
             artifact_name: SoftwareManager-dev-${{ github.sha }}-linux
             asset_name: SoftwareManager-dev-${{ github.sha }}-linux
           - os: windows-latest
@@ -35,39 +35,92 @@ jobs:
             asset_name: SoftwareManager-dev-${{ github.sha }}-macos
 
     runs-on: ${{ matrix.os }}
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+      short_sha: ${{ steps.version.outputs.short_sha }}
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
-      - name: Install system dependencies (Linux)
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            libxcb-xinerama0 \
-            libxkbcommon-x11-0 \
-            libxcb-cursor0 \
-            libxcb-keysyms1 \
-            libxcb-render-util0 \
-            libxcb-icccm4 \
-            libxcb-image0 \
-            libxcb-shape0 \
-            libxcb-util1
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          version: "0.9.7"
+          enable-cache: true
 
       - name: Install Python dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install pyinstaller
+          uv pip install -r requirements.txt
+          uv pip install pyinstaller backports.tarfile pillow
+        env:
+          UV_SYSTEM_PYTHON: 1
 
-      - name: Build executable with PyInstaller
-        run: pyinstaller --onefile --windowed --name ${{ env.APP_NAME }} main.py
+      - name: Generate version
+        id: version
+        shell: bash
+        run: |
+          COMMIT_SHA=${{ github.sha }}
+          SHORT_SHA=${COMMIT_SHA:0:7}
+          VERSION="${SHORT_SHA}-dev"
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "short_sha=$SHORT_SHA" >> $GITHUB_OUTPUT
+          echo "Generated version: $VERSION"
+
+      - name: Inject commit hash into code
+        shell: bash
+        run: |
+          cat > build_info.json << EOF
+          {
+            "version": "${{ env.VERSION }}"
+          }
+          EOF
+
+      - name: Build executable with PyInstaller (Windows)
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          pyinstaller --onefile --windowed \
+            --add-data "build_info.json;." \
+            --add-data "build_info.json;core" \
+            --add-data "build_info.json;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 \
+            --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)
+        if: runner.os != 'Windows'
+        shell: bash
+        run: |
+          pyinstaller --onefile --windowed \
+            --add-data "build_info.json:." \
+            --add-data "build_info.json:core" \
+            --add-data "build_info.json: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 \
+            --hidden-import=backports \
+            --hidden-import=jaraco.context \
+            --hidden-import=jaraco.text \
+            --hidden-import=jaraco.functools \
+            --name ${{ env.APP_NAME }} \
+            main.py
 
       - name: Make executable (Unix)
         if: runner.os != 'Windows'
@@ -90,54 +143,52 @@ jobs:
   release:
     name: Create Release
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: success()
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           path: artifacts
 
-      - name: Display downloaded artifacts
-        run: |
-          echo "Downloaded artifacts:"
-          find artifacts -type f
-          ls -la artifacts/
-
-      - name: Generate version
-        id: version
-        run: |
-          COMMIT_SHA=${{ github.sha }}
-          SHORT_SHA=${COMMIT_SHA:0:7}
-          VERSION="${SHORT_SHA}-dev"
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
-          echo "Generated version: ${VERSION}"
-
       - name: Prepare release files
         run: |
           mkdir -p release
-          SHORT_SHA="${{ steps.version.outputs.short_sha }}"
-          cp artifacts/ubuntu-latest-build/SoftwareManager-dev-*-linux release/SoftwareManager-dev-${SHORT_SHA}-linux
+          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/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/
 
-      - name: Create Prerelease (Public)
+      - name: Generate release notes
+        run: |
+          SHORT_SHA="${{ needs.build.outputs.short_sha }}"
+          cat > release_notes.md << EOF
+          ## Development Build
+          
+          **Commit:** [\`${SHORT_SHA}\`](https://github.com/${{ github.repository }}/commit/${{ github.sha }})
+          
+          ### Changes
+          $(git log -1 --pretty=format:"- %s" ${{ github.sha }})
+          
+          ### Downloads
+          - Linux: \`SoftwareManager-dev-${SHORT_SHA}-linux\`
+          - Windows: \`SoftwareManager-dev-${SHORT_SHA}-windows.exe\`
+          - macOS: \`SoftwareManager-dev-${SHORT_SHA}-macos\`
+          EOF
+          cat release_notes.md
+
+      - name: Create Release (Public)
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ steps.version.outputs.version }}
-          name: ${{ steps.version.outputs.version }}
-          draft: false
-          prerelease: true
+          tag_name: ${{ needs.build.outputs.version }}
+          name: ${{ needs.build.outputs.version }}
+          body_path: release_notes.md
           files: |
-            release/SoftwareManager-dev-${{ steps.version.outputs.short_sha }}-linux
-            release/SoftwareManager-dev-${{ steps.version.outputs.short_sha }}-windows.exe
-            release/SoftwareManager-dev-${{ steps.version.outputs.short_sha }}-macos
+            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
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -214,3 +214,7 @@ __marimo__/
 *.sublime-project
 *.code-workspace
 *.swp
+
+# Local build files
+build-local.ps1
+build-local.bat

README.md

@@ -27,6 +27,17 @@ SoftwareManager is a Python-based GUI/TUI tool that simplifies downloading and m
 - 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.
 - This tool is for educational purposes only. Use it responsibly.
 
+
+## Star History
+
+<a href="https://www.star-history.com/#KeksPirates/SoftwareManager&type=date&legend=top-left">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=KeksPirates/SoftwareManager&type=date&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=KeksPirates/SoftwareManager&type=date&legend=top-left" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=KeksPirates/SoftwareManager&type=date&legend=top-left" />
+ </picture>
+</a>
+
 ---
 
 **Disclaimer:** SoftwareManager is intended for legal and ethical use only. Ensure compliance with applicable laws and regulations when using this tool.

build_info.json

@@ -0,0 +1,3 @@
+{
+  "Version": "dev"
+}

core/data/scrapers/monkrus.py

@@ -0,0 +1,42 @@
+from bs4 import BeautifulSoup
+import requests
+from core.utils.general.logs import consoleLog
+
+def scrape_monkrus_telegram(query):
+    post = 100
+    max_posts = 250
+    posts: list[dict] = []
+    added = set()
+    
+    while post <= max_posts:
+        url = f"https://t.me/s/real_monkrus/{post}"
+        response = requests.get(url)
+        soup = BeautifulSoup(response.text, "html.parser")
+        bubbles = soup.find_all("div", class_="tgme_widget_message_bubble")
+        
+        if not bubbles:
+            break
+        
+        for bubble in bubbles:
+            post_txt = bubble.find("div", class_="tgme_widget_message_text js-message_text")
+            if not post_txt or not post_txt.b:
+                continue
+            
+            title = post_txt.b.text
+            link = bubble.find("a", href=lambda x: x and x.startswith("https://uztracker.net"))
+            
+            if query.lower() in title.lower() and link:
+                post_url = link["href"]
+                if post_url not in added:
+                    added.add(post_url)
+                    posts.append(dict(
+                        author="m0nkrus",
+                        id=len(posts) + 1,
+                        title=title,
+                        url=post_url
+                    ))
+        
+        post += 22
+
+    posts.reverse()
+    return(posts)

core/data/scrapers/rutracker.py

@@ -1,15 +1,16 @@
 import requests
 from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
 
 
 def scrape_rutracker(search_text):
     search = requests.get(f"{state.api_url}/search/{search_text}")
+    consoleLog("Sent request to server")
     if search:
         try:
             return search.text
         except Exception:
-            if state.debug:
-                print("No results found / No response from server")
+            consoleLog("No results found / No response from server")
             return None
 
     else:

core/data/scrapers/uztracker.py

@@ -1,8 +1,8 @@
 import requests
 import asyncio
-import aiohttp
 from bs4 import BeautifulSoup
 from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
 
 
 global url_uztracker
@@ -17,62 +17,52 @@ async def init_uztracker():
             up = True
         else:
             up = False
-            print(f"Uztracker seems down, status code: {response.status_code}")
+            consoleLog(f"Uztracker seems down, status code: {response.status_code}")
     except requests.exceptions.RequestException as e:
-        print(f"\nRequest Exception on {url_uztracker}:")
-        print(e)
-        print("\nIs the Site down?")
+        consoleLog(f"\nRequest Exception on {url_uztracker}:")
+        consoleLog(str(e))
+        consoleLog("\nIs the Site down?")
         up = False
 
 asyncio.run(init_uztracker())
 
-async def scrape_uztracker(search, max_results=450):
+def scrape_uztracker(search):
     if up:
+        search_url = url_uztracker + search
+        consoleLog(search_url)
         result = False
         global results
         global resulttitles
-        results = [] 
+        results = []
         resulttitles = []
 
-        per_page = 50
+        try:
+            resultCount = 0
+            response = requests.get(search_url)
+            response.raise_for_status()
+            soup = BeautifulSoup(response.text, 'html.parser')
+            links = soup.find_all('a', class_="genmed tLink", href=lambda x: x and x.startswith('./viewtopic'))
+            for link in links:
+                if link.b:
+                    resultCount += 1
+                    results.append(link['href'])
+                    resulttitles.append(link.b.text)
+                    result = True
 
-        for start in range(0, max_results, per_page):
-            search_url = url_uztracker + search + f"&start={start}"
-            if state.debug:
-                print(search_url)
+            if result:
+                return resulttitles, results
 
-            async with aiohttp.ClientSession() as session:
-                try:
-                    async with session.get(search_url) as response:
-                        response.raise_for_status()
-                        text = await response.text()
-                        soup = BeautifulSoup(text, 'html.parser')
-                        links = soup.find_all('a', class_="genmed tLink", href=lambda x: x and x.startswith('./viewtopic'))
-                        resultCount = 0
-                        for link in links:
-                            if link.b:
-                                resultCount += 1
-                                results.append(link['href'])
-                                resulttitles.append(link.b.text)
-                                result = True
-                        
-                        if resultCount == 0:
-                            # add popup in gui for no result
-                            break
-                        
-                except aiohttp.ClientError as e:
-                    if result:
-                        print(f"Failed to fetch {search_url}: {e}")
-                    return None
+            if not result:
+                # add popup in gui for no result
+                return None
 
-        else:
-            print("Error: Uztracker down")
-            return None, None
-
-        if not results:
-            return None, None
-
-        return resulttitles, results
+        except requests.RequestException as e:
+            if result:
+                consoleLog(f"Failed to fetch {search_url}: {e}")
+            return None
+    else:
+        consoleLog("Error: Uztracker down")
+        return None, None
 
 def get_post_title(post_url):
     if up:
@@ -82,10 +72,9 @@ def get_post_title(post_url):
         if maintitle:
             return maintitle.text
         else:
-            if state.debug:
-                print("Program not found")
+            consoleLog("Program not found")
     else:
-        print("Error: Uztracker down")
+        consoleLog("Error: Uztracker down")
         return None   
 
     

core/interface/dialogs/settings.py

@@ -1,5 +1,6 @@
 from core.utils.config.settings import save_settings
 from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
 from PySide6 import QtWidgets
 from PySide6.QtWidgets import (
     QLineEdit, 
@@ -10,50 +11,54 @@ from PySide6.QtWidgets import (
     QLabel, 
     QHBoxLayout,
     QSpinBox,
-    )
-
-
-
+    QCheckBox,
+    QFileDialog,
+)
+import platform
 
 
 def settings_dialog(self):
 
-        if state.debug:
-            print("Settings dialog opened")
+        consoleLog("Settings dialog opened")
         dialog = QDialog(self)
         dialog.setWindowTitle("Settings")
-        dialog.setFixedSize(800, 400)
+        dialog.setFixedSize(800, 550)
 
         dialog.setLayout(QVBoxLayout())
         dialog.layout().addWidget(QLabel("Settings"))
 
         def close_settings():
             dialog.reject()
-        
-        ##################
-        # THREAD SETTING #
-        ##################
-        thread_box = QSpinBox()
-        thread_box.setMinimum(1)
-        thread_box.setMaximum(16)
-        thread_box.setValue(state.aria2_threads)
-        
 
-        # container for tight space
-        thread_container = QWidget()
-        thread_layout = QHBoxLayout()
+        update_checkbox_container = QWidget()
+        update_checkbox_layout = QHBoxLayout()
 
-        thread_layout.addWidget(QLabel("Threads:"))
-        thread_layout.addWidget(thread_box)
-        thread_container.setLayout(thread_layout)
-        thread_container.setMaximumHeight(80)
-        
+        # ignore updates checkbox
 
-        # Dimensions
-        thread_box.setFixedWidth(90)
-        thread_box.setFixedHeight(30)
+        if platform.system() == "Windows":
+            update_checkbox = QCheckBox()
+            update_checkbox_container.setLayout(update_checkbox_layout)
+            update_checkbox_layout.addWidget(QLabel("Ignore Updates: "))
+            update_checkbox_layout.addStretch()
+            update_checkbox.setChecked(state.ignore_updates)
+            update_checkbox.toggled.connect(lambda checked: setattr(state, 'ignore_updates', checked))
+            update_checkbox_layout.addWidget(update_checkbox)
+            dialog.layout().addWidget(update_checkbox_container)
 
-        dialog.layout().addWidget(thread_container)
+        # auto-resume downloads checkbox
+
+        autoresume_container = QWidget()
+        autoresume_layout = QHBoxLayout()
+
+        autoresume_checkbox = QCheckBox()
+        autoresume_container.setLayout(autoresume_layout)
+        autoresume_layout.addWidget(QLabel("Auto-Resume Downloads: "))
+
+        autoresume_layout.addStretch()
+        autoresume_checkbox.setChecked(state.autoresume)
+        autoresume_checkbox.toggled.connect(lambda checked: setattr(state, 'autoresume', checked))
+        autoresume_layout.addWidget(autoresume_checkbox)
+        dialog.layout().addWidget(autoresume_container)
 
         ##################
         # SERVER SETTING #
@@ -85,23 +90,106 @@ def settings_dialog(self):
         download_path.setText(state.download_path)
         dialog.layout().addWidget(download_path_container)
 
+        def browse_download_path():
+            dir_path = QFileDialog.getExistingDirectory(dialog, "Select Download Directory", state.download_path)
+            if dir_path:
+                download_path.setText(dir_path)
+
+        browse_button = QPushButton("📁")
+        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 #
         ##################
 
-        speed_limit_container = QWidget()
-        speed_limit_layout = QHBoxLayout()
+        down_speed_limit_container = QWidget()
+        down_speed_limit_layout = QHBoxLayout()
 
-        speed_limit_layout.addWidget(QLabel("Max Download Speed (KiB, 0 for unlimited): "))
-        speed_limit = QSpinBox()
-        speed_limit.setMinimum(0)
-        speed_limit.setMaximum(10000000)
-        speed_limit.setValue(state.speed_limit)
-        speed_limit_container.setLayout(speed_limit_layout)
-        speed_limit_layout.addWidget(speed_limit)
-        speed_limit.setFixedWidth(180)
-        speed_limit.setFixedHeight(30)
-        dialog.layout().addWidget(speed_limit_container)
+        down_speed_limit_layout.addWidget(QLabel("Max Download Speed (KiB, 0 for unlimited): "))
+        down_speed_limit = QSpinBox()
+        down_speed_limit.setMinimum(0)
+        down_speed_limit.setMaximum(10000000)
+        down_speed_limit.setValue(state.down_speed_limit)
+        down_speed_limit_container.setLayout(down_speed_limit_layout)
+        down_speed_limit_layout.addWidget(down_speed_limit)
+        down_speed_limit.setFixedWidth(180)
+        down_speed_limit.setFixedHeight(30)
+        dialog.layout().addWidget(down_speed_limit_container)
+        
+        up_speed_limit_container = QWidget()
+        up_speed_limit_layout = QHBoxLayout()
+
+        up_speed_limit_layout.addWidget(QLabel("Max Upload Speed (KiB, 0 for unlimited): "))
+        up_speed_limit = QSpinBox()
+        up_speed_limit.setMinimum(0)
+        up_speed_limit.setMaximum(10000000)
+        up_speed_limit.setValue(state.up_speed_limit)
+        up_speed_limit_container.setLayout(up_speed_limit_layout)
+        up_speed_limit_layout.addWidget(up_speed_limit)
+        up_speed_limit.setFixedWidth(180)
+        up_speed_limit.setFixedHeight(30)
+        dialog.layout().addWidget(up_speed_limit_container)
+
+        ######################
+        # CONNECTION CONFIGS #
+        ######################
+
+        max_connections_container = QWidget()
+        max_connections_layout = QHBoxLayout()
+
+        max_connections_layout.addWidget(QLabel("Max Connections: "))
+        max_connections = QSpinBox()
+        max_connections.setMinimum(0)
+        max_connections.setMaximum(10000000)
+        max_connections.setValue(state.max_connections)
+        max_connections_container.setLayout(max_connections_layout)
+        max_connections_layout.addWidget(max_connections)
+        max_connections.setFixedWidth(180)
+        max_connections.setFixedHeight(30)
+        dialog.layout().addWidget(max_connections_container)
+
+        ####################
+        # DOWNLOAD CONFIGS #
+        ####################
+
+        max_downloads_container = QWidget()
+        max_downloads_layout = QHBoxLayout()
+
+        max_downloads_layout.addWidget(QLabel("Max Downloads: "))
+        max_downloads = QSpinBox()
+        max_downloads.setMinimum(0)
+        max_downloads.setMaximum(10000000)
+        max_downloads.setValue(state.max_downloads)
+        max_downloads_container.setLayout(max_downloads_layout)
+        max_downloads_layout.addWidget(max_downloads)
+        max_downloads.setFixedWidth(180)
+        max_downloads.setFixedHeight(30)
+        dialog.layout().addWidget(max_downloads_container)
 
         ###############
         # SAVE/CANCEL #
@@ -111,13 +199,12 @@ def settings_dialog(self):
 
         save_btn = QPushButton("Save")
         cancel_btn = QPushButton("Cancel")
-        save_btn.clicked.connect(lambda: save_settings(thread_box.value(), close_settings, api_url.text(), download_path.text(), speed_limit.value()))
-    
+        save_btn.clicked.connect(lambda: save_settings(close_settings, api_url.text(), download_path.text(), down_speed_limit.value(), up_speed_limit.value(), image_path.text(), None, max_connections.value(), max_downloads.value()))
+
         cancel_btn.clicked.connect(dialog.reject)
-        print(thread_box.value())
         layout.addWidget(cancel_btn)
         layout.addWidget(save_btn)
 
         dialog.layout().addLayout(layout)
         
-        dialog.exec()
+        dialog.exec()

core/interface/gui.py

@@ -1,38 +1,128 @@
 from PySide6 import QtWidgets
-from PySide6 import QtCore
-from PySide6.QtCore import Qt, QTimer, QModelIndex, QAbstractTableModel
+from PySide6.QtCore import Qt, QTimer, QModelIndex, QAbstractTableModel, Signal, QEvent, QSize
 from PySide6.QtWidgets import (
     QLineEdit,
-    QTableView, 
-    QWidget, 
-    QVBoxLayout, 
-    QListWidget, 
-    QToolBar, 
-    QLabel, 
+    QTableView,
+    QWidget,
+    QVBoxLayout,
+    QListWidget,
+    QToolBar,
+    QLabel,
     QHBoxLayout,
-    QComboBox, 
+    QComboBox,
     QTabWidget,
     QProgressBar,
     QHeaderView,
-    )
-from PySide6.QtGui import QIcon, QAction, QCloseEvent
+    QMessageBox,
+    QTableWidget,
+    QTextEdit,
+    QStyle,
+    QStyleOptionButton,
+    QStyledItemDelegate,
+    QApplication,
+)
+
+from PySide6.QtGui import QIcon, QAction, QCloseEvent, QImage, QPixmap
 import darkdetect
 import threading
+import platform
+import requests as r
+import os
+import subprocess
+import libtorrent as lt
+import time
+import sys
+import json
+from core.utils.general.logs import consoleLog
 from core.utils.general.wrappers import run_thread
 from core.utils.data.state import state
 from core.utils.network.download import download_selected
-from core.utils.general.shutdown import closehelper
+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.network.aria2_integration import dlprogress
+from core.network.libtorrent_misc import cleanup_session
+from core.utils.general.shutdown import closehelper
 
 
+def download_update(latest_version):
+    new_filename = f"SoftwareManager-dev-{latest_version.replace('-dev', '')}-windows.exe"
+    url = f"https://github.com/KeksPirates/SoftwareManager/releases/latest/download/SoftwareManager-dev-{latest_version.replace('-dev', '')}-windows.exe"
+
+    print("Downloading update...", True)
+    response = r.get(url, allow_redirects=True)
+    with open(new_filename, "wb") as f:
+        f.write(response.content)
+    if not os.path.exists(new_filename):
+        raise FileNotFoundError("Executable not found")
+    subprocess.Popen([new_filename], shell=True)
+    time.sleep(0.5)
+
+    msg = QMessageBox()
+    msg.setIcon(QMessageBox.Icon.Information)
+    msg.setWindowTitle("New Version")
+    msg.setText("New version installed.")
+    msg.setInformativeText("Please remove the old exe.")
+    msg.setStandardButtons(QMessageBox.StandardButton.Ok)
+
+    sys.exit(0)
+
 
 class MainWindow(QtWidgets.QMainWindow, QWidget):
+    log_signal = Signal(str)  # Thread-safe signal for logging
+    
     def __init__(self):
         super().__init__()
-        searchresults = []
+        MainWindow._instance = self
+        self.log_signal.connect(self._on_log_signal)
+
+        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:
+                import ctypes
+                appid = 'SoftwareManager'
+                ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(appid)
+            except Exception as e:
+                consoleLog(f"Could not set app ID: {e}")
+
+        build_info_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "build_info.json")
+        if os.path.exists(build_info_path):
+            with open(build_info_path, "r") as f:
+                build_info = json.load(f)
+                state.version = build_info.get("version")
+
+        # Check for updates on Windows
+        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)
+
+                        response = msg.exec_()
+                        if response == QMessageBox.StandardButton.Ok:
+                            download_update(latest_version)
 
         self.setWindowTitle("Software Manager")
         self.setGeometry(100, 100, 800, 600)
@@ -46,42 +136,61 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.searchbar.setClearButtonEnabled(True)
         self.searchbar.setMinimumHeight(30)
         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.softwareList = QListWidget()
-        self.post_author_list = QListWidget()
         self.libraryList = QListWidget()
 
         self.emptyResults = QLabel("No Results")
         self.emptyResults.setAlignment(Qt.AlignCenter)
         self.emptyResults.hide()
 
-
         self.download_model = None
         self.downloadList = QTableView()
         self.emptyLibrary = QLabel("No items in library.")
         self.emptyDownload = QLabel("No items in downloads.")
+        self.emptyDownload.setAlignment(Qt.AlignCenter)
+
+        self.consoleLog = QTextEdit()
         self.progressbar = QProgressBar()
 
+        # Table Widget for Item List
+        self.qtablewidget = QTableWidget()
+
+        self.qtablewidget.setColumnCount(2)
+        self.qtablewidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        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)   
+        header.setStretchLastSection(False)
+
+        self.qtablewidget.setAttribute(Qt.WA_TranslucentBackground)
+        self.qtablewidget.viewport().setAttribute(Qt.WA_TranslucentBackground)
+
+        header = self.qtablewidget.horizontalHeader()
+        header.setSectionResizeMode(1, QHeaderView.Fixed)
+        header.resizeSection(1, 500)
+
         container = QWidget()
         containerLayout = QVBoxLayout()
         containerLayout.addWidget(self.searchbar)
-        
-        containerLayout.addWidget(self.softwareList)
-        containerLayout.addWidget(self.post_author_list)
-        self.softwareList.addItems(searchresults)
+        containerLayout.addWidget(self.qtablewidget)
 
         class DownloadModel(QAbstractTableModel):
             def __init__(self):
                 super().__init__()
-                self.headers = ["Name", "Status", "Progress", "Speed", "Size", "Total Size"]
-            
-            def rowCount(self, parent=QModelIndex()):
-                return len(state.downloads)
+                self.headers = ["Action", "Name", "Status", "Progress", "Speed", "Size", "Total Size"]
 
+            def rowCount(self, parent=QModelIndex()):
+                return len(state.active_downloads)
+            
             def columnCount(self, parent=QModelIndex()):
                 return len(self.headers)
-            
+
             def headerData(self, section, orientation, role=Qt.DisplayRole):
                 if role == Qt.DisplayRole and orientation == Qt.Horizontal:
                     return self.headers[section]
@@ -89,86 +198,294 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
             def data(self, index, role=Qt.DisplayRole):
                 if role == Qt.DisplayRole:
-                    download = state.downloads[index.row()]
                     col = index.column()
+
+                    if index.row() >= len(state.active_downloads) or index.row() < 0:
+                        return None
+                    
+                    magnet_link = list(state.active_downloads.keys())[index.row()]
+                    magnetdl = state.active_downloads[magnet_link]
+                    
+                    status = magnetdl.status()
                     
                     if col == 0:
-                        return download.name
+                        is_paused = magnetdl.status().paused
+                        return "▶︎" if is_paused else "⏸︎"
                     elif col == 1:
-                        return getattr(download, 'status', 'Downloading')
+                        return status.name if status.has_metadata else "Fetching metadata..."
                     elif col == 2:
-                        return f"{int(download.progress)}%"
+                        if status.state == lt.torrent_status.downloading:
+                            return "Downloading"
+                        elif status.state == lt.torrent_status.seeding:
+                            return "Seeding"
+                        elif status.paused:
+                            return "Paused"
+                        else:
+                            return "Queued"
                     elif col == 3:
-                        return f"{download.download_speed_string()}"
+                        return f"{status.progress * 100:.1f}%"
                     elif col == 4:
-                        pass
+                        speed_kbs = status.download_rate / 1024
+                        if speed_kbs > 1024:
+                            return f"{speed_kbs / 1024:.1f} MB/s"
+                        else:
+                            return f"{speed_kbs:.1f} kB/s"
                     elif col == 5:
-                        return f"{download.total_length_string()}"
+                        downloaded_mb = status.total_wanted_done / (1024 * 1024)
+                        if downloaded_mb > 1024:
+                            return f"{downloaded_mb / 1024:.2f} GB"
+                        else:
+                            return f"{downloaded_mb:.1f} MB"
+                    elif col == 6:
+                        total_mb = status.total_wanted / (1024 * 1024)
+                        if total_mb > 1024:
+                            return f"{total_mb / 1024:.2f} GB"
+                        else:
+                            return f"{total_mb:.1f} MB"
+                    elif col == 7:
+                        if status.download_rate > 0:
+                            bytes_left = status.total_wanted - status.total_wanted_done
+                            eta_seconds = bytes_left / status.download_rate
+                            
+                            if eta_seconds < 60:
+                                return f"{int(eta_seconds)}s"
+                            elif eta_seconds < 3600:
+                                minutes = int(eta_seconds / 60)
+                                seconds = int(eta_seconds % 60)
+                                return f"{minutes}m {seconds}s"
+                            else:
+                                hours = int(eta_seconds / 3600)
+                                minutes = int((eta_seconds % 3600) / 60)
+                                return f"{hours}h {minutes}m"
+                        else:
+                            return "∞" if status.paused else "Stalled"
+                
+                if role == Qt.UserRole and index.column() == 0:
+                    magnet_link = list(state.active_downloads.keys())[index.row()]
+                    magnetdl = state.active_downloads[magnet_link]
+                    return magnetdl.status().paused
+                
                 return None
 
+            def toggle_pause_resume(self, row):
+
+                if row >= len(state.active_downloads) or row < 0:
+                    return
+                    
+                magnet_link = list(state.active_downloads.keys())[row]
+                magnetdl = state.active_downloads[magnet_link]
+                status = magnetdl.status()
+                
+                if status.state == lt.torrent_status.seeding:
+                    if state.download_path is not None and os.path.exists(state.download_path):
+                        if platform.system() == "Windows":
+                            os.startfile(os.path.normpath(state.download_path))
+                        elif platform.system() == "Linux":
+                            subprocess.Popen(["xdg-open", state.download_path])
+                        elif platform.system() == "Darwin":
+                            subprocess.Popen(["open", state.download_path])
+                    return
+                
+                if status.paused:
+                    magnetdl.resume()
+                    consoleLog(f"Resumed download: {status.name}", True)
+                else:
+                    magnetdl.pause()
+                    consoleLog(f"Paused download: {status.name}", True)
+                
+                idx = self.index(row, 0)
+                self.dataChanged.emit(idx, idx, [Qt.ItemDataRole.DisplayRole, Qt.ItemDataRole.UserRole])
+
+        class PauseResumeDelegate(QStyledItemDelegate):
+            clicked = Signal(int)
+
+            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()
+
+                if button:
+                    if status.state == lt.torrent_status.seeding:
+                        button.setText("📁")
+                    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]
+                status = magnetdl.status()
+
+                widget = QWidget(parent)
+                widget.setStyleSheet("border: none;")
+                layout = QHBoxLayout(widget)
+                layout.setContentsMargins(0, 0, 0, 0)
+                if status.state == lt.torrent_status.seeding:
+                    btnPause = QtWidgets.QPushButton("📁")
+                else:
+                    btnPause = QtWidgets.QPushButton("▶︎" if status.paused else "⏸︎")
+                btnPause.setFixedSize(40, 30)
+                btnPause.clicked.connect(lambda: self.clicked.emit(index.row()))
+                layout.addStretch()
+                layout.addWidget(btnPause)
+                layout.addStretch()
+                widget.setLayout(layout)
+                return widget
+
+            def editorEvent(self, event, model, option, index):
+                if index.column() == 0 and event.type() == QEvent.Type.MouseButtonPress:
+                    self.clicked.emit(index.row())
+                    return True
+                return False
+
         self.download_model = DownloadModel()
         self.downloadList.setModel(self.download_model)
         self.downloadList.horizontalHeader().setStretchLastSection(False)
-        self.downloadList.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch)
+        self.downloadList.horizontalHeader().setSectionResizeMode(1, QHeaderView.Stretch)
         self.downloadList.setSelectionBehavior(QTableView.SelectRows)
+        self.downloadList.setAttribute(Qt.WA_TranslucentBackground)
+        self.downloadList.viewport().setAttribute(Qt.WA_TranslucentBackground)
+
+        download_model = self.download_model
+
+        def on_pause_resume_clicked(row):
+            download_model.toggle_pause_resume(row)
+
+        delegate = PauseResumeDelegate(self.downloadList)
+        self.downloadList.setItemDelegateForColumn(0, delegate)
+        delegate.clicked.connect(on_pause_resume_clicked)
 
         # download button triggers
-        self.dlbutton.clicked.connect(lambda: run_thread(threading.Thread(target=download_selected, args=(self.softwareList.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)
 
         # Tabs
         self.tabs = QTabWidget()
-
+        self.tabs.setStyleSheet("""
+        QTabBar::tab {
+            font-size: 11px;
+            padding: 2px 8px;
+            height: 25px;
+        }
+        """)
         self.horizontal_layout = QHBoxLayout()
-        self.horizontal_layout.addWidget(self.softwareList, stretch=3)
         self.horizontal_layout.addWidget(self.emptyResults, stretch=3)
-        self.horizontal_layout.addWidget(self.post_author_list)
-        
-        self.tab1 = create_tab("Search", self.searchbar, self.softwareList, self.tabs, self.dlbutton, self.horizontal_layout)
+        self.horizontal_layout.addWidget(self.qtablewidget)
+
+        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)
 
-        containerLayout.addWidget(self.tabs)
+        if state.image_path is not None and os.path.exists(state.image_path):
+            self.image = QImage(state.image_path)
+            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_()
 
-        containerLayout.setAlignment(Qt.AlignmentFlag.AlignBottom)
-
-        toolbar = QToolBar("Main Toolbar")
-        self.addToolBar(toolbar)
-        toolbar.setLayoutDirection(Qt.RightToLeft)
+            offset_x = -1350
+            offset_y = -550
+            x = self.width() - self.overlay_label.width() - offset_x
+            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)
+
+        
+        self.corner_widget = QWidget()
+        self.corner_layout = QHBoxLayout(self.corner_widget)
+        self.corner_layout.setContentsMargins(0, 0, 0, 0)
+
+
         self.tracker_list = QComboBox()
-        self.tracker_list.addItems(["rutracker", "uztracker"])
+        self.tracker_list.addItems(["rutracker", "uztracker", "m0nkrus"])
         self.tracker_list.activated.connect(self.set_tracker)
+        self.corner_layout.addWidget(self.tracker_list)
 
-
+        self.settings_btn = QtWidgets.QToolButton()
+        self.settings_btn.setIconSize(QSize(21, 21))
+        self.settings_btn.setStyleSheet("background: transparent;")
         if darkdetect.isDark():
-            settings_action = QAction(QIcon("core/interface/assets/settings_dark.png"), "Settings", self)
+            self.settings_btn.setIcon(QIcon(get_asset_path("settings_white.png")))
         else:
-            settings_action = QAction(QIcon("core/interface/assets/settings.png"), "Settings", self)
+            self.settings_btn.setIcon(QIcon(get_asset_path("settings_black.png")))
+        self.settings_btn.setToolTip("Settings")
+        self.settings_btn.clicked.connect(lambda: settings_dialog(self))
 
-        settings_action.triggered.connect(lambda: settings_dialog(self))
-        toolbar.addAction(settings_action)
-        toolbar.addWidget(self.tracker_list)
 
-        toolbar.setMovable(False)
-
-        self.progressbar.setValue(0)
-        containerLayout.addWidget(self.progressbar)
         
-        self.progress_timer = QTimer()
-        self.progress_timer.timeout.connect(lambda: run_thread(threading.Thread(target=self.update_progress)))
-        self.progress_timer.start(1000)
+        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)
 
         self.download_timer = QTimer()
-        self.download_timer.timeout.connect(lambda: run_thread(threading.Thread(target=self.download_list_update)))
+        self.download_timer.timeout.connect(self.download_list_update)
         self.download_timer.start(500)
 
+        self.active_timer = QTimer()
+        self.active_timer.timeout.connect(self.show_empty_downloads)
+        self.active_timer.start(500)
+
+    @staticmethod
+    def add_log(text):
+        if MainWindow._instance:
+            MainWindow._instance.log_signal.emit(text)
+    
+    def _on_log_signal(self, text):
+        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)
+        self.pixmap = QPixmap.fromImage(self.image)
+
+        self.overlay_label.setPixmap(self.pixmap)
+        self.overlay_label.adjustSize()
+
     def download_list_update(self):
         if self.download_model:
             self.download_model.layoutAboutToBeChanged.emit()
             self.download_model.layoutChanged.emit()
+            for row in range(self.download_model.rowCount()):
+                idx = self.download_model.index(row, 0)
+                self.downloadList.closePersistentEditor(idx)
+                self.downloadList.openPersistentEditor(idx)
+        
 
     def closeEvent(self, event: QCloseEvent):
         closehelper()
@@ -177,14 +494,24 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
     def set_tracker(self, _):
         state.tracker = self.tracker_list.currentText()
 
-    def update_progress(self):
-        progress = dlprogress()
-        self.progressbar.setValue(progress)
-
     def show_empty_results(self, show: bool):
         if show:
-            self.softwareList.hide()
+            self.qtablewidget.hide()
             self.emptyResults.show()
         else:
+            self.qtablewidget.show()
             self.emptyResults.hide()
-            self.softwareList.show()
+
+    def show_empty_downloads(self):
+        if len(state.active_downloads) > 0:
+            self.emptyDownload.hide()
+            self.downloadList.show()
+        else:
+            self.emptyDownload.show()
+            self.downloadList.hide()
+
+    # thank you claude
+    def resizeEvent(self, event):
+        super().resizeEvent(event)
+        table_width = self.qtablewidget.viewport().width()
+        self.qtablewidget.setColumnWidth(1, int(table_width * 0.3))

core/interface/utils/searchhelper.py

@@ -1,42 +1,79 @@
-import asyncio
+from PySide6.QtWidgets import QTableWidgetItem
+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.data.state import state
 
 def return_pressed(self):
-        search_text = self.searchbar.text()
-        if search_text == "":
-            if state.debug:
-                print("Error: Can't search for nothing")
-            return
-        if state.debug:
-            print("User searched for:", search_text)
-        if state.tracker == "uztracker":
-            response = asyncio.run(scrape_uztracker(search_text))
-        if state.tracker == "rutracker":
-            response = scrape_rutracker(search_text)
+    search_text = self.searchbar.text()
+    if search_text == "":
+        consoleLog("Error: Can't search for nothing")
+        return
+    consoleLog(f"User searched for: {search_text}")
+    
+    if state.tracker == "uztracker":
+        response = scrape_uztracker(search_text)
         if response:
-            if state.tracker == "uztracker":
-                state.post_titles, state.post_urls, = response
-                self.softwareList.clear()
-                if state.post_titles:
-                    self.softwareList.addItems(state.post_titles)
-                    self.post_author_list.addItems(state.post_author)
-            if state.tracker == "rutracker":
-                _, state.posts, _, _, cached = split_data(response)
+            state.post_titles, state.post_urls = response
+            self.qtablewidget.clear()
+            if state.post_titles and len(state.post_titles) > 0:
+                self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
+                self.qtablewidget.setRowCount(len(state.post_titles))
+                for i, author in enumerate(state.post_author):
+                    self.qtablewidget.setItem(i, 1, QTableWidgetItem(author))
+                for i, title in enumerate(state.post_titles):
+                    self.qtablewidget.setItem(i, 0, QTableWidgetItem(title))
+                self.show_empty_results(False)
+            else:
+                consoleLog(f"No Results for {search_text}")
+                self.qtablewidget.clear()
+                self.show_empty_results(True)
+        else:
+            consoleLog(f"No response from uztracker")
+            self.qtablewidget.clear()
+            self.show_empty_results(True)
+    
+    elif state.tracker == "rutracker":
+        response = scrape_rutracker(search_text)
+        if response:
+            _, state.posts, _, _, cached = split_data(response)
             if state.posts == []:
-                if state.debug:
-                    print(f"No Results found for \"{search_text}\"")
-                self.softwareList.clear()
+                consoleLog(f"No Results for {search_text}")
+                self.qtablewidget.clear()
                 self.show_empty_results(True)
             else:
                 state.post_titles, _, state.post_author = format_data(state.posts)
                 self.show_empty_results(False)
-                self.post_author_list.clear()
-                self.post_author_list.addItems(state.post_author)
-                self.softwareList.clear()
-                self.softwareList.addItems(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):
+                    self.qtablewidget.setItem(i, 1, QTableWidgetItem(author))
+                for i, title in enumerate(state.post_titles):
+                    self.qtablewidget.setItem(i, 0, QTableWidgetItem(title))
                 if state.debug == True:
-                    print(f"Cached: {cached}")
+                    consoleLog(f"Response Cached: {cached}")
+        else:
+            consoleLog(f"No response from rutracker")
+            self.qtablewidget.clear()
+            self.show_empty_results(True)
 
+    elif state.tracker == "m0nkrus":
+        state.posts = scrape_monkrus_telegram(search_text)
+
+        if state.posts == []:
+            consoleLog(f"No Results for {search_text}")
+            self.qtablewidget.clear()
+            self.show_empty_results(True)
+        else:
+            state.post_titles, _, state.post_author = format_data(state.posts)
+            self.show_empty_results(False)
+            self.qtablewidget.clear()
+            self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
+            self.qtablewidget.setRowCount(len(state.post_titles))
+            for i, author in enumerate(state.post_author):
+                self.qtablewidget.setItem(i, 1, QTableWidgetItem(author))
+            for i, title in enumerate(state.post_titles):
+                self.qtablewidget.setItem(i, 0, QTableWidgetItem(title))

core/interface/utils/tabhelper.py

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

core/network/aria2_integration.py

@@ -1,75 +0,0 @@
-import aria2p
-import subprocess
-from core.utils.data.state import state
-from plyer import notification
-import time
-import sys
-
-def run_aria2p():
-
-    state.aria2 = aria2p.API(
-        aria2p.Client(
-            host="http://localhost",
-            port=6800,
-            secret=""
-        )
-    )
-    
-    return state.aria2
-
-
-def aria2server():
-    download_path = state.download_path
-    speed_limit = state.speed_limit
-
-    cmd = [
-        "aria2c",
-        "--enable-rpc",
-        "--disable-ipv6", # added this since it caused problems with vpns
-        "--rpc-listen-all",
-        "--rpc-listen-port=6800",
-        f"--dir={download_path}",
-        f"--max-download-limit={speed_limit * 1024}",
-        "-x", str(state.aria2_threads),
-        "-s", str(state.aria2_threads),
-    ]
-    
-    aria2server = subprocess.Popen(
-        cmd,
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL,
-        creationflags=subprocess.CREATE_NO_WINDOW if sys.platform == 'win32' else 0
-    )
-    return aria2server
-
-def dlprogress():
-    try:
-        state.downloads = [download for download in state.aria2.get_downloads() if not download.is_metadata]
-        downloads = state.downloads
-        if downloads:
-            for download in downloads:
-                progress = download.progress_string(0)
-                progress_int = int(progress.strip('%'))
-                return progress_int
-        return 0
-    except:
-        return 0
-
-def send_notification(shutdown_event):
-    notified = set()
-    while not shutdown_event.is_set():
-        try:
-            for d in state.aria2.get_downloads():
-                if d.is_metadata:
-                    continue
-                if d.progress == 100 and d.gid not in notified:
-                    notification.notify(
-                        title="Download finished",
-                        message=f"{d.name} has finished downloading.",
-                        timeout=4
-                    )
-                    notified.add(d.gid)
-            state.downloads = [d for d in state.aria2.get_downloads() if d.is_active and not d.is_metadata]
-        except Exception:
-            pass
-        time.sleep(5)

core/network/aria2_wrapper.py

@@ -1,11 +0,0 @@
-from .aria2_integration import run_aria2p
-
-def start_client():
-    global aria2
-    aria2 = run_aria2p()
-
-def add_magnet(uri):
-    aria2.add_magnet(uri)
-
-
-

core/network/libtorrent_int.py

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

core/network/libtorrent_misc.py

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

core/network/libtorrent_wrapper.py

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

core/utils/config/config.py

@@ -3,21 +3,21 @@ import platform
 import configparser
 from core.utils.data.state import state
 
-
 def create_config():
     config = configparser.ConfigParser()
 
-    config["General"] = {"debug": True, "api_url": f"{state.api_url}", "aria2_threads": f"{state.aria2_threads}", "download_path": f"{state.download_path}", f"speed_limit": f"{state.speed_limit}"}
+    config["General"] = {"debug": True, "api_url": f"{state.api_url}", "download_path": f"{state.download_path}", f"download_speed_limit": f"{state.down_speed_limit}", f"upload_speed_limit": f"{state.up_speed_limit}", 
+                         "ignore_updates": f"{state.ignore_updates}", "image_path": f"{state.image_path}", "autoresume": f"{state.autoresume}", "max_connections": f"{state.max_connections}", "max_downloads": f"{state.max_downloads}"}
 
     if platform.system() == "Windows":
-            config_dir = os.environ.get("APPDATA", os.path.expanduser("~\\AppData\\Roaming"))
+        config_dir = os.environ.get("APPDATA", os.path.expanduser("~\\AppData\\Roaming"))
     else:
         config_dir = os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config"))
 
-    settings_path = os.path.join(config_dir, "SoftwareManager")
-    os.makedirs(settings_path, exist_ok=True)
+    state.settings_path = os.path.join(config_dir, "SoftwareManager")
+    os.makedirs(state.settings_path, exist_ok=True)
 
-    with open(os.path.join(settings_path, "config.yml"), 'w') as cf:
+    with open(os.path.join(state.settings_path, "config.yml"), 'w') as cf:
         config.write(cf)
 
 
@@ -26,20 +26,27 @@ def read_config():
     config = configparser.ConfigParser()
 
     if platform.system() == "Windows":
-            config_dir = os.environ.get("APPDATA", os.path.expanduser("~\\AppData\\Roaming"))
+        config_dir = os.environ.get("APPDATA", os.path.expanduser("~\\AppData\\Roaming"))
     else:
         config_dir = os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config"))
-    settings_path = os.path.join(config_dir, "SoftwareManager")
-    config_file = os.path.join(settings_path, "config.yml")
+    state.settings_path = os.path.join(config_dir, "SoftwareManager")
+    config_file = os.path.join(state.settings_path, "config.yml")
 
     if not os.path.exists(config_file):
         create_config()
+        return
 
     config.read(config_file)
 
-    state.debug = config.getboolean("General", "debug")
-    state.api_url = config.get("General", "api_url")
-    state.aria2_threads = config.getint("General", "aria2_threads")
-    state.download_path = config.get("General", "download_path")
-    state.speed_limit = config.getint("General", "speed_limit")
+    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)
 
+    create_config()

core/utils/config/settings.py

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

core/utils/data/models.py

@@ -0,0 +1,15 @@
+from dataclasses import dataclass
+from typing import List
+
+
+@dataclass
+class Download:
+    title: str
+    url: str
+    magnet_uri: str
+    completed: bool
+
+@dataclass
+class DownloadList:
+    count: int
+    data: List[Download]

core/utils/data/state.py

@@ -1,22 +1,40 @@
-from dataclasses import dataclass
+from PySide6.QtCore import QObject, Signal
 from typing import Optional, Any, List, Dict
 from pathlib import Path
 
-@dataclass
-class AppState:
-    posts: List[Dict[str, Any]]
-    post_titles: List[str]
-    post_urls: List[str]
-    post_author: List[str]
-    downloads: List[str]
-    debug: bool = False
-    tracker: str = "rutracker"
-    api_url: str = "https://api.michijackson.xyz"
-    download_path:  str = str(Path.home() / "Downloads")
-    speed_limit: int = 0
-    aria2process: Optional[Any] = None
-    aria2: Any = None
-    aria2p: Any = None
-    aria2_threads: int = 4
+class AppState(QObject):
+    image_changed = Signal(str)
 
-state = AppState(posts=[], post_titles=[], post_urls=[], post_author=[], downloads=[], download_path="")
+    def __init__(self):
+        super().__init__()
+        self.posts: List[Dict[str, Any]] = []
+        self.post_titles: List[str] = []
+        self.post_urls: List[str] = []
+        self.post_author: List[str] = []
+        self.version: str = "dev"
+        self._image_path: str = ""
+        self.ignore_updates: bool = False
+        self.debug: bool = False
+        self.autoresume: bool = True
+        self.tracker: str = "rutracker"
+        self.api_url: str = "https://api.michijackson.xyz"
+        self.download_path: str = str(Path.home() / "Downloads")
+        self.up_speed_limit: int = 0
+        self.down_speed_limit: int = 0
+        self.max_connections: int = 200
+        self.max_downloads: int = 10
+        self.settings_path: str = None
+        self.dl_session: Any = None
+        self.active_downloads: List[str] = {}
+
+    @property
+    def image_path(self) -> str:
+        return self._image_path
+
+    @image_path.setter
+    def image_path(self, new_path: str):
+        if new_path != self._image_path:
+            self._image_path = new_path
+            self.image_changed.emit(new_path)
+
+state = AppState()

core/utils/data/tracker.py

@@ -1,20 +1,29 @@
 import requests
 from bs4 import BeautifulSoup
 from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
 from core.utils.network.jsonhandler import format_data
 
 
 
-def get_item_url(item, posts, post_titles): # oftwarelist currentitem, post list (dict), post titles list
+def get_item_url(item, posts, post_titles): # softwarelist currentitem, post list (dict), post titles list
         post_index = post_titles.index(item)
         if 0 <= post_index < len(post_titles): 
             if state.tracker == "uztracker":
                 item = "https://uztracker.net/" + state.post_urls[post_index].lstrip("./")
+                consoleLog(f"Found post URL: {item}")
                 return item
             if state.tracker == "rutracker":                
                 item_dict = posts[post_index]
                 _, 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])
+                consoleLog(f"Found post URL: {post_links[0]}")
+                return post_links[0]
+
         return None
 
 
@@ -22,18 +31,16 @@ def get_item_url(item, posts, post_titles): # oftwarelist currentitem, post list
 def get_magnet_link(post_url):
     try:
         response = requests.get(post_url) # eventually impl. cloudscraper
+        consoleLog("Sent Request to retrieve Magnet Link...")
         response.raise_for_status()
         soup = BeautifulSoup(response.text, 'html.parser')
         magnet_link = soup.find('a', href=lambda x: x and x.startswith('magnet:'))
         if magnet_link:
-            if state.debug:
-                print("Magnet Link Retrieved: ", magnet_link['href'])
+            consoleLog(f"Magnet Link Retrieved: {magnet_link['href']}")
             return magnet_link['href']
         else:
-            if state.debug:
-                print("Magnet Link not Found!")
+            consoleLog("Magnet Link not Found!")
     except requests.RequestException as e:
-        if state.debug:
-            print(f"Failed to fetch {post_url}: {e}")
+        consoleLog(f"Failed to fetch {post_url}: {e}")
         return None
     

core/utils/general/loghandler.py

@@ -0,0 +1,21 @@
+from core.utils.general.logs import consoleLog
+from core.utils.network.download import run_download_direct
+
+def split_data(data):
+
+    count = data.count
+    downloads = data.data
+
+    return count, downloads
+
+def check_completed(downloads, resume):
+    for download in downloads:
+        if download.completed == False:
+            consoleLog(f"Found unfinished download: {download.title}")
+            if resume == True:
+                run_download_direct(download.magnet_uri)
+                consoleLog(f"Resuming {download.title}")
+
+            
+
+

core/utils/general/logs.py

@@ -0,0 +1,179 @@
+from core.utils.data.models import Download, DownloadList
+from core.utils.data.state import state
+from dataclasses import asdict
+from datetime import datetime
+import json
+import os
+import re
+
+
+def add_download_log(title, url, magnet_uri, completed) -> DownloadList:
+    downloads_file = os.path.join(state.settings_path, "downloads.json")
+    
+    if os.path.exists(downloads_file) and os.path.getsize(downloads_file) > 0:
+        try:
+            with open(downloads_file, "r") as file:
+                existing_data = json.load(file)
+                downloads = [Download(**d) for d in existing_data.get("data", [])]
+        except json.JSONDecodeError:
+            downloads = []
+    else:
+        downloads = []
+    
+
+    if any(d.magnet_uri == magnet_uri or d.url == url for d in downloads):
+        consoleLog("Skipped Logging, download already in file")
+        return DownloadList(data=downloads, count=len(downloads)) # thanks again claude (im stupid)
+        
+    
+    downloads.append(Download(
+        title=title,
+        url=url,
+        magnet_uri=magnet_uri,
+        completed=completed,
+    ))
+
+    consoleLog(f"Added {title} to Log File")
+    
+    download_list = DownloadList(data=downloads, count=len(downloads))
+    with open(downloads_file, "w") as file:
+        json.dump(asdict(download_list), file, indent=4)
+    
+    return download_list
+
+def update_download_completed(magnet_uri, completed) -> DownloadList:
+    downloads_file = os.path.join(state.settings_path, "downloads.json")
+    
+    if os.path.exists(downloads_file) and os.path.getsize(downloads_file) > 0:
+        try:
+            with open(downloads_file, "r") as file:
+                existing_data = json.load(file)
+                downloads = [Download(**d) for d in existing_data.get("data", [])]
+        except (json.JSONDecodeError, TypeError) as e:
+            consoleLog(f"Error loading downloads.json: {e}")
+            downloads = []
+    else:
+        downloads = []
+
+    identifier = (magnet_uri or "").strip()
+    if state.debug:
+        consoleLog(f"Updating download completed for identifier: {identifier!r}")
+        consoleLog(f"Total downloads in file: {len(downloads)}")
+        for i, d in enumerate(downloads):
+            try:
+                mag = (getattr(d, 'magnet_uri', None) or '')[:50]
+                url = (getattr(d, 'url', None) or '')[:50]
+                consoleLog(f"  [{i}] magnet: {mag}... url: {url}...")
+            except Exception as e:
+                consoleLog(f"  [{i}] Error reading download: {e}")
+
+    found = False
+    for download in downloads:
+        try:
+            stored_magnet = (getattr(download, 'magnet_uri', None) or "").strip()
+            stored_url = (getattr(download, 'url', None) or "").strip()
+            consoleLog(f"Comparing with magnet: {stored_magnet[:50] if stored_magnet else 'None'}...")
+            if identifier and (stored_magnet == identifier or stored_url == identifier):
+                consoleLog(f"Match found! Setting completed={completed}")
+                download.completed = completed
+                found = True
+        except Exception as e:
+            consoleLog(f"Error comparing download: {e}")
+
+    if not found:
+        consoleLog("No matching download found to update")
+        return DownloadList(data=downloads, count=len(downloads))
+
+    download_list = DownloadList(data=downloads, count=len(downloads))
+    with open(downloads_file, "w") as file:
+        json.dump(asdict(download_list), file, indent=4)
+    
+    consoleLog("Updated download log")
+    
+    return download_list
+    
+
+def get_download_logs() -> DownloadList:
+    downloads_file = os.path.join(state.settings_path, "downloads.json")
+    
+    if os.path.exists(downloads_file) and os.path.getsize(downloads_file) > 0:
+        try:
+            with open(downloads_file, "r") as file:
+                existing_data = json.load(file)
+                downloads = [Download(**d) for d in existing_data.get("data", [])]
+        except json.JSONDecodeError:
+            downloads = []
+    else:
+        downloads = []
+    
+    return DownloadList(data=downloads, count=len(downloads))
+
+
+def extract_hash_from_magnet(magnet_uri): # full credits to claude for this
+    match = re.search(r'urn:btih:([A-F0-9]+)', magnet_uri, re.IGNORECASE)
+    if match:
+        return match.group(1).upper()
+    return None
+
+
+def update_download_completed_by_hash(info_hash, completed) -> DownloadList:
+    downloads_file = os.path.join(state.settings_path, "downloads.json")
+    
+    if os.path.exists(downloads_file) and os.path.getsize(downloads_file) > 0:
+        try:
+            with open(downloads_file, "r") as file:
+                existing_data = json.load(file)
+                downloads = [Download(**d) for d in existing_data.get("data", [])]
+        except (json.JSONDecodeError, TypeError) as e:
+            consoleLog(f"Error loading downloads.json: {e}")
+            downloads = []
+    else:
+        downloads = []
+
+    info_hash_upper = (info_hash or "").upper().strip()
+    consoleLog(f"Updating download by hash: {info_hash_upper}")
+    consoleLog(f"Total downloads in file: {len(downloads)}")
+
+    found = False
+    for download in downloads:
+        try:
+            magnet_uri = getattr(download, 'magnet_uri', None)
+            if magnet_uri:
+                stored_hash = extract_hash_from_magnet(magnet_uri)
+                if stored_hash and stored_hash == info_hash_upper:
+                    download.completed = completed
+                    found = True
+        except Exception as e:
+            consoleLog(f"Error comparing download: {e}")
+
+    if not found:
+        consoleLog("No matching download found to update")
+        return DownloadList(data=downloads, count=len(downloads))
+
+    download_list = DownloadList(data=downloads, count=len(downloads))
+    with open(downloads_file, "w") as file:
+        json.dump(asdict(download_list), file, indent=4)
+    
+    consoleLog("Updated download log")
+    
+    return download_list
+
+
+_main_window = None
+
+def set_main_window(window):
+    global _main_window
+    _main_window = window
+
+def consoleLog(text, printAnyways = False):
+    now = datetime.now()
+    current_time = now.strftime("%H:%M:%S")
+
+    try:
+        from core.interface.gui import MainWindow
+        MainWindow.add_log(f"[{current_time}] {text}")
+    except Exception:
+        pass
+    
+    if state.debug or printAnyways:
+        print(f"[{current_time}] {text}")

core/utils/general/shutdown.py

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

core/utils/network/download.py

@@ -1,29 +1,31 @@
 from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
 from core.utils.data.tracker import get_item_url
 from core.utils.data.tracker import get_magnet_link
-from core.network.aria2_wrapper import start_client
-from core.network.aria2_wrapper import add_magnet
+from core.network.libtorrent_wrapper import add_download
 from core.utils.general.wrappers import run_thread
+from core.utils.general.logs import add_download_log
+
 import threading
 
 
 def download_selected(item, posts, post_titles):
     if item is not None:
-        if state.debug:
-            print(f"network {item.text()}")
+        consoleLog(f"Downloading {item.text()}")
         run_thread(threading.Thread(target=run_download, args=(item.text(), posts, post_titles)))
-        
     else:
-        if state.debug:
-            print("No item selected for download.")
+        consoleLog("No item selected for download.")
 
 def run_download(item, posts, post_titles):
     post_url = get_item_url(item, posts, post_titles)
-    if state.debug:
-        print("Selected URL: ", post_url)
+    consoleLog(f"Selected URL: {post_url}")
     magnet_uri = get_magnet_link(post_url)
-    start_client()
-    add_magnet(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/update_checker.py

@@ -0,0 +1,35 @@
+import requests
+from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
+
+def check_for_updates():
+    url = f"https://api.github.com/repos/KeksPirates/SoftwareManager/releases"
+    response = requests.get(url)
+
+    if response.status_code != 200:
+        consoleLog(f"Failed to fetch releases: {response.status_code}")
+        exit(1)
+
+    releases = response.json()
+    releases.sort(key=lambda r: r["published_at"], reverse=True)
+
+    latest_release = releases[0]
+    latest_version = latest_release["name"]
+    assets = latest_release["assets"]
+
+
+    if state.version == "dev":
+        consoleLog("Dev release detected, skipping version check")
+        return None, None
+    elif latest_version != state.version:
+        consoleLog(f"New release available: {latest_version}")
+        if assets:
+            consoleLog("Assets:")
+            for asset in assets:
+                consoleLog(f" - {asset['name']}: {asset['browser_download_url']}")
+            return assets, latest_version
+        else: 
+            return None, None
+    else:
+        consoleLog("Already up-to-date.")
+        return None, None

main.py

@@ -1,21 +1,24 @@
 from core.interface.gui import MainWindow
 from core.utils.data.state import state
-from core.network.aria2_integration import aria2server
-from core.network.aria2_integration import send_notification
-from core.utils.general.shutdown import kill_aria2server, closehelper, shutdown_event
+from core.utils.general.logs import consoleLog
+from core.network.libtorrent_misc import send_notification, update_log
+from core.utils.general.logs import get_download_logs
+from core.utils.general.shutdown import closehelper, shutdown_event
 from core.utils.general.wrappers import run_thread
+from core.utils.general.loghandler import split_data, check_completed
 from core.utils.config.config import read_config
 from PySide6 import QtWidgets
 import qdarktheme
 import darkdetect
 import threading
 import signal
-import atexit
+import argparse
 import sys
 
-# Debug Output
-state.debug = True
 
+parser = argparse.ArgumentParser()
+parser.add_argument("--debug", action="store_true") 
+args = parser.parse_args()
 
 def run_gui():
     app = QtWidgets.QApplication([])
@@ -24,24 +27,29 @@ def run_gui():
     else:
         app.setStyleSheet(qdarktheme.load_stylesheet("light"))
     widget = MainWindow()
+
+    from core.utils.general.logs import set_main_window
+    set_main_window(widget)
+
     widget.show()
     sys.exit(app.exec())
 
-def run_aria2server():
-    aria2process = aria2server()
-    return aria2process
-
 def keyboardinterrupthandler(signum, frame):
     closehelper()
 
 if __name__ == "__main__":
     read_config()
-    if state.debug:
-        print("Starting Aria2 Server")
-    state.aria2process = run_aria2server()
+    logs = get_download_logs()
+    count, downloads = split_data(logs)
+    if args.debug:
+        state.debug = args.debug # override of read_config
     signal.signal(signal.SIGINT, keyboardinterrupthandler)
     run_thread(threading.Thread(target=send_notification, args=(shutdown_event,), daemon=True))
-    if state.debug:
-        print("Launching GUI")
+    consoleLog("Started send_notification thread")
+    run_thread(threading.Thread(target=update_log, args=(shutdown_event,), daemon=True))
+    consoleLog("Started update_log thread")
+    run_thread(threading.Thread(target=check_completed, args=(downloads, state.autoresume)))
+    consoleLog("Started check_completed thread")
+    consoleLog("Launching GUI")
     run_gui()
 

requirements.txt

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