diff --git a/src/core/data/scrapers/monkrus.py b/src/core/data/scrapers/monkrus.py index 34fb5e7..7acac5e 100644 --- a/src/core/data/scrapers/monkrus.py +++ b/src/core/data/scrapers/monkrus.py @@ -1,7 +1,6 @@ from bs4 import BeautifulSoup import requests import time -from core.utils.general.logs import consoleLog cache = { "data": [], diff --git a/src/core/data/scrapers/rutracker.py b/src/core/data/scrapers/rutracker.py index 6eee669..873290a 100644 --- a/src/core/data/scrapers/rutracker.py +++ b/src/core/data/scrapers/rutracker.py @@ -1,6 +1,6 @@ import requests from core.utils.data.state import state -from core.utils.general.logs import consoleLog +from core.utils.logs.logs import consoleLog def scrape_rutracker(search_text): diff --git a/src/core/data/scrapers/uztracker.py b/src/core/data/scrapers/uztracker.py index e32adb9..745e5ee 100644 --- a/src/core/data/scrapers/uztracker.py +++ b/src/core/data/scrapers/uztracker.py @@ -2,7 +2,7 @@ import requests import threading from bs4 import BeautifulSoup from core.utils.data.state import state -from core.utils.general.logs import consoleLog +from core.utils.logs.logs import consoleLog from core.utils.general.wrappers import run_thread diff --git a/src/core/interface/dialogs/settings.py b/src/core/interface/dialogs/settings.py index 0126f88..923c474 100644 --- a/src/core/interface/dialogs/settings.py +++ b/src/core/interface/dialogs/settings.py @@ -1,6 +1,6 @@ from core.utils.config.settings import save_settings from core.utils.data.state import state -from core.utils.general.logs import consoleLog +from core.utils.logs.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 diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py index 6f61d1e..9e36a63 100644 --- a/src/core/interface/gui.py +++ b/src/core/interface/gui.py @@ -30,7 +30,7 @@ import time import sys import json import base64 -from core.utils.general.logs import consoleLog, remove_download_log, flush_log_buffer +from core.utils.logs.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 diff --git a/src/core/interface/utils/searchhelper.py b/src/core/interface/utils/searchhelper.py index af499b1..6cc2d2e 100644 --- a/src/core/interface/utils/searchhelper.py +++ b/src/core/interface/utils/searchhelper.py @@ -1,5 +1,5 @@ from PySide6.QtWidgets import QTableWidgetItem -from core.utils.general.logs import consoleLog +from core.utils.logs.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 diff --git a/src/core/network/interface.py b/src/core/network/interface.py index 8845d9b..9148b47 100644 --- a/src/core/network/interface.py +++ b/src/core/network/interface.py @@ -1,4 +1,4 @@ -from core.utils.general.logs import consoleLog +from core.utils.logs.logs import consoleLog from core.utils.data.state import state import psutil diff --git a/src/core/network/libtorrent_int.py b/src/core/network/libtorrent_int.py index 89751a2..010e363 100644 --- a/src/core/network/libtorrent_int.py +++ b/src/core/network/libtorrent_int.py @@ -4,7 +4,7 @@ from core.network.interface import get_interface_ip import threading import libtorrent as lt from core.utils.data.state import state -from core.utils.general.logs import consoleLog +from core.utils.logs.logs import consoleLog global loop_running diff --git a/src/core/network/libtorrent_misc.py b/src/core/network/libtorrent_misc.py index 3760796..64334b1 100644 --- a/src/core/network/libtorrent_misc.py +++ b/src/core/network/libtorrent_misc.py @@ -1,6 +1,6 @@ from core.utils.data.state import state -from core.utils.general.logs import update_download_completed_by_hash -from core.utils.general.logs import consoleLog +from core.utils.logs.logs import update_download_completed_by_hash +from core.utils.logs.logs import consoleLog from plyer import notification import libtorrent as lt import time diff --git a/src/core/network/libtorrent_wrapper.py b/src/core/network/libtorrent_wrapper.py index f383cb9..9ae0adc 100644 --- a/src/core/network/libtorrent_wrapper.py +++ b/src/core/network/libtorrent_wrapper.py @@ -1,4 +1,4 @@ -from core.utils.general.logs import consoleLog +from core.utils.logs.logs import consoleLog from core.network.libtorrent_int import add_download def add_magnet(uri): diff --git a/src/core/utils/config/settings.py b/src/core/utils/config/settings.py index 5550cd2..6150187 100644 --- a/src/core/utils/config/settings.py +++ b/src/core/utils/config/settings.py @@ -1,6 +1,6 @@ from core.network.libtorrent_int import update_settings from core.utils.data.state import state -from core.utils.general.logs import consoleLog +from core.utils.logs.logs import consoleLog from .config import create_config diff --git a/src/core/utils/data/tracker.py b/src/core/utils/data/tracker.py index 02d8e2f..0d028a2 100644 --- a/src/core/utils/data/tracker.py +++ b/src/core/utils/data/tracker.py @@ -1,7 +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.logs.logs import consoleLog from core.utils.network.jsonhandler import format_data diff --git a/src/core/utils/general/loghandler.py b/src/core/utils/logs/loghandler.py similarity index 91% rename from src/core/utils/general/loghandler.py rename to src/core/utils/logs/loghandler.py index f064e00..b1eea29 100644 --- a/src/core/utils/general/loghandler.py +++ b/src/core/utils/logs/loghandler.py @@ -1,4 +1,4 @@ -from core.utils.general.logs import consoleLog +from core.utils.logs.logs import consoleLog from core.utils.network.download import run_download_direct def split_data(data): diff --git a/src/core/utils/general/logs.py b/src/core/utils/logs/logs.py similarity index 100% rename from src/core/utils/general/logs.py rename to src/core/utils/logs/logs.py diff --git a/src/core/utils/network/download.py b/src/core/utils/network/download.py index 4863f34..7880909 100644 --- a/src/core/utils/network/download.py +++ b/src/core/utils/network/download.py @@ -1,10 +1,10 @@ from core.utils.data.state import state -from core.utils.general.logs import consoleLog +from core.utils.logs.logs import consoleLog from core.utils.data.tracker import get_item_url from core.utils.data.tracker import get_magnet_link from core.network.libtorrent_wrapper import add_download from core.utils.general.wrappers import run_thread -from core.utils.general.logs import add_download_log +from core.utils.logs.logs import add_download_log import threading diff --git a/src/core/utils/network/jsonhandler.py b/src/core/utils/network/jsonhandler.py index 724972e..bd8805f 100644 --- a/src/core/utils/network/jsonhandler.py +++ b/src/core/utils/network/jsonhandler.py @@ -32,4 +32,4 @@ def format_data_m0nkrus(data): -# https://open.spotify.com/track/70vjXI7oBou5buTtgiJeRW?si=25640cc4243c4bf3 +# https://open.spotify.com/track/0F0fMcIdL2FmcC9eYqwazX diff --git a/src/core/utils/network/update_checker.py b/src/core/utils/network/update_checker.py index 708f317..d6c1a6a 100644 --- a/src/core/utils/network/update_checker.py +++ b/src/core/utils/network/update_checker.py @@ -1,6 +1,6 @@ import requests from core.utils.data.state import state -from core.utils.general.logs import consoleLog +from core.utils.logs.logs import consoleLog def check_for_updates(): url = f"https://api.github.com/repos/KeksPirates/SoftwareManager/releases" diff --git a/src/main.py b/src/main.py index f0f6e48..28418c5 100644 --- a/src/main.py +++ b/src/main.py @@ -1,13 +1,12 @@ from core.interface.gui import MainWindow from core.utils.data.state import state -from core.utils.general.logs import consoleLog +from core.utils.logs.logs import consoleLog from core.network.libtorrent_misc import send_notification, update_log -from core.utils.general.logs import get_download_logs +from core.utils.logs.logs import get_download_logs from core.utils.general.shutdown import closehelper, shutdown_event from core.utils.general.wrappers import run_thread -from core.utils.general.loghandler import split_data, check_completed +from core.utils.logs.loghandler import split_data, check_completed from core.network.interface import list_interfaces, init_interfaces -from core.network.libtorrent_int import update_bound_interface from core.utils.config.config import read_config from PySide6 import QtWidgets from PySide6.QtCore import Qt @@ -33,7 +32,7 @@ def run_gui(): widget.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) qdarktheme.setup_theme("auto", custom_colors={"background": "#00000000"}) - from core.utils.general.logs import set_main_window + from core.utils.logs.logs import set_main_window set_main_window(widget) widget.show() sys.exit(app.exec())