merged upstream

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

@@ -2,9 +2,8 @@ import requests
 from core.utils.data.state import state
 from core.utils.logging.logs import consoleLog
 
-
-def scrape_rutracker(search_text):
-    search = requests.get(f"{state.api_url}/search?q={search_text}")
+def scrape_rutracker(query):
+    search = requests.get(f"{state.api_url}/search?q={query}")
     consoleLog("Sent request to server")
     if search:
         try:
@@ -12,10 +11,9 @@ def scrape_rutracker(search_text):
         except Exception:
             consoleLog("No results found / No response from server")
             return None
-
     else:
         return None
         
 
 
-# This function utilizes the SoftwareManager server - source code can be found under the "server" branch.
+# This function utilizes the SoftwareManager server - source code can be found under the SoftwareManager-Server repository.

src/core/data/scrapers/uztracker.py

@@ -1,83 +1,35 @@
 import requests
-import threading
 from bs4 import BeautifulSoup
-from core.utils.data.state import state
+from urllib.parse import urljoin
 from core.utils.logging.logs import consoleLog
-from core.utils.general.wrappers import run_thread
 
+def scrape_uztracker(query):
+    base_url="https://uztracker.net/"
+    search_url = f"{base_url.rstrip('/')}/tracker.php?nm={query}"
+    consoleLog(search_url)
+    posts = []
 
-global url_uztracker
-url_uztracker = "https://uztracker.net/tracker.php?nm="
-
-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
-        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
-                    results.append(link['href'])
-                    resulttitles.append(link.b.text)
-                    result = True
-
-            if result:
-                return resulttitles, results
-
-            if not result:
-                # add popup in gui for no result
-                return None
-
-        except requests.RequestException as e:
-            if result:
-                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)
+        response = requests.get(search_url)
+        response.raise_for_status()
         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   
+        links = soup.find_all('tr', class_="tCenter hl-tr", id=lambda x: x and x.startswith('tor_'))
+        for link in links:
 
-    
+            theme_link = link.find('a', class_="genmed tLink", href=lambda x: x and x.startswith('./viewtopic')) 
+            url = urljoin(base_url, theme_link['href'])
+            title = theme_link.b.text
+            author_link = link.find('a', class_="med")
+            author = author_link.text.strip() if author_link else "Unknown"
 
+            posts.append(dict(
+                title=title,
+                url=url,
+                author=author
+            ))
 
+        return posts
+
+    except requests.RequestException as e:
+        consoleLog(f"Failed to fetch {search_url}: {e}")
+        return None