fix workflows (again)

QTableWidget

.github/workflows/dev.yml

@@ -35,6 +35,8 @@ jobs:
             asset_name: SoftwareManager-dev-macos
 
     runs-on: ${{ matrix.os }}
+    outputs:
+      version: ${{ steps.version.outputs.version }}
 
     steps:
       - name: Checkout code
@@ -66,7 +68,33 @@ jobs:
           pip install -r requirements.txt
           pip install pyinstaller
 
-      - name: Build executable with PyInstaller
+      - 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 (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          $json = '{
+            "version": "' + $env:VERSION + '"
+          }'
+          $json | Out-File -Encoding utf8 build_info.json
+
+      - name: Build executable with PyInstaller (Windows)
+        if: runner.os == 'Windows'
+        run: pyinstaller --onefile --windowed --add-data "build_info.json:." --name ${{ env.APP_NAME }} main.py
+
+      - name: Build executable with PyInstaller (Unix)
+        if: runner.os != 'Windows'
         run: pyinstaller --onefile --windowed --name ${{ env.APP_NAME }} main.py
 
       - name: Make executable (Unix)
@@ -94,46 +122,25 @@ jobs:
     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
-          cp artifacts/ubuntu-latest-build/SoftwareManager-dev-linux release/SoftwareManager-dev-linux
-          cp artifacts/windows-latest-build/SoftwareManager-dev-windows.exe release/SoftwareManager-dev-windows.exe
-          cp artifacts/macos-latest-build/SoftwareManager-dev-macos release/SoftwareManager-dev-macos
+          cp artifacts/ubuntu-latest-build/SoftwareManager-dev-linux release/
+          cp artifacts/windows-latest-build/SoftwareManager-dev-windows.exe release/
+          cp artifacts/macos-latest-build/SoftwareManager-dev-macos release/
           chmod +x release/SoftwareManager-dev-linux release/SoftwareManager-dev-macos
           ls -la release/
 
       - 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: false
+          tag_name: ${{ needs.build.outputs.version }}
+          name: ${{ needs.build.outputs.version }}
           files: |
             release/SoftwareManager-dev-linux
             release/SoftwareManager-dev-windows.exe

core/interface/dialogs/settings.py

@@ -10,12 +10,10 @@ from PySide6.QtWidgets import (
     QLabel, 
     QHBoxLayout,
     QSpinBox,
+    QCheckBox,
     )
 
 
-
-
-
 def settings_dialog(self):
 
         if state.debug:
@@ -29,7 +27,20 @@ def settings_dialog(self):
 
         def close_settings():
             dialog.reject()
-        
+
+        checkbox_container = QWidget()
+        checkbox_layout = QHBoxLayout()
+
+        # ignore updates checkbox
+        checkbox = QCheckBox()
+        checkbox_container.setLayout(checkbox_layout)
+        checkbox_layout.addWidget(QLabel("Ignore Updates: "))
+        checkbox_layout.addStretch()
+        checkbox.setChecked(state.ignore_updates)
+        checkbox.toggled.connect(lambda checked: setattr(state, 'ignore_updates', checked))
+        checkbox_layout.addWidget(checkbox)
+        dialog.layout().addWidget(checkbox_container)
+
         ##################
         # THREAD SETTING #
         ##################
@@ -119,4 +130,4 @@ def settings_dialog(self):
 
         dialog.layout().addLayout(layout)
         
-        dialog.exec()
+        dialog.exec()

core/interface/gui.py

@@ -15,7 +15,9 @@ from PySide6.QtWidgets import (
     QProgressBar,
     QHeaderView,
     QMessageBox,
+    QTableWidget,
     )
+
 from PySide6.QtGui import QIcon, QAction, QCloseEvent
 import darkdetect
 import threading
@@ -25,7 +27,7 @@ import os
 import subprocess
 import time
 import sys
-from core.utils.config.settings import save_settings
+import json
 from core.utils.general.wrappers import run_thread
 from core.utils.data.state import state
 from core.utils.network.download import download_selected
@@ -36,7 +38,7 @@ from core.interface.utils.searchhelper import return_pressed
 from core.interface.dialogs.settings import settings_dialog
 from core.network.aria2_integration import dlprogress
 
-def download_update(latest_version):
+def download_update():
     filename = "SoftwareManager-dev-windows.exe"
     url = "https://github.com/KeksPirates/SoftwareManager/releases/latest/download/SoftwareManager-dev-windows.exe"
 
@@ -50,30 +52,35 @@ def download_update(latest_version):
         raise FileNotFoundError(f"Executable not found")
     subprocess.Popen([filename], shell=True)
     time.sleep(0.5)
