Refractor searchhelper to finally be readable, reverd uztracker scraper to old format since i didn't like it

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/utils/searchhelper.py

@@ -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,8 @@ 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)