fix: update Python dependency installation and enhance icon conversion process for improved compatibility

Updated README to clarify usage instructions and dependencies format.

.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,28 +88,53 @@ jobs:
           }
           EOF
 
-      - name: Build executable with PyInstaller (Windows)
+      - name: Install UPX (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 }} \
+          curl -sL https://github.com/upx/upx/releases/download/v5.1.0/upx-5.1.0-win64.zip -o upx.zip
+          7z x upx.zip -oupx-dir
+          UPX_DIR="$(pwd)/upx-dir/upx-5.1.0-win64"
+          echo "$UPX_DIR" >> $GITHUB_PATH
+          export PATH="$UPX_DIR:$PATH"
+          echo "UPX_BINARY=$UPX_DIR/upx.exe" >> $GITHUB_ENV
+          upx --version | head -1
+
+      - name: Convert icon for Windows
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          python -c "
+          from PIL import Image
+          img = Image.open('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-dir=core/interface/assets=core/interface/assets \
+            --include-data-files=build_info.json=build_info.json \
+            --include-data-files=build_info.json=core/build_info.json \
+            --include-data-files=build_info.json=core/interface/build_info.json \
+            --output-filename=${{ env.APP_NAME }}.exe \
             main.py
 
-      - name: Build executable with PyInstaller (Unix)
-        if: runner.os != 'Windows'
+      - name: Build with PyInstaller (Linux)
+        if: runner.os == 'Linux'
         shell: bash
         run: |
           pyinstaller --onefile --windowed \
@@ -122,22 +153,43 @@ jobs:
             --name ${{ env.APP_NAME }} \
             main.py
 
-      - name: Make executable (Unix)
-        if: runner.os != 'Windows'
-        run: chmod +x dist/${{ env.APP_NAME }}
+      - name: Build with PyInstaller (macOS)
+        if: runner.os == 'macOS'
+        shell: bash
+        run: |
+          pyinstaller --onefile \
+            --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: Rename artifact
         shell: bash
         run: |
-          cd dist
-          mv ${{ env.APP_NAME }}${{ runner.os == 'Windows' && '.exe' || '' }} ${{ matrix.artifact_name }}
-          ls -la
+          mkdir -p dist-final
+          if [ "$RUNNER_OS" == "Windows" ]; then
+            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 +214,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 +236,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 +254,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 is a Python-based GUI/TUI tool that simplifies downloading and managing free software from various sources.
+# SoftwareManager
+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)
-- Bandwidth/Download speed limiting
-- Start downloads via a predefined magnet URI.
-- View detailed download information (name, speed, and status).
+- Searching & Downloading Software from various pages
+- Network Interface Binding
+- Simple UI, Speed Limiting etc.
+- 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
-- 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.
+## Additional Information
+- SoftwareManager is still in Development and most likely contains issues. Please report any bugs you find via the Issues tab. Contributions are also greatly appreciated.
+- MacOS Builds haven't been properly tested - We're thankful to receive feedback.
+- If you want to host your own server, clone the server branch of this repo, enter your cookie for rutracker.org and run server.py. Detailed Instructions on how to get your rutracker cookie are in the README of the server branch.
+
+## Python Dependencies
+(also included in requirements.txt)
+
+   ```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.

core/interface/gui.py

@@ -73,15 +73,16 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         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)
+            base_path = os.path.dirname(os.path.abspath(__file__))
+            asset_path = os.path.join(base_path, 'assets', filename)
             if os.path.exists(asset_path):
                 return asset_path
 
+            if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
+                asset_path = os.path.join(sys._MEIPASS, '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")))

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)
 

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)
         
     

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