fix updater

QTableWidget

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,8 +15,11 @@ from PySide6.QtWidgets import (
     QProgressBar,
     QHeaderView,
     QMessageBox,
+    QTableWidget,
+    QTableWidgetItem
     )
-from PySide6.QtGui import QIcon, QAction, QCloseEvent
+
+from PySide6.QtGui import QIcon, QAction, QCloseEvent, QPalette
 import darkdetect
 import threading
 import platform
@@ -56,24 +59,24 @@ def download_update(latest_version):
 class MainWindow(QtWidgets.QMainWindow, QWidget):
     def __init__(self):
         super().__init__()
-        searchresults = []
 
         # 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 +92,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 +104,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 +163,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 +176,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)
 
@@ -184,9 +198,9 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.tracker_list.activated.connect(self.set_tracker)
 
         if darkdetect.isDark():
-            settings_action = QAction(QIcon("core/interface/assets/settings_dark.png"), "Settings", self)
+            settings_action = QAction(QIcon("core/interface/assets/settings_white.png"), "Settings", self)
         else:
-            settings_action = QAction(QIcon("core/interface/assets/settings.png"), "Settings", self)
+            settings_action = QAction(QIcon("core/interface/assets/settings_black.png"), "Settings", self)
 
         settings_action.triggered.connect(lambda: settings_dialog(self))
         toolbar.addAction(settings_action)
@@ -223,8 +237,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

@@ -7,7 +7,7 @@ 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}"}
+                         "version": f"{state.version}", "ignore_updates": f"{state.ignore_updates}"}
 
     if platform.system() == "Windows":
             config_dir = os.environ.get("APPDATA", os.path.expanduser("~\\AppData\\Roaming"))
@@ -43,3 +43,4 @@ def read_config():
     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,37 +1,17 @@
 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
-
-    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}")
+    kill_aria2server()
+    state.aria2process.wait()
+    state.aria2process = main.run_aria2server()
+    signal.signal(signal.SIGINT, main.keyboardinterrupthandler)
+    atexit.unregister(kill_aria2server)
+    atexit.register(kill_aria2server)
 
 def save_settings(thread_count=None, close=lambda: None, apiurl=None, download_path=None, speed_limit=None, version=None):
     if thread_count is not None:

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

@@ -0,0 +1,36 @@
+import requests
+from core.utils.data.state import state
+
+def check_for_updates():
+    url = f"https://api.github.com/repos/KeksPirates/SoftwareManager/releases"
+    response = requests.get(url)
+
+    if response.status_code != 200:
+        print(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":
+        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:
+            if state.debug:
+                print("Assets:")
+                for asset in assets:
+                    print(f" - {asset['name']}: {asset['browser_download_url']}")
+            return assets, latest_version
+    else:
+        if state.debug:
+            print("Already up-to-date.")
+        return None, None