From 62b24c71118333ae5da3038d1ccad17a9576198e Mon Sep 17 00:00:00 2001 From: Vxrtrauter <101264710+Vxrtrauter@users.noreply.github.com> Date: Sun, 15 Mar 2026 23:01:02 +0100 Subject: [PATCH] feat: improve code quality by fixing typos, adding print statements to exception blocks, remove unused imports etc --- src/core/data/scrapers/provider/gofile.py | 5 ++-- src/core/interface/gui.py | 28 +++++++++++----------- src/core/interface/utils/searchhelper.py | 5 ++-- src/core/network/direct_download/handle.py | 9 ++++--- src/core/network/direct_download/utils.py | 5 ++-- src/core/network/libtorrent_int.py | 2 -- src/core/network/libtorrent_misc.py | 12 +++++----- src/core/utils/data/tracker.py | 1 + src/core/utils/general/shutdown.py | 5 ++-- src/core/utils/logging/logs.py | 4 ++-- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/core/data/scrapers/provider/gofile.py b/src/core/data/scrapers/provider/gofile.py index 08b7c39..48ebdf6 100644 --- a/src/core/data/scrapers/provider/gofile.py +++ b/src/core/data/scrapers/provider/gofile.py @@ -35,6 +35,7 @@ def scrape_gofile(url): link = temp[child[0]]["link"] return link, headers - except: - consoleLog("GoFile Authorisation failed, if the Issue persists, please open an Issue on GitHub") + except Exception: + consoleLog("GoFile Authorization failed, if the Issue persists, please open an Issue on GitHub") + return None diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py index 054ace1..11abcd6 100644 --- a/src/core/interface/gui.py +++ b/src/core/interface/gui.py @@ -1,23 +1,23 @@ -from core.utils.logging.logs import consoleLog, flush_log_buffer -from core.interface.assets.base64_icons import settings_white_base64 -from core.interface.assets.base64_icons import settings_black_base64 -from core.interface.utils.searchhelper import return_pressed -from core.interface.dialogs.settings import settings_dialog -from core.interface.assets.base64_icons import logo_base64 -from core.utils.network.download import download_selected -from core.interface.utils.tabhelper import create_tab -from core.utils.general.shutdown import closehelper -from core.utils.general.wrappers import run_thread -from core.utils.data.state import state - from core.interface.dialogs.trackerhoverdelegate import TrackerHoverDelegate from core.interface.dialogs.elideditemdelegate import ElidedItemDelegate from core.interface.dialogs.trackertable import _create_tracker_table from core.interface.dialogs.downloadlist import _create_download_list +from core.interface.assets.base64_icons import settings_white_base64 +from core.interface.assets.base64_icons import settings_black_base64 from core.interface.dialogs.downloadlist import download_list_update +from core.utils.logging.logs import consoleLog, flush_log_buffer from core.interface.dialogs.downloadmodel import DownloadModel +from core.interface.utils.searchhelper import return_pressed +from core.interface.dialogs.settings import settings_dialog +from core.interface.assets.base64_icons import logo_base64 from core.interface.dialogs.eventfilter import eventFilter +from core.utils.network.download import download_selected +from core.interface.utils.tabhelper import create_tab +from core.utils.general.shutdown import closehelper +from core.utils.general.wrappers import run_thread from core.interface.dialogs.image import Image +from core.utils.data.state import state + import core.interface.dialogs.hoverrowdelegate import core.interface.dialogs.contextmenu import core.interface.dialogs.update @@ -351,8 +351,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): s = handle.status() total_down += s.download_rate total_up += s.upload_rate - except Exception: - pass + except Exception as e: + consoleLog(f"Exception while updating speed label: {e}") down_kb = total_down / 1024 up_kb = total_up / 1024 down_text = f"{down_kb / 1024:.1f} MB/s" if down_kb > 1024 else f"{down_kb:.1f} kB/s" diff --git a/src/core/interface/utils/searchhelper.py b/src/core/interface/utils/searchhelper.py index 83a91b7..118d754 100644 --- a/src/core/interface/utils/searchhelper.py +++ b/src/core/interface/utils/searchhelper.py @@ -1,9 +1,8 @@ -from PySide6.QtWidgets import QTableWidgetItem, QHeaderView -from core.utils.logging.logs import consoleLog from core.data.scrapers.rutracker import init_rutracker from core.data.scrapers.uztracker import init_uztracker -from core.data.scrapers.monkrus import init_m0nkrus from core.data.scrapers.steamrip import init_steamrip +from core.data.scrapers.monkrus import init_m0nkrus +from core.utils.logging.logs import consoleLog from core.utils.data.state import state init_rutracker() diff --git a/src/core/network/direct_download/handle.py b/src/core/network/direct_download/handle.py index 759c0a2..4b4def6 100644 --- a/src/core/network/direct_download/handle.py +++ b/src/core/network/direct_download/handle.py @@ -134,14 +134,14 @@ class DirectDownloadHandle: "chunks": chunks_done }, f) except Exception as e: - pass + consoleLog(f"Exception while saving download state: {e}") def _clear_state(self): if os.path.exists(self._state_file): try: os.remove(self._state_file) - except Exception: - pass + except Exception as e: + consoleLog(f"Exception while removing download state file: {e}") def start(self): @@ -444,5 +444,4 @@ class DirectDownloadHandle: raise RuntimeError( f"Size mismatch: expected {format_size(expected_size)}, " f"got {format_size(actual_size)}" - ) - + ) \ No newline at end of file diff --git a/src/core/network/direct_download/utils.py b/src/core/network/direct_download/utils.py index a7b367e..238c6a7 100644 --- a/src/core/network/direct_download/utils.py +++ b/src/core/network/direct_download/utils.py @@ -1,3 +1,4 @@ +from core.utils.logging.logs import consoleLog from urllib.parse import urlparse, unquote from typing import Optional import requests @@ -36,8 +37,8 @@ def detect_filename_from_headers(url: str, user_agent: str) -> Optional[str]: fname = parts[-1].strip().strip('"').strip("'") if fname: return fname - except Exception: - pass + except Exception as e: + consoleLog(f"Exception while retrieving filename from headers: {e}") return None def format_size(size_bytes: int) -> str: diff --git a/src/core/network/libtorrent_int.py b/src/core/network/libtorrent_int.py index 4289620..b199bdd 100644 --- a/src/core/network/libtorrent_int.py +++ b/src/core/network/libtorrent_int.py @@ -10,7 +10,6 @@ import time import os -global loop_running loop_running = False def get_free_space_mb(dirname): @@ -103,7 +102,6 @@ def add_download(magnet_uri): magnetdl.save_path = state.download_path download = state.dl_session.add_torrent(magnetdl) else: - download = None state.dl_session.remove_torrent(handle) consoleLog("Not enough free space to download this item.") return False diff --git a/src/core/network/libtorrent_misc.py b/src/core/network/libtorrent_misc.py index d1aa39c..729809c 100644 --- a/src/core/network/libtorrent_misc.py +++ b/src/core/network/libtorrent_misc.py @@ -37,8 +37,8 @@ def send_notification(shutdown_event): timeout=4 ) notified.add(magnet_uri) - except Exception: - pass + except Exception as e: + consoleLog(f"Exception while sending notification: {e}") time.sleep(5) def update_log(shutdown_event): @@ -59,8 +59,8 @@ def update_log(shutdown_event): info_hash = str(status.info_hash) update_download_completed_by_hash(info_hash, True) updated.add(magnet_uri) - except Exception: - pass + except Exception as e: + consoleLog(f"Exception while updating log file: {e}") time.sleep(5) def check_deleted_files(shutdown_event): @@ -79,6 +79,6 @@ def check_deleted_files(shutdown_event): consoleLog(f"Registered File Deletion: {status.name}") state.dl_session.remove_torrent(magnetdl) del state.active_downloads[magnet_uri] - except Exception: - pass + except Exception as e: + consoleLog(f"Exception while checking for file deletions: {e}") time.sleep(5) \ No newline at end of file diff --git a/src/core/utils/data/tracker.py b/src/core/utils/data/tracker.py index 4def4c0..eed9bc3 100644 --- a/src/core/utils/data/tracker.py +++ b/src/core/utils/data/tracker.py @@ -15,6 +15,7 @@ def get_magnet_link(post_url): return magnet_link['href'] else: consoleLog("Magnet Link not Found!") + return None except requests.RequestException as e: consoleLog(f"Failed to fetch {post_url}: {e}") return None diff --git a/src/core/utils/general/shutdown.py b/src/core/utils/general/shutdown.py index 333cb4b..4d97978 100644 --- a/src/core/utils/general/shutdown.py +++ b/src/core/utils/general/shutdown.py @@ -1,3 +1,4 @@ +from core.utils.logging.logs import consoleLog from core.utils.data.state import state import os @@ -6,8 +7,8 @@ def closehelper(): try: from core.network.libtorrent_misc import cleanup_session cleanup_session() - except Exception: - pass + except Exception as e: + consoleLog(f"Exception while cleaning up LibTorrent Session: {e}") def force_exit(): os._exit(0) \ No newline at end of file diff --git a/src/core/utils/logging/logs.py b/src/core/utils/logging/logs.py index a3444db..036864b 100644 --- a/src/core/utils/logging/logs.py +++ b/src/core/utils/logging/logs.py @@ -247,8 +247,8 @@ def flush_log_buffer(): # credits to claude for log_entry in state.log_buffer: MainWindow.add_log(log_entry) state.log_buffer = [] - except Exception: - pass + except Exception as e: + consoleLog(f"Exception while flushing log buffer: {e}") def consoleLog(text, printAnyways = False): now = datetime.now()