-    save_settings(version=latest_version)
     sys.exit(0)
 
 class MainWindow(QtWidgets.QMainWindow, QWidget):
     def __init__(self):
         super().__init__()
-        searchresults = []
+
+        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 platform.system() == "Windows":
-            result = check_for_updates()
-            assets, latest_version = result
+        if state.ignore_updates is False:
+            if platform.system() == "Windows":
+                result = check_for_updates()
+                assets, latest_version = result
 
-            if assets:
-                msg = QMessageBox()
-                msg.setIcon(QMessageBox.Information)
-                msg.setWindowTitle("Update Available")
-                msg.setText(f"A new version is available.")
-                msg.setInformativeText("Please visit the GitHub releases page to download the latest version.")
-                msg.setStandardButtons(QMessageBox.Ok | QMessageBox.Ignore)
+                if assets:
+                    msg = QMessageBox()
+                    msg.setIcon(QMessageBox.Information)
+                    msg.setWindowTitle("Update Available")
+                    msg.setText(f"A new version is available.")
+                    msg.setInformativeText("Please visit the GitHub releases page to download the latest version.")
+                    msg.setStandardButtons(QMessageBox.Ok | QMessageBox.Ignore)
 
-                response = msg.exec_()
-                if response == QMessageBox.Ok:
-                    download_update(latest_version)
+                    response = msg.exec_()
+                    if response == QMessageBox.Ok:
+                        download_update(latest_version)
 
         self.setWindowTitle("Software Manager")
         self.setGeometry(100, 100, 800, 600)
@@ -89,8 +96,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.searchbar.returnPressed.connect(lambda: run_thread(threading.Thread(target=return_pressed, args=(self,)))) # Triggers data function thread on enter
         
         self.dlbutton = QtWidgets.QPushButton("Download")
-        self.softwareList = QListWidget()
-        self.post_author_list = QListWidget()
         self.libraryList = QListWidget()
 
         self.emptyResults = QLabel("No Results")
@@ -103,14 +108,24 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.emptyLibrary = QLabel("No items in library.")
         self.emptyDownload = QLabel("No items in downloads.")
         self.progressbar = QProgressBar()
+        self.qtablewidget = QTableWidget()
+
+        self.qtablewidget.setColumnCount(2)
+        self.qtablewidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.qtablewidget.verticalHeader().setVisible(False)
+        self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
+        self.qtablewidget.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch)
+        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):
@@ -152,9 +167,11 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.downloadList.horizontalHeader().setStretchLastSection(False)
         self.downloadList.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch)
         self.downloadList.setSelectionBehavior(QTableView.SelectRows)
+        self.downloadList.setAttribute(Qt.WA_TranslucentBackground)
+        self.downloadList.viewport().setAttribute(Qt.WA_TranslucentBackground)
 
         # 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)
@@ -163,13 +180,14 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.tabs = QTabWidget()
 
         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.horizontal_layout.addWidget(self.qtablewidget)
         
-        self.tab1 = create_tab("Search", self.searchbar, self.softwareList, self.tabs, self.dlbutton, self.horizontal_layout)
+        self.tab1 = create_tab("Search", self.searchbar, self.qtablewidget, self.tabs, self.dlbutton, self.horizontal_layout)
         self.tab2 = create_tab("Library", self.emptyLibrary, self.libraryList, self.tabs, None, None)
         self.tab3 = create_tab("Downloads", self.emptyDownload, self.downloadList, self.tabs, None, None)
+        
+        
 
         containerLayout.addWidget(self.tabs)
 
@@ -223,8 +241,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
     def show_empty_results(self, show: bool):
         if show:
-            self.softwareList.hide()
+            self.qtablewidget.hide()
             self.emptyResults.show()
         else:
             self.emptyResults.hide()
-            self.softwareList.show()
+            self.qtablewidget.show()

core/interface/utils/searchhelper.py

@@ -1,3 +1,4 @@
+from PySide6.QtWidgets import QTableWidgetItem
 from core.data.scrapers.uztracker import scrape_uztracker
 from core.data.scrapers.rutracker import scrape_rutracker
 from core.data.scrapers.monkrus import scrape_monkrus_telegram
@@ -17,20 +18,24 @@ def return_pressed(self):
         response = scrape_uztracker(search_text)
         if response:
             state.post_titles, state.post_urls = response
-            self.softwareList.clear()
+            self.qtablewidget.clear()
             if state.post_titles and len(state.post_titles) > 0:
