fix settings icon not showing up

.github/workflows/dev.yml

@@ -25,14 +25,14 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            artifact_name: SoftwareManager-dev-${{ github.sha }}-linux
+            artifact_name: SoftwareManager-dev-linux
-            asset_name: SoftwareManager-dev-${{ github.sha }}-linux
+            asset_name: SoftwareManager-dev-linux
           - os: windows-latest
-            artifact_name: SoftwareManager-dev-${{ github.sha }}-windows.exe
+            artifact_name: SoftwareManager-dev-windows.exe
-            asset_name: SoftwareManager-dev-${{ github.sha }}-windows.exe
+            asset_name: SoftwareManager-dev-windows.exe
           - os: macos-latest
-            artifact_name: SoftwareManager-dev-${{ github.sha }}-macos
+            artifact_name: SoftwareManager-dev-macos
-            asset_name: SoftwareManager-dev-${{ github.sha }}-macos
+            asset_name: SoftwareManager-dev-macos
 
     runs-on: ${{ matrix.os }}
 
@@ -121,23 +121,22 @@ jobs:
       - 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-linux
-          cp artifacts/ubuntu-latest-build/SoftwareManager-dev-*-linux release/SoftwareManager-dev-${SHORT_SHA}-linux
+          cp artifacts/windows-latest-build/SoftwareManager-dev-windows.exe release/SoftwareManager-dev-windows.exe
-          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-macos
-          cp artifacts/macos-latest-build/SoftwareManager-dev-*-macos release/SoftwareManager-dev-${SHORT_SHA}-macos
+          chmod +x release/SoftwareManager-dev-linux release/SoftwareManager-dev-macos
-          chmod +x release/SoftwareManager-dev-*-linux release/SoftwareManager-dev-*-macos
           ls -la release/
 
-      - name: Create Prerelease (Public)
+      - 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
+          prerelease: false
           files: |
-            release/SoftwareManager-dev-${{ steps.version.outputs.short_sha }}-linux
+            release/SoftwareManager-dev-linux
-            release/SoftwareManager-dev-${{ steps.version.outputs.short_sha }}-windows.exe
+            release/SoftwareManager-dev-windows.exe
-            release/SoftwareManager-dev-${{ steps.version.outputs.short_sha }}-macos
+            release/SoftwareManager-dev-macos
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

core/data/scrapers/monkrus.py

@@ -0,0 +1,41 @@
+from bs4 import BeautifulSoup
+import requests
+
+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/uztracker.py

@@ -28,29 +28,23 @@ async def init_uztracker():
 
 asyncio.run(init_uztracker())
 
-async def scrape_uztracker(search, max_results=450):
+def scrape_uztracker(search):
     if up:
+        search_url = url_uztracker + search
+        if state.debug:
+            print(search_url)
         result = False
         global results
         global resulttitles
         results = []
         resulttitles = []
 
-        per_page = 50
-
-        for start in range(0, max_results, per_page):
-            search_url = url_uztracker + search + f"&start={start}"
-            if state.debug:
-                print(search_url)
-
-            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
+            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
@@ -58,25 +52,22 @@ async def scrape_uztracker(search, max_results=450):
                     resulttitles.append(link.b.text)
                     result = True
 
-                        if resultCount == 0:
+            if result:
-                            # add popup in gui for no result
+                return resulttitles, results
-                            break
 
-                except aiohttp.ClientError as e:
+            if not result:
+                # add popup in gui for no result
+                return None
+
+        except requests.RequestException as e:
             if result and state.debug:
                 print(f"Failed to fetch {search_url}: {e}")
             return None
-
     else:
         if state.debug:
             print("Error: Uztracker down")
         return None, None
 
-        if not results:
-            return None, None
-
-        return resulttitles, results
-
 def get_post_title(post_url):
     if up:
         response = requests.get(post_url)

core/interface/gui.py

@@ -14,26 +14,67 @@ from PySide6.QtWidgets import (
     QTabWidget,
     QProgressBar,
     QHeaderView,
+    QMessageBox,
     )
 from PySide6.QtGui import QIcon, QAction, QCloseEvent
 import darkdetect
 import threading
+import platform
+import requests as r
+import os
+import subprocess
+import time
+import sys
+from core.utils.config.settings import save_settings
 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.network.update_checker import check_for_updates
 from core.utils.general.shutdown import closehelper
 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
 
+def download_update(latest_version):
+    filename = "SoftwareManager-dev-windows.exe"
+    url = "https://github.com/KeksPirates/SoftwareManager/releases/latest/download/SoftwareManager-dev-windows.exe"
 
+    print("Downloading update...")
+    if os.path.exists(filename):
+        os.remove(filename)
+    response = r.get(url, allow_redirects=True)
+    with open(filename, "wb") as f:
+        f.write(response.content)
+    if not os.path.exists(filename):
+        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 = []
 
