refactor imports

src/core/data/scrapers/monkrus.py

@@ -1,5 +1,5 @@
-from core.utils.data.state import state
 from core.utils.data.tracker import get_magnet_link
+from core.utils.data.state import state
 from bs4 import BeautifulSoup
 from typing import Dict
 import requests

src/core/data/scrapers/provider/gofile.py

@@ -27,5 +27,5 @@ def scrape_gofile(url):
 
         return temp[child[0]]["link"]
     except:
-        consoleLog("gofile didnt auth you, either the api has changed\n or you sent to many requests, please try again later.\n If it still doesnt work please open an issue on Github.")
+        consoleLog("GoFile Authorisation failed, if the Issue persists, please open an Issue on GitHub")
 

src/core/data/scrapers/rutracker.py

@@ -1,9 +1,9 @@
-import requests
-from core.utils.data.state import state
-from core.utils.logging.logs import consoleLog
-from core.utils.data.tracker import get_magnet_link
 from core.utils.network.jsonhandler import split_data, format_data
+from core.utils.data.tracker import get_magnet_link
+from core.utils.logging.logs import consoleLog
+from core.utils.data.state import state
 from typing import Dict
+import requests
 
 def scrape_rutracker(query):
     search = requests.get(f"{state.api_url}/search?q={query}", timeout=15)

src/core/data/scrapers/steamrip.py

@@ -6,8 +6,9 @@ from bs4 import BeautifulSoup
 from typing import Dict
 import webbrowser
 import requests
-import re
 import time
