merged upstream

src/core/interface/gui.py

@@ -18,7 +18,7 @@ from PySide6.QtWidgets import (
     QStyledItemDelegate,
 )
 
-from PySide6.QtGui import QIcon, QCloseEvent, QImage, QPixmap, QContextMenuEvent
+from PySide6.QtGui import QIcon, QCloseEvent, QImage, QPixmap, QContextMenuEvent, QGuiApplication
 import darkdetect
 import threading
 import platform
@@ -67,6 +67,9 @@ def download_update(latest_version):
     sys.exit(0)
 
 
+def windowCloseHelper():
+    QGuiApplication.quit()
+    
 class MainWindow(QtWidgets.QMainWindow, QWidget):
     log_signal = Signal(str)  # Thread-safe signal for logging
     
@@ -506,12 +509,12 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         event.accept()
 
     def set_tracker(self, _):
+        old_tracker = state.tracker
         state.tracker = self.tracker_list.currentText()
 
-        while self.horizontal_layout.count():
-            item = self.horizontal_layout.takeAt(0)
-            if item.widget():
-                item.widget().setParent(None)
+        old_widget = state.tracker_list[old_tracker]
+        self.horizontal_layout.removeWidget(old_widget)
+        old_widget.setParent(None)
 
         tracker_widget = state.tracker_list[state.tracker]
         self.horizontal_layout.addWidget(tracker_widget)

src/core/interface/utils/searchhelper.py

@@ -2,12 +2,16 @@ from PySide6.QtWidgets import QTableWidgetItem
 from core.utils.logging.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.data.scrapers.steamrip import scrape_steamrip_links, scrape_steamrip_game_downloads
-from core.utils.network.jsonhandler import split_data, format_data, format_data_m0nkrus
+from core.data.scrapers.monkrus import scrape_m0nkrus
 from core.utils.data.state import state
 import fuzzyfinder
 
+scrapers = {
+    "uztracker": scrape_uztracker,
+    "rutracker": scrape_rutracker,
+    "m0nkrus": scrape_m0nkrus
+}
+
 def return_pressed(self):
     search_text = self.searchbar.text()
     if search_text == "":
@@ -15,29 +19,7 @@ def return_pressed(self):
         return
     consoleLog(f"User searched for: {search_text}")
     
-    if state.tracker == "uztracker":
-        response = scrape_uztracker(search_text)
-        if response:
-            state.post_titles, state.post_urls = response
-            state.tracker_list[state.tracker].clear()
-            if state.post_titles and len(state.post_titles) > 0:
-                state.tracker_list[state.tracker].setHorizontalHeaderLabels(["Post Title", "Author"])
-                state.tracker_list[state.tracker].setRowCount(len(state.post_titles))
-                for i, author in enumerate(state.post_author):
-                    state.tracker_list[state.tracker].setItem(i, 1, QTableWidgetItem(author))
-                for i, title in enumerate(state.post_titles):
-                    state.tracker_list[state.tracker].setItem(i, 0, QTableWidgetItem(title))
-                self.show_empty_results(False)
-            else:
-                consoleLog(f"No Results for {search_text}")
-                state.tracker_list[state.tracker].clear()
-                self.show_empty_results(True)
-        else:
-            consoleLog(f"No response from uztracker")
-            state.tracker_list[state.tracker].clear()
-            self.show_empty_results(True)
-    
-    elif state.tracker == "rutracker":
+    if state.tracker == "rutracker":
         response = scrape_rutracker(search_text)
         if response:
             _, state.posts, _, _, cached = split_data(response)
@@ -66,15 +48,14 @@ def return_pressed(self):
             state.tracker_list[state.tracker].clear()
             self.show_empty_results(True)
 
-    elif state.tracker == "m0nkrus":
-        state.posts = scrape_monkrus_telegram(search_text)
-
+    elif state.tracker is not None:
+        state.posts = scrapers[state.tracker](search_text)
         if state.posts == []:
             consoleLog(f"No Results for {search_text}")
             state.tracker_list[state.tracker].clear()
             self.show_empty_results(True)
         else:
-            state.post_titles, _, state.post_author = format_data_m0nkrus(state.posts)
+            state.post_author, state.post_titles, state.post_urls = format_data_minimal(state.posts)
             self.show_empty_results(False)
             state.tracker_list[state.tracker].clear()
             state.tracker_list[state.tracker].setHorizontalHeaderLabels(["Post Title", "Author"])