+        # Check for updates on Windows
+        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)
+
+                response = msg.exec_()
+                if response == QMessageBox.Ok:
+                    download_update(latest_version)
+
         self.setWindowTitle("Software Manager")
         self.setGeometry(100, 100, 800, 600)
 
@@ -139,14 +180,13 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         toolbar.setLayoutDirection(Qt.RightToLeft)
         
         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)
 
-
         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)

core/interface/utils/searchhelper.py

@@ -1,6 +1,6 @@
-import asyncio
 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
 
@@ -12,22 +12,34 @@ def return_pressed(self):
         return
     if state.debug:
         print("User searched for:", search_text)
+    
     if state.tracker == "uztracker":
-            response = asyncio.run(scrape_uztracker(search_text))
+        response = scrape_uztracker(search_text)
-        if state.tracker == "rutracker":
+        if response:
+            state.post_titles, state.post_urls = response
+            self.softwareList.clear()
+            if state.post_titles and len(state.post_titles) > 0:
+                self.softwareList.addItems(state.post_titles)
+                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.show_empty_results(True)
+        else:
+            if state.debug:
+                print(f"No response from uztracker")
+            self.softwareList.clear()
+            self.show_empty_results(True)
+    
+    elif state.tracker == "rutracker":
         response = scrape_rutracker(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)
             if state.posts == []:
                 if state.debug:
-                    print(f"No Results found for \"{search_text}\"")
+                    print(f"No Results for {search_text}")
                 self.softwareList.clear()
                 self.show_empty_results(True)
             else:
@@ -39,4 +51,24 @@ def return_pressed(self):
                 self.softwareList.addItems(state.post_titles)
                 if state.debug == True:
                     print(f"Response Cached: {cached}")
+        else:
+            if state.debug:
+                print(f"No response from rutracker")
+            self.softwareList.clear()
+            self.show_empty_results(True)
 
+    elif state.tracker == "m0nkrus":
+        state.posts = scrape_monkrus_telegram(search_text)
+
+        if state.posts == []:
+            if state.debug:
+                print(f"No Results for {search_text}")
+            self.softwareList.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)

core/utils/config/config.py

@@ -3,11 +3,11 @@ 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}", "aria2_threads": f"{state.aria2_threads}", "download_path": f"{state.download_path}", f"speed_limit": f"{state.speed_limit}",
+                         "version": f"{state.version}"}
 
     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")

core/utils/config/settings.py

@@ -5,18 +5,45 @@ def restart_aria2c():
     import main # had to do this because of circle import :(
     import signal
     import atexit
+    import time
+
+    try:
         main.kill_aria2server()
-    state.aria2process.wait()
+    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, close, apiurl, download_path, speed_limit):
+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:
         state.aria2_threads = thread_count
+    if apiurl is not None:
         state.api_url = apiurl
+    if download_path is not None:
         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

@@ -9,6 +9,7 @@ class AppState:
     post_urls: List[str]
     post_author: List[str]
     downloads: List[str]
+    version: str
     debug: bool = False
     tracker: str = "rutracker"
     api_url: str = "https://api.michijackson.xyz"
@@ -19,4 +20,4 @@ class AppState:
     aria2p: Any = None
     aria2_threads: int = 4
 
-state = AppState(posts=[], post_titles=[], post_urls=[], post_author=[], downloads=[], download_path="")
+state = AppState(posts=[], post_titles=[], post_urls=[], post_author=[], downloads=[], download_path="", version="")

core/utils/data/tracker.py

@@ -19,6 +19,12 @@ def get_item_url(item, posts, post_titles): # softwarelist currentitem, post lis
                 if state.debug: 
                     print("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])
+                if state.debug: 
+                    print("Found post URL: ", post_links[0])
+                return post_links[0]
 
         return None
 

core/utils/network/update_checker.py

@@ -0,0 +1,28 @@
+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 latest_version != state.version:
+        print(f"New release available: {latest_version}")
+        if assets:
+            print("Assets:")
+            for asset in assets:
+                print(f" - {asset['name']}: {asset['browser_download_url']}")
+            return assets, latest_version
+    else:
+        print("Already up-to-date.")
+        return None, None

main.py

@@ -2,7 +2,7 @@ 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.shutdown import closehelper, shutdown_event
 from core.utils.general.wrappers import run_thread
 from core.utils.config.config import read_config
 from PySide6 import QtWidgets
@@ -14,12 +14,10 @@ import argparse
 import sys
 
 
-
 parser = argparse.ArgumentParser()
 parser.add_argument("--debug", action="store_true") 
 args = parser.parse_args()
 
-
 def run_gui():
     app = QtWidgets.QApplication([])
     if darkdetect.isDark: