refactor: rename scraping functions for consistency and improve data handling

src/core/data/scrapers/monkrus.py

@@ -57,7 +57,7 @@ def _get_telegram_posts():
 
     return(posts)
 
-def scrape_monkrus_telegram(query):
+def scrape_m0nkrus(query):
     posts = _get_telegram_posts()
     filtered_posts = []
 

src/core/data/scrapers/rutracker.py

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

src/core/data/scrapers/uztracker.py

@@ -1,83 +1,43 @@
 import requests
 import threading
 from bs4 import BeautifulSoup
+from urllib.parse import urljoin
 from core.utils.data.state import state
 from core.utils.logging.logs import consoleLog
 from core.utils.general.wrappers import run_thread
 
-
+def scrape_uztracker(query):
-global url_uztracker
+    base_url="https://uztracker.net/"
-url_uztracker = "https://uztracker.net/tracker.php?nm="
+    search_url = f"{base_url.rstrip('/')}/tracker.php?nm={query}"
-
-def init_uztracker():
-    global up
-    global soup
-    try:
-        response = requests.get(url_uztracker, timeout=10)
-        if response.status_code == 200:
-            up = True
-        else:
-            up = False
-            consoleLog(f"Uztracker seems down, status code: {response.status_code}")
-    except requests.exceptions.RequestException as e:
-        consoleLog(f"Request Exception on {url_uztracker}:")
-        consoleLog(str(e))
-        consoleLog("Is the Site down?")
-        up = False
-
-run_thread(threading.Thread(target=init_uztracker))
-
-def scrape_uztracker(search):
-    if up:
-        search_url = url_uztracker + search
     consoleLog(search_url)
-        result = False
+    posts = []
-        global results
-        global resulttitles
-        results = []
-        resulttitles = []
 
     try:
-            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
+                title = link.b.text
-                    results.append(link['href'])
+                url = urljoin(base_url, link['href'])
-                    resulttitles.append(link.b.text)
-                    result = True
 
-            if result:
+                author_link = link.find_parent('td').find('a', class_="med ts-text")
-                return resulttitles, results
+                author = author_link.text.strip() if author_link else "Unknown"
 
-            if not result:
+                posts.append(dict(
-                # add popup in gui for no result
+                    title=title,
-                return None
+                    url=url,
+                    author=author
+                ))
+
+        return posts
 
     except requests.RequestException as e:
-            if result:
+        if posts:
             consoleLog(f"Failed to fetch {search_url}: {e}")
         return None
-    else:
-        consoleLog("Error: Uztracker down")
-        return None, None
-
-def get_post_title(post_url):
-    if up:
-        response = requests.get(post_url)
-        soup = BeautifulSoup(response.text, 'html.parser')
-        maintitle = soup.find(class_='tt-text')
-        if maintitle:
-            return maintitle.text
-        else:
-            consoleLog("Program not found")
-    else:
-        consoleLog("Error: Uztracker down")
-        return None   
-
 
 
 

src/core/interface/gui.py

@@ -157,7 +157,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
             header = table.horizontalHeader()
             header.setSectionResizeMode(0, QHeaderView.ResizeMode.Stretch) 
             header.setSectionResizeMode(1, QHeaderView.ResizeMode.Fixed)   
-            header.resizeSection(1, 500)
+            header.resizeSection(1, 200)
             header.setStretchLastSection(False)
 
             return table

src/core/interface/utils/searchhelper.py

@@ -2,10 +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.monkrus import scrape_m0nkrus
-from core.utils.network.jsonhandler import split_data, format_data, format_data_m0nkrus
+from core.utils.network.jsonhandler import split_data, format_data, format_data_minimal
 from core.utils.data.state import state
 
+scrapers = {
+    "uztracker": scrape_uztracker,
+    "rutracker": scrape_rutracker,
+    "m0nkrus": scrape_m0nkrus
+}
+
 def return_pressed(self):
     search_text = self.searchbar.text()
     if search_text == "":
@@ -13,29 +19,7 @@ def return_pressed(self):
         return
     consoleLog(f"User searched for: {search_text}")
     
-    if state.tracker == "uztracker":
+    if state.tracker == "rutracker":
-        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":
         response = scrape_rutracker(search_text)
         if response:
             _, state.posts, _, _, cached = split_data(response)
@@ -64,15 +48,14 @@ def return_pressed(self):
             state.tracker_list[state.tracker].clear()
             self.show_empty_results(True)
 
-    elif state.tracker == "m0nkrus":
+    elif state.tracker is not None:
-        state.posts = scrape_monkrus_telegram(search_text)
+        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"])

src/core/utils/network/jsonhandler.py

@@ -20,12 +20,12 @@ def format_data(data):
 
     return post_titles, post_links, post_author, post_seeders, post_leechers
 
-def format_data_m0nkrus(data): 
+def format_data_minimal(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]
 
-    return post_titles, post_links, post_author
+    return  post_author, post_titles, post_links