refactor: change init_uztracker to synchronous and update data formatting for m0nkrus

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:

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"])
 
         
 
@@ -383,16 +383,17 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
         if state.image_path is not None and os.path.exists(state.image_path):
             self.image = QImage(state.image_path)
+            self.image = self.image.scaledToWidth(300, Qt.SmoothTransformation)
             self.pixmap = QPixmap.fromImage(self.image)
             self.overlay_label = QLabel(self)
             self.overlay_label.setPixmap(self.pixmap)
             self.overlay_label.adjustSize()
             self.overlay_label.raise_()
 
-            offset_x = -1350
+            # offset_x = -1350
-            offset_y = -550
+            # offset_y = -550
-            x = self.width() - self.overlay_label.width() - offset_x
+            x = self.width() - self.overlay_label.width() # - offset_x
-            y = self.height() - self.overlay_label.height() - offset_y
+            y = self.height() - self.overlay_label.height() # - offset_y
             self.overlay_label.move(x, y)
         
         # temporarily disabled

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):
@@ -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:
@@ -68,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"])

core/utils/config/config.py

@@ -8,16 +8,23 @@ def create_config():
 
     config["General"] = {
         "debug": True,
+        "ignore_updates": f"{state.ignore_updates}",
+        "autoresume": f"{state.autoresume}",        
+        "window_transparency": f"{state.window_transparency}"
+    }
+
+    config["Network"] = {
         "api_url": f"{state.api_url}",
         "download_path": f"{state.download_path}",
         "download_speed_limit": f"{state.down_speed_limit}",
-        "upload_speed_limit": f"{state.up_speed_limit}", 
+        "upload_speed_limit": f"{state.up_speed_limit}",
-        "ignore_updates": f"{state.ignore_updates}",
-        "image_path": f"{state.image_path}",
-        "autoresume": f"{state.autoresume}",
         "max_connections": f"{state.max_connections}",
-        "max_downloads": f"{state.max_downloads}",
+        "max_downloads": f"{state.max_downloads}"
-        "window_transparency": f"{state.window_transparency}",
+    }
+
+    config["Paths"] = {
+        "bound_interface": f"{state.bound_interface}",
+        "image_path": f"{state.image_path}"
     }
 
     if platform.system() == "Windows":
@@ -48,17 +55,23 @@ def read_config():
         return
 
     config.read(config_file)
-
+    
+    # General
     state.debug = config.getboolean("General", "debug", fallback=state.debug)
-    state.api_url = config.get("General", "api_url", fallback=state.api_url)
-    state.download_path = config.get("General", "download_path", fallback=state.download_path)
-    state.down_speed_limit = config.getint("General", "download_speed_limit", fallback=state.down_speed_limit)
-    state.up_speed_limit = config.getint("General", "upload_speed_limit", fallback=state.up_speed_limit)
     state.ignore_updates = config.getboolean("General", "ignore_updates", fallback=state.ignore_updates)
-    state.image_path = config.get("General", "image_path", fallback=state.image_path)
     state.autoresume = config.getboolean("General", "autoresume", fallback=state.autoresume)
-    state.max_connections = config.getint("General", "max_connections", fallback=state.max_connections)
-    state.max_downloads = config.getint("General", "max_downloads", fallback=state.max_downloads)
     state.window_transparency = config.getboolean("General", "window_transparency", fallback=state.window_transparency)
 
+    # Network
+    state.api_url = config.get("Network", "api_url", fallback=state.api_url)
+    state.download_path = config.get("Network", "download_path", fallback=state.download_path)
+    state.down_speed_limit = config.getint("Network", "download_speed_limit", fallback=state.down_speed_limit)
+    state.up_speed_limit = config.getint("Network", "upload_speed_limit", fallback=state.up_speed_limit)
+    state.max_connections = config.getint("Network", "max_connections", fallback=state.max_connections)
+    state.max_downloads = config.getint("Network", "max_downloads", fallback=state.max_downloads)
+
+    # Paths
+    state.bound_interface = config.get("Paths", "bound_interface", fallback=state.bound_interface)
+    state.image_path = config.get("Paths", "image_path", fallback=state.image_path)
+    
     create_config()

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/data/tracker.py

@@ -15,12 +15,12 @@ def get_item_url(item, posts, post_titles): # softwarelist currentitem, post lis
                 return item
             if state.tracker == "rutracker":                
                 item_dict = posts[post_index]
-                _, post_links, _ = format_data([item_dict])
+                _, post_links, _, _, _ = format_data([item_dict])
                 consoleLog(f"Found post URL: {post_links[0]}")
                 return post_links[0]
             if state.tracker == "m0nkrus":                
                 item_dict = posts[post_index]
-                _, post_links, _ = format_data([item_dict])
+                _, post_links, _, _, _,= format_data([item_dict])
                 consoleLog(f"Found post URL: {post_links[0]}")
                 return post_links[0]
 

core/utils/network/jsonhandler.py

@@ -11,7 +11,16 @@ 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]
+    post_seeders = [post["seeders"] for post in data]
+    post_leechers = [post["leechers"] for post in 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]
@@ -20,4 +29,7 @@ def format_data(data):
 
 
 
+
+
+
 # https://open.spotify.com/track/70vjXI7oBou5buTtgiJeRW?si=25640cc4243c4bf3

main.py

@@ -17,6 +17,7 @@ import platform
 import signal
 import argparse
 import sys
+import time
 
 
 parser = argparse.ArgumentParser()
@@ -41,16 +42,17 @@ def keyboardinterrupthandler(signum, frame):
     closehelper()
 
 if __name__ == "__main__":
+    start_time = time.perf_counter()
     read_config()
     logs = get_download_logs()
-    count, downloads = split_data(logs)
+    _, downloads = split_data(logs)
     if args.debug:
         state.debug = args.debug # override of read_config
     signal.signal(signal.SIGINT, keyboardinterrupthandler)
     consoleLog("Starting SoftwareManager...")
     consoleLog("Fetching Network Interfaces...")
     list_interfaces()
-    consoleLog("Initialiting Interface variables...")
+    consoleLog("Initializing Interface variables...")
     init_interfaces()
     consoleLog(f"Current Bound: {state.bound_interface}")
     run_thread(threading.Thread(target=send_notification, args=(shutdown_event,), daemon=True))
@@ -59,6 +61,7 @@ if __name__ == "__main__":
     consoleLog("Started Thread: update_log")
     run_thread(threading.Thread(target=check_completed, args=(downloads, state.autoresume)))
     consoleLog("Started Thread: check_completed")
-    consoleLog("Launching GUI")
+    elapsed = time.perf_counter() - start_time
+    consoleLog(f"Initialization completed in {elapsed:.2f}s. Launching GUI")
     run_gui()