+import re
+
 
 cache = {
     "data": [],

src/core/data/scrapers/uztracker.py

@@ -1,10 +1,10 @@
-import requests
+from core.utils.data.tracker import get_magnet_link
-from bs4 import BeautifulSoup
-from urllib.parse import urljoin
 from core.utils.logging.logs import consoleLog
 from core.utils.data.state import state
-from core.utils.data.tracker import get_magnet_link
+from urllib.parse import urljoin
+from bs4 import BeautifulSoup
 from typing import Dict
+import requests
 
 
 def scrape_uztracker(query):

src/core/interface/dialogs/settings.py

@@ -1,12 +1,12 @@
-from core.utils.config.settings import save_settings
-from core.utils.data.state import state
-from core.utils.logging.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 core.utils.config.settings import save_settings
+from core.interface.utils.tabhelper import paths_tab
 from core.interface.utils.svghelper import svg_icon
-from PySide6 import QtWidgets
+from core.utils.logging.logs import consoleLog
+from core.utils.data.state import state
 from PySide6.QtCore import Qt, QSize
+from PySide6 import QtWidgets
 from PySide6.QtWidgets import (
     QLineEdit, 
     QPushButton, 
@@ -21,6 +21,7 @@ from PySide6.QtWidgets import (
     QComboBox,
     QTabWidget,
 )
+
 import platform
 
 SVG_FOLDER = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M2 6c0-1.1.9-2 2-2h5l2 2h7c1.1 0 2 .9 2 2v10c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6z" fill="{color}"/></svg>'

src/core/interface/gui.py

@@ -989,7 +989,6 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                 return
             magnet_link = list(state.active_downloads.keys())[row]
             magnetdl = state.active_downloads[magnet_link]
-
         try:
             status = magnetdl.status()
             save_path = status.save_path
@@ -1000,9 +999,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                 state.active_downloads.pop(magnet_link, None)
             remove_download_log(magnet_link)
             return
-
         download_path = os.path.join(save_path, torrent_name)
-
         confirm = QMessageBox.question(
             self, "Delete Files",
             f"Are you sure you want to delete the downloaded files of '{torrent_name}'? This action cannot be undone.",
@@ -1012,23 +1009,29 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
             with state.downloads_lock:
                 state.active_downloads.pop(magnet_link, None)
             remove_download_log(magnet_link)
-
             if state.dl_session:
                 try:
                     state.dl_session.remove_torrent(magnetdl)
+                    time.sleep(0.5)
                 except Exception:
                     pass
-
             if download_path and os.path.exists(download_path):
-                try:
+                import shutil
-                    if os.path.isfile(download_path):
+                last_error = None
-                        os.remove(download_path)
+                for attempt in range(3):
+                    try:
+                        if os.path.isfile(download_path):
+                            os.remove(download_path)
+                        else:
+                            shutil.rmtree(download_path)
                         consoleLog(f"Deleted files for: {torrent_name}", True)
-                    else:
+                        last_error = None
-                        import shutil
+                        break
-                        shutil.rmtree(download_path)
+                    except Exception as e:
-                        consoleLog(f"Deleted files for: {torrent_name}", True)
+                        last_error = e
-                except Exception as e:
+                        if attempt < 2:
-                    consoleLog(f"Error deleting files: {e}", True)
+                            time.sleep(0.5)
+                if last_error:
+                    consoleLog(f"Error deleting files: {last_error}", True)
             else:
                 consoleLog(f"Removed entry (files not found): {torrent_name}", True)

src/core/network/direct_download/handle.py

@@ -1,17 +1,17 @@
-import os
+from core.utils.logging.logs import consoleLog, update_download_completed
-import threading
-import requests
-import json
-import hashlib
-import time
 from concurrent.futures import ThreadPoolExecutor, as_completed
+from .status import DirectDownloadStatus, ChunkSpec
+from core.utils.data.state import state
+from .utils import format_size
 from typing import Optional
 import libtorrent as lt
+import threading
+import requests
+import hashlib
+import json
+import time
+import os
 
-from core.utils.logging.logs import consoleLog, update_download_completed
-from core.utils.data.state import state
-from .status import DirectDownloadStatus, ChunkSpec
-from .utils import format_size
 
 class SimpleThrottler:
     def __init__(self):

src/core/network/direct_download/status.py

@@ -1,8 +1,8 @@
-import threading
-import time
 from dataclasses import dataclass
 from typing import Optional
 import libtorrent as lt
+import threading
+import time
 
 
 @dataclass

src/core/network/direct_download/utils.py

@@ -1,7 +1,7 @@
-import os
-import requests
-from typing import Optional
 from urllib.parse import urlparse, unquote
+from typing import Optional
+import requests
+import os
 
 def sanitize_filename(name: str) -> str:
     # Remove or replace dangerous characters

src/core/network/libtorrent_int.py

@@ -1,13 +1,13 @@
-import time
+from core.network.interface import get_interface_ip
-import os
+from core.utils.general.wrappers import run_thread
+from core.utils.logging.logs import consoleLog
+from core.utils.data.state import state
+import libtorrent as lt
+import threading
 import platform
 import ctypes
-from core.utils.general.wrappers import run_thread
+import time
-from core.network.interface import get_interface_ip
+import os
-import threading
-import libtorrent as lt
-from core.utils.data.state import state
-from core.utils.logging.logs import consoleLog
 
 
 global loop_running

src/core/network/libtorrent_misc.py

@@ -1,10 +1,10 @@
-from core.utils.data.state import state
 from core.utils.logging.logs import update_download_completed_by_hash
 from core.utils.logging.logs import consoleLog
+from core.utils.data.state import state
 from plyer import notification
 import libtorrent as lt
-import os
 import time
+import os
 
 
 def cleanup_session():

src/core/network/libtorrent_wrapper.py

@@ -1,5 +1,6 @@
-from core.utils.logging.logs import consoleLog
 from core.network.libtorrent_int import add_download
+from core.utils.logging.logs import consoleLog
+
 
 def add_magnet(uri):
     if uri is not None and uri.startswith("magnet:?"):  

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.logging.logs import consoleLog
+from core.utils.data.state import state
 from .config import create_config
 
 

src/core/utils/data/state.py

@@ -1,8 +1,8 @@
-import threading
 from PySide6.QtCore import QObject, Signal
 from PySide6.QtWidgets import QTableWidget
 from typing import Any, List, Dict
 from pathlib import Path
+import threading
 
 class AppState(QObject):
     image_changed = Signal(str)

src/core/utils/data/tracker.py

@@ -1,6 +1,6 @@
-import requests
-from bs4 import BeautifulSoup
 from core.utils.logging.logs import consoleLog
+from bs4 import BeautifulSoup
+import requests
 
 
 def get_magnet_link(post_url):

src/core/utils/logging/loghandler.py

@@ -1,5 +1,5 @@
-from core.utils.logging.logs import consoleLog, remove_download_log
 from core.utils.network.download import run_download_direct, seed_magnet
+from core.utils.logging.logs import consoleLog, remove_download_log
 import os
 
 def split_data(data):

src/core/utils/logging/logs.py

@@ -3,10 +3,10 @@ from core.utils.data.state import state
 from dataclasses import asdict
 from datetime import datetime
 import json
+import time
 import os
 import re
-import time
+
-import threading
 
 def add_download_log(title, url, magnet_uri, completed) -> DownloadList:
     # wait for metadata outside the lock to avoid blocking other threads

src/core/utils/network/download.py

@@ -1,12 +1,12 @@
-from PySide6.QtWidgets import QTableWidgetItem
-from PySide6.QtCore import Qt
-from core.utils.logging.logs import consoleLog
-from core.network.libtorrent_wrapper import add_magnet
-from core.utils.general.wrappers import run_thread
-from core.utils.logging.logs import add_download_log
-from core.network.libtorrent_int import add_seed
-from core.utils.data.state import state
 from core.network.direct_download import add_direct_download
+from core.network.libtorrent_wrapper import add_magnet
+from core.utils.logging.logs import add_download_log
+from core.utils.general.wrappers import run_thread
+from core.network.libtorrent_int import add_seed
+from PySide6.QtWidgets import QTableWidgetItem
+from core.utils.logging.logs import consoleLog
+from core.utils.data.state import state
+from PySide6.QtCore import Qt
 import threading
 
 

src/core/utils/network/update_checker.py

@@ -1,6 +1,8 @@
-import requests
-from core.utils.data.state import state
 from core.utils.logging.logs import consoleLog
+from core.utils.data.state import state
+import requests
+
+
 
 def get_updates():
     url = f"https://api.github.com/repos/KeksPirates/SoftwareManager/releases/latest"

src/main.py

@@ -1,21 +1,21 @@
-from core.interface.gui import MainWindow
-from core.utils.data.state import state
-from core.utils.logging.logs import consoleLog
 from core.network.libtorrent_misc import send_notification, update_log, check_deleted_files
+from core.utils.logging.loghandler import split_data, check_completed, check_downloads
+from core.network.interface import list_interfaces, init_interfaces
 from core.utils.logging.logs import get_download_logs
 from core.utils.general.shutdown import closehelper
 from core.utils.general.wrappers import run_thread
-from core.utils.logging.loghandler import split_data, check_completed, check_downloads
-from core.network.interface import list_interfaces, init_interfaces
 from core.utils.config.config import read_config
+from core.utils.logging.logs import consoleLog
+from core.interface.gui import MainWindow
+from core.utils.data.state import state
 from PySide6 import QtWidgets
 from PySide6.QtCore import Qt
 import qdarktheme
 import threading
 import platform
 import signal
-import sys
 import time
+import sys
 
 def run_gui():
     app = QtWidgets.QApplication.instance() or QtWidgets.QApplication(sys.argv)