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

core/data/scrapers/rutracker.py

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

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/dialogs/settings.py

@@ -1,6 +1,9 @@
 from core.utils.config.settings import save_settings
 from core.utils.data.state import state
 from core.utils.general.logs import consoleLog
+from core.interface.utils.tabhelper import general_tab
+from core.interface.utils.tabhelper import paths_tab
+from core.interface.utils.tabhelper import network_tab
 from PySide6 import QtWidgets
 from PySide6.QtWidgets import (
     QLineEdit, 
@@ -13,6 +16,8 @@ from PySide6.QtWidgets import (
     QSpinBox,
     QCheckBox,
     QFileDialog,
+    QComboBox,
+    QTabWidget,
 )
 import platform
 
@@ -22,10 +27,9 @@ def settings_dialog(self):
         consoleLog("Settings dialog opened")
         dialog = QDialog(self)
         dialog.setWindowTitle("Settings")
-        dialog.setFixedSize(800, 550)
+        dialog.setFixedSize(700, 450)
 
         dialog.setLayout(QVBoxLayout())
-        dialog.layout().addWidget(QLabel("Settings"))
 
         def close_settings():
             dialog.reject()
@@ -56,9 +60,7 @@ def settings_dialog(self):
 
         autoresume_layout.addStretch()
         autoresume_checkbox.setChecked(state.autoresume)
-        autoresume_checkbox.toggled.connect(lambda checked: setattr(state, 'autoresume', checked))
         autoresume_layout.addWidget(autoresume_checkbox)
-        dialog.layout().addWidget(autoresume_container)
 
 
         # transparent window checkbox
@@ -73,7 +75,6 @@ def settings_dialog(self):
         transparent_window_checkbox.setChecked(state.window_transparency)
         transparent_window_checkbox.toggled.connect(lambda checked: setattr(state, 'window_transparency', checked))
         transparent_window_layout.addWidget(transparent_window_checkbox)
-        dialog.layout().addWidget(transparent_window_container)
 
         ##################
         # SERVER SETTING #
@@ -88,7 +89,6 @@ def settings_dialog(self):
         api_url_container.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
         api_url_container.setLayout(api_url_layout)
         api_url.setText(state.api_url)
-        dialog.layout().addWidget(api_url_container)
 
         #################
         # DOWNLOAD PATH #
@@ -103,7 +103,6 @@ def settings_dialog(self):
         download_path_container.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
         download_path_container.setLayout(download_path_layout)
         download_path.setText(state.download_path)
-        dialog.layout().addWidget(download_path_container)
 
         def browse_download_path():
             dir_path = QFileDialog.getExistingDirectory(dialog, "Select Download Directory", state.download_path)
@@ -127,7 +126,6 @@ def settings_dialog(self):
         image_path_container.setSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
         image_path_container.setLayout(image_path_layout)
         image_path.setText(state.image_path)
-        dialog.layout().addWidget(image_path_container)
 
         def browse_image_path():
             file_path = QFileDialog.getOpenFileName(dialog, "Select Image File", state.image_path, "Image Files (*.png *.jpg)")[0]
@@ -154,7 +152,6 @@ def settings_dialog(self):
         down_speed_limit_layout.addWidget(down_speed_limit)
         down_speed_limit.setFixedWidth(180)
         down_speed_limit.setFixedHeight(30)
-        dialog.layout().addWidget(down_speed_limit_container)
 
         up_speed_limit_container = QWidget()
         up_speed_limit_layout = QHBoxLayout()
@@ -168,7 +165,6 @@ def settings_dialog(self):
         up_speed_limit_layout.addWidget(up_speed_limit)
         up_speed_limit.setFixedWidth(180)
         up_speed_limit.setFixedHeight(30)
-        dialog.layout().addWidget(up_speed_limit_container)
 
         ######################
         # CONNECTION CONFIGS #
@@ -186,7 +182,6 @@ def settings_dialog(self):
         max_connections_layout.addWidget(max_connections)
         max_connections.setFixedWidth(180)
         max_connections.setFixedHeight(30)
-        dialog.layout().addWidget(max_connections_container)
 
         ####################
         # DOWNLOAD CONFIGS #
@@ -204,7 +199,34 @@ def settings_dialog(self):
         max_downloads_layout.addWidget(max_downloads)
         max_downloads.setFixedWidth(180)
         max_downloads.setFixedHeight(30)
-        dialog.layout().addWidget(max_downloads_container)
+
+        #####################
+        # INTERFACE BINDING #
+        #####################
+
+        interface_container = QWidget()
+        interface_layout = QHBoxLayout()
+
+        interface_label = QLabel("Network Interface:")
+        interface_layout.addWidget(interface_label)
+        interface_select = QComboBox()
+        interface_select.addItems(["None"] + state.interfaces)
+
+        target = state.bound_interface if state.bound_interface else "None"
+
+        index = interface_select.findText(target)
+        if index >= 0:
+            interface_select.setCurrentIndex(index)
+        else:
+            interface_select.setCurrentIndex(0)
+
+        interface_select.setFixedWidth(180)
+        interface_select.setFixedHeight(30)
+        interface_select.setFixedWidth(180)
+        interface_select.setFixedHeight(30)
+        interface_layout.addWidget(interface_select)
+        interface_container.setLayout(interface_layout)
+
 
         ###############
         # SAVE/CANCEL #
@@ -214,12 +236,28 @@ def settings_dialog(self):
 
         save_btn = QPushButton("Save")
         cancel_btn = QPushButton("Cancel")
-        save_btn.clicked.connect(lambda: save_settings(close_settings, api_url.text(), download_path.text(), down_speed_limit.value(), up_speed_limit.value(), image_path.text(), None, max_connections.value(), max_downloads.value()))
+        save_btn.clicked.connect(lambda: save_settings(
+            close_settings, 
+            api_url.text(), 
+            download_path.text(), 
+            down_speed_limit.value(), 
+            up_speed_limit.value(), 
+            image_path.text(), 
+            autoresume_checkbox.isChecked(), 
+            max_connections.value(), 
+            max_downloads.value(), 
+            interface_select.currentText()))
 
         cancel_btn.clicked.connect(dialog.reject)
         layout.addWidget(cancel_btn)
         layout.addWidget(save_btn)
 
+        self.tabs = QTabWidget()
+        self.tab1 = general_tab("General", autoresume_container, update_checkbox_container, transparent_window_container, self.tabs)
+        self.tab2 = paths_tab("Paths", download_path_container, image_path_container, self.tabs)
+        self.tab3 = network_tab("Network", interface_container, max_connections_container, max_downloads_container, up_speed_limit_container, down_speed_limit_container, api_url_container, self.tabs)
+
+        dialog.layout().addWidget(self.tabs)
         dialog.layout().addLayout(layout)
 
         dialog.exec()

core/interface/gui.py

@@ -29,7 +29,7 @@ import libtorrent as lt
 import time
 import sys
 import json
-from core.utils.general.logs import consoleLog, remove_download_log
+from core.utils.general.logs import consoleLog, remove_download_log, flush_log_buffer
 from core.utils.general.wrappers import run_thread
 from core.utils.data.state import state
 from core.utils.network.download import download_selected
@@ -150,13 +150,15 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.consoleLog = QTextEdit()
         self.progressbar = QProgressBar()
 
+        flush_log_buffer()
+
         # 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"])
 
         
 
@@ -360,7 +362,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
 
         # Tabs
         self.tabs = QTabWidget()
-        self.tabs = QTabWidget()
         self.tabs.setStyleSheet("""
             QTabBar::tab {
                 font-size: 11px;
@@ -382,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/interface/utils/tabhelper.py

@@ -15,3 +15,42 @@ def create_tab(title, searchbar, software_list, tabs, dlbutton, layout2):
     tab.setLayout(layout)
     tabs.addTab(tab, title) 
     return tab
+
+#################
+# SETTINGS TABS #
+#################
+def general_tab(title, autoresume, update_checkbox, transparent_window, tabs):
+    tab = QWidget()
+    layout = QVBoxLayout()
+    layout.addWidget(autoresume)
+    layout.addWidget(update_checkbox)
+    layout.addWidget(transparent_window)
+    layout.addStretch()
+    tab.setLayout(layout)
+    tabs.addTab(tab, title)
+    return tab
+
+def paths_tab(title, download_path, image_path, tabs):
+    tab = QWidget()
+    layout = QVBoxLayout()
+    layout.addWidget(download_path)
+    layout.addWidget(image_path)
+    layout.addStretch()
+    tab.setLayout(layout)
+    tabs.addTab(tab, title)
+    return tab
+    
+
+def network_tab(title, network_interface, max_connections, max_downloads, up_speed_limit, down_speed_limit, api_url, tabs):
+    tab = QWidget()
+    layout = QVBoxLayout()
+    layout.addWidget(network_interface)
+    layout.addWidget(max_connections)
+    layout.addWidget(max_downloads)
+    layout.addWidget(up_speed_limit)
+    layout.addWidget(down_speed_limit)
+    layout.addWidget(api_url)
+    layout.addStretch()
+    tab.setLayout(layout)
+    tabs.addTab(tab, title)
+    return tab

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}",
-        "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":
@@ -49,16 +56,22 @@ def read_config():
 
     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/config/settings.py

@@ -4,7 +4,7 @@ from core.utils.general.logs import consoleLog
 from .config import create_config
 
 
-def save_settings(close=lambda: None, apiurl=None, download_path=None, down_speed_limit=None, up_speed_limit=None, image_path=None, autoresume=None, max_connections=None, max_downloads=None):
+def save_settings(close=lambda: None, apiurl=None, download_path=None, down_speed_limit=None, up_speed_limit=None, image_path=None, autoresume=None, max_connections=None, max_downloads=None, bound_interface=None):
     if apiurl is not None:
         state.api_url = apiurl
     if download_path is not None:
@@ -21,6 +21,8 @@ def save_settings(close=lambda: None, apiurl=None, download_path=None, down_spee
         state.max_connections = max_connections
     if max_downloads is not None:
         state.max_downloads = max_downloads
+    if bound_interface is not None:
+        state.bound_interface = None if bound_interface == "None" else bound_interface
     
 
     update_settings()

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/general/logs.py

@@ -6,6 +6,8 @@ import json
 import os
 import re
 
+_log_buffer = []
+
 
 def add_download_log(title, url, magnet_uri, completed) -> DownloadList:
     downloads_file = os.path.join(state.settings_path, "downloads.json")
@@ -189,15 +191,28 @@ def set_main_window(window):
     global _main_window
     _main_window = window
 
+def flush_log_buffer(): # credits to claude
+    global _log_buffer
+    if _log_buffer:
+        try:
+            from core.interface.gui import MainWindow
+            for log_entry in _log_buffer:
+                MainWindow.add_log(log_entry)
+            _log_buffer = []
+        except Exception:
+            pass
+
 def consoleLog(text, printAnyways = False):
     now = datetime.now()
     current_time = now.strftime("%H:%M:%S")
+    formatted_text = f"[{current_time}] {text}"
 
     try:
         from core.interface.gui import MainWindow
-        MainWindow.add_log(f"[{current_time}] {text}")
+        MainWindow.add_log(formatted_text)
     except Exception:
-        pass
+        global _log_buffer
+        _log_buffer.append(formatted_text)
     
     if state.debug or printAnyways:
-        print(f"[{current_time}] {text}")
+        print(formatted_text)

core/utils/network/jsonhandler.py

@@ -15,9 +15,21 @@ 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]
 
     return post_titles, post_links, post_author
 
 
 
+
+
+
 # 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,23 +42,26 @@ 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("Started check_completed thread")
+    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))
-    consoleLog("Started send_notification thread")
+    consoleLog("Started Thread: send_notification")
     run_thread(threading.Thread(target=update_log, args=(shutdown_event,), daemon=True))
-    consoleLog("Started update_log thread")
+    consoleLog("Started Thread: update_log")
     run_thread(threading.Thread(target=check_completed, args=(downloads, state.autoresume)))
-    consoleLog("Launching GUI")
+    consoleLog("Started Thread: check_completed")
+    elapsed = time.perf_counter() - start_time
+    consoleLog(f"Initialization completed in {elapsed:.2f}s. Launching GUI")
     run_gui()
 

test.py

@@ -1,35 +0,0 @@
-import psutil
-
-addrs = psutil.net_if_addrs()
-stats = psutil.net_if_stats()
-
-
-def get_active_interfaces():
-    active = []
-
-    for interface, addr_list in addrs.items():
-        up = stats[interface].isup
-        for addr in addr_list:
-            if addr.family == 2: # ipv4
-                ipv4 = addr.address
-                if not ipv4.startswith("127.") and not ipv4.startswith("169.254") and up == True:
-                    print(f'"{interface}": True')
-                    active.append(interface)
-    print(active)
-    return active
-
-
-
-print(list(addrs.keys()))
-
-# print(addrs)
-# print()
-# sigmer = list()
-
-
-
-# for interface in stats.keys():
-#     print(f"{interface}: UP = {stats[interface].isup}")
-#     sigmer.append(f"{interface}: {stats[interface].isup}")
-
-# print(sigmer)