From 9265a9cd1c9df7f930d00cd13a078f973d679665 Mon Sep 17 00:00:00 2001 From: Vxrtrauter <101264710+Vxrtrauter@users.noreply.github.com> Date: Mon, 9 Feb 2026 04:36:28 +0100 Subject: [PATCH] refactor: change init_uztracker to synchronous and update data formatting for m0nkrus --- core/data/scrapers/uztracker.py | 10 ++++++---- core/interface/utils/searchhelper.py | 4 ++-- core/utils/network/jsonhandler.py | 12 +++++++++++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/core/data/scrapers/uztracker.py b/core/data/scrapers/uztracker.py index e2bd45a..1210b61 100644 --- a/core/data/scrapers/uztracker.py +++ b/core/data/scrapers/uztracker.py @@ -1,14 +1,16 @@ import requests import asyncio +import threading from bs4 import BeautifulSoup from core.utils.data.state import state from core.utils.general.logs import consoleLog +from core.utils.general.wrappers import run_thread global url_uztracker url_uztracker = "https://uztracker.net/tracker.php?nm=" -async def init_uztracker(): +def init_uztracker(): global up global soup try: @@ -19,12 +21,12 @@ async def init_uztracker(): up = False consoleLog(f"Uztracker seems down, status code: {response.status_code}") except requests.exceptions.RequestException as e: - consoleLog(f"\nRequest Exception on {url_uztracker}:") + consoleLog(f"Request Exception on {url_uztracker}:") consoleLog(str(e)) - consoleLog("\nIs the Site down?") + consoleLog("Is the Site down?") up = False -asyncio.run(init_uztracker()) +run_thread(threading.Thread(target=init_uztracker)) def scrape_uztracker(search): if up: diff --git a/core/interface/utils/searchhelper.py b/core/interface/utils/searchhelper.py index 2b9a6cc..406cd89 100644 --- a/core/interface/utils/searchhelper.py +++ b/core/interface/utils/searchhelper.py @@ -3,7 +3,7 @@ from core.utils.general.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.utils.network.jsonhandler import split_data, format_data +from core.utils.network.jsonhandler import split_data, format_data, format_data_m0nkrus from core.utils.data.state import state def return_pressed(self): @@ -72,7 +72,7 @@ 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 = format_data_m0nkrus(state.posts) self.show_empty_results(False) self.qtablewidget.clear() self.qtablewidget.setHorizontalHeaderLabels(["Post Title", "Author"]) diff --git a/core/utils/network/jsonhandler.py b/core/utils/network/jsonhandler.py index 882f783..724972e 100644 --- a/core/utils/network/jsonhandler.py +++ b/core/utils/network/jsonhandler.py @@ -11,7 +11,7 @@ def split_data(data): return count, posts, query, success, cached -def format_data(data): +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] @@ -20,6 +20,16 @@ def format_data(data): return post_titles, post_links, post_author, post_seeders, post_leechers +def format_data_m0nkrus(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 + + + + # https://open.spotify.com/track/70vjXI7oBou5buTtgiJeRW?si=25640cc4243c4bf3