add console logging in gui, remove progress bar from gui, add new logging function, refactor all print statements to use new log function

core/utils/data/tracker.py

@@ -1,6 +1,7 @@
 import requests
 from bs4 import BeautifulSoup
 from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
 from core.utils.network.jsonhandler import format_data
 
 
@@ -10,20 +11,17 @@ def get_item_url(item, posts, post_titles): # softwarelist currentitem, post lis
         if 0 <= post_index < len(post_titles): 
             if state.tracker == "uztracker":
                 item = "https://uztracker.net/" + state.post_urls[post_index].lstrip("./")
-                if state.debug: 
-                    print("Found post URL: ", item)
+                consoleLog(f"Found post URL: {item}")
                 return item
             if state.tracker == "rutracker":                
                 item_dict = posts[post_index]
                 _, post_links, _ = format_data([item_dict])
-                if state.debug: 
-                    print("Found post URL: ", post_links[0])
+                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])
-                if state.debug: 
-                    print("Found post URL: ", post_links[0])
+                consoleLog(f"Found post URL: {post_links[0]}")
                 return post_links[0]
 
         return None
@@ -33,20 +31,16 @@ def get_item_url(item, posts, post_titles): # softwarelist currentitem, post lis
 def get_magnet_link(post_url):
     try:
         response = requests.get(post_url) # eventually impl. cloudscraper
-        if state.debug:
-            print("Sent Request to retrieve Magnet Link...")
+        consoleLog("Sent Request to retrieve Magnet Link...")
         response.raise_for_status()
         soup = BeautifulSoup(response.text, 'html.parser')
         magnet_link = soup.find('a', href=lambda x: x and x.startswith('magnet:'))
         if magnet_link:
-            if state.debug:
-                print("Magnet Link Retrieved: ", magnet_link['href'])
+            consoleLog(f"Magnet Link Retrieved: {magnet_link['href']}")
             return magnet_link['href']
         else:
-            if state.debug:
-                print("Magnet Link not Found!")
+            consoleLog("Magnet Link not Found!")
     except requests.RequestException as e:
-        if state.debug:
-            print(f"Failed to fetch {post_url}: {e}")
+        consoleLog(f"Failed to fetch {post_url}: {e}")
         return None
     

core/utils/general/loghandler.py

@@ -1,4 +1,5 @@
 from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
 from core.utils.network.download import run_download_direct
 
 def split_data(data):
@@ -11,12 +12,10 @@ def split_data(data):
 def check_completed(downloads, resume):
     for download in downloads:
         if download.completed == False:
-            if state.debug:
-                print(f"Found unfinished download: {download.title}")
+            consoleLog(f"Found unfinished download: {download.title}")
             if resume == True:
                 run_download_direct(download.magnet_uri)
-                if state.debug:
-                    print(f"Resuming {download.title}")
+                consoleLog(f"Resuming {download.title}")
 
             
 

core/utils/general/logs.py

@@ -21,8 +21,7 @@ def add_download_log(title, url, magnet_uri, completed) -> DownloadList:
     
 
     if any(d.magnet_uri == magnet_uri or d.url == url for d in downloads):
-        if state.debug:
-            print("Skipped Logging, download already in file")
+        consoleLog("Skipped Logging, download already in file")
         return DownloadList(data=downloads, count=len(downloads)) # thanks again claude (im stupid)
         
     
@@ -33,8 +32,7 @@ def add_download_log(title, url, magnet_uri, completed) -> DownloadList:
         completed=completed,
     ))
 
-    if state.debug:
-        print(f"Added {title} to Log File")
+    consoleLog(f"Added {title} to Log File")
     
     download_list = DownloadList(data=downloads, count=len(downloads))
     with open(downloads_file, "w") as file:
@@ -51,51 +49,45 @@ def update_download_completed(magnet_uri, completed) -> DownloadList:
                 existing_data = json.load(file)
                 downloads = [Download(**d) for d in existing_data.get("data", [])]
         except (json.JSONDecodeError, TypeError) as e:
-            if state.debug:
-                print(f"Error loading downloads.json: {e}")
+            consoleLog(f"Error loading downloads.json: {e}")
             downloads = []
     else:
         downloads = []
 
     identifier = (magnet_uri or "").strip()
     if state.debug:
-        print(f"Updating download completed for identifier: {identifier!r}")
-        print(f"Total downloads in file: {len(downloads)}")
+        consoleLog(f"Updating download completed for identifier: {identifier!r}")
+        consoleLog(f"Total downloads in file: {len(downloads)}")
         for i, d in enumerate(downloads):
             try:
                 mag = (getattr(d, 'magnet_uri', None) or '')[:50]
                 url = (getattr(d, 'url', None) or '')[:50]
-                print(f"  [{i}] magnet: {mag}... url: {url}...")
+                consoleLog(f"  [{i}] magnet: {mag}... url: {url}...")
             except Exception as e:
-                print(f"  [{i}] Error reading download: {e}")
+                consoleLog(f"  [{i}] Error reading download: {e}")
 
     found = False
     for download in downloads:
         try:
             stored_magnet = (getattr(download, 'magnet_uri', None) or "").strip()
             stored_url = (getattr(download, 'url', None) or "").strip()
-            if state.debug:
-                print(f"Comparing with magnet: {stored_magnet[:50] if stored_magnet else 'None'}...")
+            consoleLog(f"Comparing with magnet: {stored_magnet[:50] if stored_magnet else 'None'}...")
             if identifier and (stored_magnet == identifier or stored_url == identifier):
-                if state.debug:
-                    print(f"Match found! Setting completed={completed}")
+                consoleLog(f"Match found! Setting completed={completed}")
                 download.completed = completed
                 found = True
         except Exception as e:
