feat: add seeders and leechers column in search results

core/data/scrapers/rutracker.py

@@ -4,7 +4,7 @@ from core.utils.general.logs import consoleLog
 
 
 def scrape_rutracker(search_text):
-    search = requests.get(f"{state.api_url}/search/{search_text}")
+    search = requests.get(f"{state.api_url}/search?q={search_text}")
     consoleLog("Sent request to server")
     if search:
         try:

core/interface/dialogs/settings.py

@@ -253,9 +253,9 @@ def settings_dialog(self):
         layout.addWidget(save_btn)
 
         self.tabs = QTabWidget()
-        self.tab1 = general_tab("General", autoresume_container, transparent_window_container, self.tabs)
+        self.tab1 = general_tab("General", autoresume_container, update_checkbox_container, transparent_window_container, self.tabs)
         self.tab2 = paths_tab("Paths", download_path_container, image_path_container, self.tabs)
-        self.tab3 = network_tab("Network", update_checkbox_container, interface_container, max_connections_container, max_downloads_container, up_speed_limit_container, down_speed_limit_container, api_url_container, self.tabs)
+        self.tab3 = network_tab("Network", interface_container, max_connections_container, max_downloads_container, up_speed_limit_container, down_speed_limit_container, api_url_container, self.tabs)
 
         dialog.layout().addWidget(self.tabs)
         dialog.layout().addLayout(layout)

core/interface/gui.py

@@ -155,10 +155,10 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         # Table Widget for Item List
         self.qtablewidget = QTableWidget()
         
-        self.qtablewidget.setColumnCount(2)
+        self.qtablewidget.setColumnCount(4)
         self.qtablewidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
         self.qtablewidget.verticalHeader().setVisible(False)
-        self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
+        self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author", "Seeders", "Leechers"])
 
         
 

core/interface/utils/searchhelper.py

@@ -44,15 +44,19 @@ def return_pressed(self):
                 self.qtablewidget.clear()
                 self.show_empty_results(True)
             else:
-                state.post_titles, _, state.post_author = format_data(state.posts)
+                state.post_titles, _, state.post_author, state.post_seeders, state.post_leechers = format_data(state.posts)
                 self.show_empty_results(False)
                 self.qtablewidget.clear()
-                self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"])
+                self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author", "Seeders", "Leechers"])
                 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))
+                for i, seeders in enumerate(state.post_seeders):
+                    self.qtablewidget.setItem(i, 2, QTableWidgetItem(seeders))
+                for i, leechers in enumerate(state.post_leechers):
+                    self.qtablewidget.setItem(i, 3, QTableWidgetItem(leechers))
                 if state.debug == True:
                     consoleLog(f"Response Cached: {cached}")
         else:

core/interface/utils/tabhelper.py

@@ -19,10 +19,11 @@ def create_tab(title, searchbar, software_list, tabs, dlbutton, layout2):
 #################
 # SETTINGS TABS #
 #################
-def general_tab(title, autoresume, transparent_window, tabs):
+def general_tab(title, autoresume, update_checkbox, transparent_window, tabs):
     tab = QWidget()
     layout = QVBoxLayout()
     layout.addWidget(autoresume)
+    layout.addWidget(update_checkbox)
     layout.addWidget(transparent_window)
     layout.addStretch()
     tab.setLayout(layout)
@@ -40,10 +41,9 @@ def paths_tab(title, download_path, image_path, tabs):
     return tab
     
 
-def network_tab(title, update_checkbox, network_interface, max_connections, max_downloads, up_speed_limit, down_speed_limit, api_url, tabs):
+def network_tab(title, network_interface, max_connections, max_downloads, up_speed_limit, down_speed_limit, api_url, tabs):
     tab = QWidget()
     layout = QVBoxLayout()
-    layout.addWidget(update_checkbox)
     layout.addWidget(network_interface)
     layout.addWidget(max_connections)
     layout.addWidget(max_downloads)

core/utils/data/state.py

@@ -11,6 +11,8 @@ class AppState(QObject):
         self.post_titles: List[str] = []
         self.post_urls: List[str] = []
         self.post_author: List[str] = []
+        self.post_seeders: List[str] = []
+        self.post_leechers: List[str] = []
         self.version: str = "dev"
         self._image_path: str = ""
         self.ignore_updates: bool = False

core/utils/network/jsonhandler.py

@@ -15,8 +15,10 @@ def format_data(data):
     post_author = [post["author"] for post in data]
     post_titles = [post["title"] for post in data]
     post_links = [post["url"] for post in data]
+    post_seeders = [post["seeders"] for post in data]
+    post_leechers = [post["leechers"] for post in data]
 
-    return post_titles, post_links, post_author
+    return post_titles, post_links, post_author, post_seeders, post_leechers