mirror of
https://github.com/KeksPirates/SoftwareManager.git
synced 2026-08-03 17:39:42 +02:00
Merge pull request #45 from KeksPirates/feat/improve-code-quality
feat: improve code quality
This commit is contained in:
@@ -35,6 +35,7 @@ def scrape_gofile(url):
|
|||||||
|
|
||||||
link = temp[child[0]]["link"]
|
link = temp[child[0]]["link"]
|
||||||
return link, headers
|
return link, headers
|
||||||
except:
|
except Exception:
|
||||||
consoleLog("GoFile Authorisation failed, if the Issue persists, please open an Issue on GitHub")
|
consoleLog("GoFile Authorization failed, if the Issue persists, please open an Issue on GitHub")
|
||||||
|
return None
|
||||||
|
|
||||||
|
|||||||
+14
-14
@@ -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.trackerhoverdelegate import TrackerHoverDelegate
|
||||||
from core.interface.dialogs.elideditemdelegate import ElidedItemDelegate
|
from core.interface.dialogs.elideditemdelegate import ElidedItemDelegate
|
||||||
from core.interface.dialogs.trackertable import _create_tracker_table
|
from core.interface.dialogs.trackertable import _create_tracker_table
|
||||||
from core.interface.dialogs.downloadlist import _create_download_list
|
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.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.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.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.interface.dialogs.image import Image
|
||||||
|
from core.utils.data.state import state
|
||||||
|
|
||||||
import core.interface.dialogs.hoverrowdelegate
|
import core.interface.dialogs.hoverrowdelegate
|
||||||
import core.interface.dialogs.contextmenu
|
import core.interface.dialogs.contextmenu
|
||||||
import core.interface.dialogs.update
|
import core.interface.dialogs.update
|
||||||
@@ -351,8 +351,8 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
|||||||
s = handle.status()
|
s = handle.status()
|
||||||
total_down += s.download_rate
|
total_down += s.download_rate
|
||||||
total_up += s.upload_rate
|
total_up += s.upload_rate
|
||||||
except Exception:
|
except Exception as e:
|
||||||
pass
|
consoleLog(f"Exception while updating speed label: {e}")
|
||||||
down_kb = total_down / 1024
|
down_kb = total_down / 1024
|
||||||
up_kb = total_up / 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"
|
down_text = f"{down_kb / 1024:.1f} MB/s" if down_kb > 1024 else f"{down_kb:.1f} kB/s"
|
||||||
|
|||||||
@@ -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.rutracker import init_rutracker
|
||||||
from core.data.scrapers.uztracker import init_uztracker
|
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.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
|
from core.utils.data.state import state
|
||||||
|
|
||||||
init_rutracker()
|
init_rutracker()
|
||||||
|
|||||||
@@ -134,14 +134,14 @@ class DirectDownloadHandle:
|
|||||||
"chunks": chunks_done
|
"chunks": chunks_done
|
||||||
}, f)
|
}, f)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
pass
|
consoleLog(f"Exception while saving download state: {e}")
|
||||||
|
|
||||||
def _clear_state(self):
|
def _clear_state(self):
|
||||||
if os.path.exists(self._state_file):
|
if os.path.exists(self._state_file):
|
||||||
try:
|
try:
|
||||||
os.remove(self._state_file)
|
os.remove(self._state_file)
|
||||||
except Exception:
|
except Exception as e:
|
||||||
pass
|
consoleLog(f"Exception while removing download state file: {e}")
|
||||||
|
|
||||||
|
|
||||||
def start(self):
|
def start(self):
|
||||||
@@ -444,5 +444,4 @@ class DirectDownloadHandle:
|
|||||||
raise RuntimeError(
|
raise RuntimeError(
|
||||||
f"Size mismatch: expected {format_size(expected_size)}, "
|
f"Size mismatch: expected {format_size(expected_size)}, "
|
||||||
f"got {format_size(actual_size)}"
|
f"got {format_size(actual_size)}"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
from core.utils.logging.logs import consoleLog
|
||||||
from urllib.parse import urlparse, unquote
|
from urllib.parse import urlparse, unquote
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
import requests
|
import requests
|
||||||
@@ -36,8 +37,8 @@ def detect_filename_from_headers(url: str, user_agent: str) -> Optional[str]:
|
|||||||
fname = parts[-1].strip().strip('"').strip("'")
|
fname = parts[-1].strip().strip('"').strip("'")
|
||||||
if fname:
|
if fname:
|
||||||
return fname
|
return fname
|
||||||
except Exception:
|
except Exception as e:
|
||||||
pass
|
consoleLog(f"Exception while retrieving filename from headers: {e}")
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def format_size(size_bytes: int) -> str:
|
def format_size(size_bytes: int) -> str:
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import time
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
|
|
||||||
global loop_running
|
|
||||||
loop_running = False
|
loop_running = False
|
||||||
|
|
||||||
def get_free_space_mb(dirname):
|
def get_free_space_mb(dirname):
|
||||||
@@ -103,7 +102,6 @@ def add_download(magnet_uri):
|
|||||||
magnetdl.save_path = state.download_path
|
magnetdl.save_path = state.download_path
|
||||||
download = state.dl_session.add_torrent(magnetdl)
|
download = state.dl_session.add_torrent(magnetdl)
|
||||||
else:
|
else:
|
||||||
download = None
|
|
||||||
state.dl_session.remove_torrent(handle)
|
state.dl_session.remove_torrent(handle)
|
||||||
consoleLog("Not enough free space to download this item.")
|
consoleLog("Not enough free space to download this item.")
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -37,8 +37,8 @@ def send_notification(shutdown_event):
|
|||||||
timeout=4
|
timeout=4
|
||||||
)
|
)
|
||||||
notified.add(magnet_uri)
|
notified.add(magnet_uri)
|
||||||
except Exception:
|
except Exception as e:
|
||||||
pass
|
consoleLog(f"Exception while sending notification: {e}")
|
||||||
time.sleep(5)
|
time.sleep(5)
|
||||||
|
|
||||||
def update_log(shutdown_event):
|
def update_log(shutdown_event):
|
||||||
@@ -59,8 +59,8 @@ def update_log(shutdown_event):
|
|||||||
info_hash = str(status.info_hash)
|
info_hash = str(status.info_hash)
|
||||||
update_download_completed_by_hash(info_hash, True)
|
update_download_completed_by_hash(info_hash, True)
|
||||||
updated.add(magnet_uri)
|
updated.add(magnet_uri)
|
||||||
except Exception:
|
except Exception as e:
|
||||||
pass
|
consoleLog(f"Exception while updating log file: {e}")
|
||||||
time.sleep(5)
|
time.sleep(5)
|
||||||
|
|
||||||
def check_deleted_files(shutdown_event):
|
def check_deleted_files(shutdown_event):
|
||||||
@@ -79,6 +79,6 @@ def check_deleted_files(shutdown_event):
|
|||||||
consoleLog(f"Registered File Deletion: {status.name}")
|
consoleLog(f"Registered File Deletion: {status.name}")
|
||||||
state.dl_session.remove_torrent(magnetdl)
|
state.dl_session.remove_torrent(magnetdl)
|
||||||
del state.active_downloads[magnet_uri]
|
del state.active_downloads[magnet_uri]
|
||||||
except Exception:
|
except Exception as e:
|
||||||
pass
|
consoleLog(f"Exception while checking for file deletions: {e}")
|
||||||
time.sleep(5)
|
time.sleep(5)
|
||||||
@@ -15,6 +15,7 @@ def get_magnet_link(post_url):
|
|||||||
return magnet_link['href']
|
return magnet_link['href']
|
||||||
else:
|
else:
|
||||||
consoleLog("Magnet Link not Found!")
|
consoleLog("Magnet Link not Found!")
|
||||||
|
return None
|
||||||
except requests.RequestException as e:
|
except requests.RequestException as e:
|
||||||
consoleLog(f"Failed to fetch {post_url}: {e}")
|
consoleLog(f"Failed to fetch {post_url}: {e}")
|
||||||
return None
|
return None
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
from core.utils.logging.logs import consoleLog
|
||||||
from core.utils.data.state import state
|
from core.utils.data.state import state
|
||||||
import os
|
import os
|
||||||
|
|
||||||
@@ -6,8 +7,8 @@ def closehelper():
|
|||||||
try:
|
try:
|
||||||
from core.network.libtorrent_misc import cleanup_session
|
from core.network.libtorrent_misc import cleanup_session
|
||||||
cleanup_session()
|
cleanup_session()
|
||||||
except Exception:
|
except Exception as e:
|
||||||
pass
|
consoleLog(f"Exception while cleaning up LibTorrent Session: {e}")
|
||||||
|
|
||||||
def force_exit():
|
def force_exit():
|
||||||
os._exit(0)
|
os._exit(0)
|
||||||
@@ -247,8 +247,8 @@ def flush_log_buffer(): # credits to claude
|
|||||||
for log_entry in state.log_buffer:
|
for log_entry in state.log_buffer:
|
||||||
MainWindow.add_log(log_entry)
|
MainWindow.add_log(log_entry)
|
||||||
state.log_buffer = []
|
state.log_buffer = []
|
||||||
except Exception:
|
except Exception as e:
|
||||||
pass
|
consoleLog(f"Exception while flushing log buffer: {e}")
|
||||||
|
|
||||||
def consoleLog(text, printAnyways = False):
|
def consoleLog(text, printAnyways = False):
|
||||||
now = datetime.now()
|
now = datetime.now()
|
||||||
|
|||||||
Reference in New Issue
Block a user