-            if state.debug:
-                print(f"Error comparing download: {e}")
+            consoleLog(f"Error comparing download: {e}")
 
     if not found:
-        if state.debug:
-            print("No matching download found to update")
+        consoleLog("No matching download found to update")
         return DownloadList(data=downloads, count=len(downloads))
 
     download_list = DownloadList(data=downloads, count=len(downloads))
     with open(downloads_file, "w") as file:
         json.dump(asdict(download_list), file, indent=4)
     
-    if state.debug:
-        print("Updated download log")
+    consoleLog("Updated download log")
     
     return download_list
     
@@ -132,16 +124,14 @@ def update_download_completed_by_hash(info_hash, completed) -> DownloadList:
                 existing_data = json.load(file)
                 downloads = [Download(**d) for d in existing_data.get("data", [])]
         except (json.JSONDecodeError, TypeError) as e:
-            if state.debug:
-                print(f"Error loading downloads.json: {e}")
+            consoleLog(f"Error loading downloads.json: {e}")
             downloads = []
     else:
         downloads = []
 
     info_hash_upper = (info_hash or "").upper().strip()
-    if state.debug:
-        print(f"Updating download by hash: {info_hash_upper}")
-        print(f"Total downloads in file: {len(downloads)}")
+    consoleLog(f"Updating download by hash: {info_hash_upper}")
+    consoleLog(f"Total downloads in file: {len(downloads)}")
 
     found = False
     for download in downloads:
@@ -153,19 +143,33 @@ def update_download_completed_by_hash(info_hash, completed) -> DownloadList:
                     download.completed = completed
                     found = True
         except Exception as e:
-            if state.debug:
-                print(f"Error comparing download: {e}")
+            consoleLog(f"Error comparing download: {e}")
 
     if not found:
-        if state.debug:
-            print("No matching download found to update")
+        consoleLog("No matching download found to update")
         return DownloadList(data=downloads, count=len(downloads))
 
     download_list = DownloadList(data=downloads, count=len(downloads))
     with open(downloads_file, "w") as file:
         json.dump(asdict(download_list), file, indent=4)
     
-    if state.debug:
-        print("Updated download log")
+    consoleLog("Updated download log")
     
-    return download_list
+    return download_list
+
+
+_main_window = None
+
+def set_main_window(window):
+    global _main_window
+    _main_window = window
+
+def consoleLog(text):
+    try:
+        from core.interface.gui import MainWindow
+        MainWindow.add_log(text)
+    except Exception:
+        pass
+    
+    if state.debug:
+        print(text)

core/utils/general/shutdown.py

@@ -1,4 +1,5 @@
 from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
 import threading
 import psutil
 import sys
@@ -14,15 +15,13 @@ def kill_aria2server():
 
     if state.aria2process:
         state.aria2process.kill()
-        if state.debug:
-            print("Killed Aria2")
+        consoleLog("Killed Aria2")
             
     try:
         for proc in psutil.process_iter():
             if proc.name() == process:
                 proc.kill()
-                if state.debug:
-                    print(f"Killed Aria2c (PID {proc.pid})")
+                consoleLog(f"Killed Aria2c (PID {proc.pid})")
     except psutil.NoSuchProcess:
         pass
 

core/utils/network/download.py

@@ -1,4 +1,5 @@
 from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
 from core.utils.data.tracker import get_item_url
 from core.utils.data.tracker import get_magnet_link
 from core.network.aria2_wrapper import start_client
@@ -11,17 +12,14 @@ import threading
 
 def download_selected(item, posts, post_titles):
     if item is not None:
-        if state.debug:
-            print(f"Downloading {item.text()}")
+        consoleLog(f"Downloading {item.text()}")
         run_thread(threading.Thread(target=run_download, args=(item.text(), posts, post_titles)))
     else:
-        if state.debug:
-            print("No item selected for download.")
+        consoleLog("No item selected for download.")
 
 def run_download(item, posts, post_titles):
     post_url = get_item_url(item, posts, post_titles)
-    if state.debug:
-        print("Selected URL: ", post_url)
+    consoleLog(f"Selected URL: {post_url}")
     magnet_uri = get_magnet_link(post_url)
     start_client()
     add_download_log(item, post_url, magnet_uri, False)

core/utils/network/update_checker.py

@@ -1,12 +1,13 @@
 import requests
 from core.utils.data.state import state
+from core.utils.general.logs import consoleLog
 
 def check_for_updates():
     url = f"https://api.github.com/repos/KeksPirates/SoftwareManager/releases"
     response = requests.get(url)
 
     if response.status_code != 200:
-        print(f"Failed to fetch releases: {response.status_code}")
+        consoleLog(f"Failed to fetch releases: {response.status_code}")
         exit(1)
 
     releases = response.json()
@@ -18,21 +19,17 @@ def check_for_updates():
 
 
     if state.version == "dev":
-        if state.debug:
-            print("Dev release detected, skipping version check")
-            return None, None
+        consoleLog("Dev release detected, skipping version check")
+        return None, None
     elif latest_version != state.version:
-        if state.debug:
-            print(f"New release available: {latest_version}")
+        consoleLog(f"New release available: {latest_version}")
         if assets:
-            if state.debug:
-                print("Assets:")
-                for asset in assets:
-                    print(f" - {asset['name']}: {asset['browser_download_url']}")
+            consoleLog("Assets:")
+            for asset in assets:
+                consoleLog(f" - {asset['name']}: {asset['browser_download_url']}")
             return assets, latest_version
         else: 
             return None, None
     else:
-        if state.debug:
-            print("Already up-to-date.")
+        consoleLog("Already up-to-date.")
         return None, None