-                self.softwareList.addItems(state.post_titles)
+                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)
-                self.post_author_list.clear()
             else:
                 if state.debug:
                     print(f"No Results for {search_text}")
-                self.softwareList.clear()
+                self.qtablewidget.clear()
                 self.show_empty_results(True)
         else:
             if state.debug:
                 print(f"No response from uztracker")
-            self.softwareList.clear()
+            self.qtablewidget.clear()
             self.show_empty_results(True)
     
     elif state.tracker == "rutracker":
@@ -40,21 +45,24 @@ def return_pressed(self):
             if state.posts == []:
                 if state.debug:
                     print(f"No Results for {search_text}")
-                self.softwareList.clear()
+                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"Response Cached: {cached}")
         else:
             if state.debug:
                 print(f"No response from rutracker")
-            self.softwareList.clear()
+            self.qtablewidget.clear()
             self.show_empty_results(True)
 
     elif state.tracker == "m0nkrus":
@@ -63,12 +71,15 @@ def return_pressed(self):
         if state.posts == []:
             if state.debug:
                 print(f"No Results for {search_text}")
-            self.softwareList.clear()
+            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))

core/utils/config/config.py

@@ -6,8 +6,8 @@ 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}",
-                         "version": f"{state.version}"}
+    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}", 
+                         "ignore_updates": f"{state.ignore_updates}"}
 
     if platform.system() == "Windows":
             config_dir = os.environ.get("APPDATA", os.path.expanduser("~\\AppData\\Roaming"))
@@ -42,4 +42,4 @@ def read_config():
     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.version = config.get("General", "version")
+    state.ignore_updates = config.getboolean("General", "ignore_updates")

core/utils/config/settings.py

@@ -1,39 +1,19 @@
 from core.utils.data.state import state
+from core.utils.general.shutdown import kill_aria2server
 from .config import create_config
 
 def restart_aria2c():
     import main # had to do this because of circle import :(
     import signal
     import atexit
-    import time
+    kill_aria2server()
+    state.aria2process.wait()
+    state.aria2process = main.run_aria2server()
+    signal.signal(signal.SIGINT, main.keyboardinterrupthandler)
+    atexit.unregister(kill_aria2server)
+    atexit.register(kill_aria2server)
 
-    try:
-        main.kill_aria2server()
-    except Exception as e:
-        print(f"Warning: aria2server kill failed: {e}")
-
-    try:
-        if state.aria2process:
-            state.aria2process.wait(timeout=3)
-    except Exception as e:
-        print(f"Warning: aria2process wait failed: {e}")
-
-    time.sleep(0.5)
-
-    try:
-        state.aria2process = main.run_aria2server()
-    except Exception as e:
-        print(f"Error: failed to restart aria2server: {e}")
-        return
-
-    try:
-        signal.signal(signal.SIGINT, main.keyboardinterrupthandler)
-        atexit.unregister(main.kill_aria2server)
-        atexit.register(main.kill_aria2server)
-    except Exception as e:
-        print(f"Warning: signal/atexit setup failed: {e}")
-
-def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_path=None, speed_limit=None, version=None):
+def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_path=None, speed_limit=None):
     if thread_count is not None:
         state.aria2_threads = thread_count
     if apiurl is not None:
@@ -42,8 +22,6 @@ def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_p
         state.download_path = download_path
     if speed_limit is not None:
         state.speed_limit = speed_limit
-    if version is not None:
-        state.version = version
     
     create_config()
     restart_aria2c()

core/utils/data/state.py

@@ -10,6 +10,7 @@ class AppState:
     post_author: List[str]
     downloads: List[str]
     version: str
+    ignore_updates: bool = False
     debug: bool = False
     tracker: str = "rutracker"
     api_url: str = "https://api.michijackson.xyz"

core/utils/network/update_checker.py

@@ -16,13 +16,21 @@ def check_for_updates():
     latest_version = latest_release["name"]
     assets = latest_release["assets"]
 
-    if latest_version != state.version:
-        print(f"New release available: {latest_version}")
+
+    if state.version == "dev":
+        if state.debug:
+            print("Dev release detected, skipping version check")
+            return None, None
+    elif latest_version != state.version:
+        if state.debug:
+            print(f"New release available: {latest_version}")
         if assets:
-            print("Assets:")
-            for asset in assets:
-                print(f" - {asset['name']}: {asset['browser_download_url']}")
+            if state.debug:
+                print("Assets:")
+                for asset in assets:
+                    print(f" - {asset['name']}: {asset['browser_download_url']}")
             return assets, latest_version
     else:
-        print("Already up-to-date.")
+        if state.debug:
+            print("Already up-to-date.")
         return None, None