refactor: remove core/ folder

.github/workflows/dev.yml

@@ -106,7 +106,7 @@ jobs:
         run: |
           python -c "
           from PIL import Image
-          img = Image.open('src/core/interface/assets/logo.png')
+          img = Image.open('src/interface/assets/logo.png')
           img.save('app_icon.ico', format='ICO', sizes=[(256,256),(128,128),(64,64),(48,48),(32,32),(16,16)])
           print('Icon converted successfully')
           "

src/data/scrapers/monkrus.py

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

src/data/scrapers/provider/gofile.py

@@ -1,4 +1,4 @@
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
 import requests
 import re
 

src/data/scrapers/rutracker.py

@@ -1,7 +1,7 @@
-from core.utils.network.jsonhandler import split_data, format_data
+from utils.network.jsonhandler import split_data, format_data
-from core.utils.data.tracker import get_magnet_link
+from utils.data.tracker import get_magnet_link
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
+from utils.data.state import state
 from typing import Dict
 import requests
 

src/data/scrapers/steamrip.py

@@ -1,7 +1,7 @@
-from core.data.scrapers.provider.buzzheavier import scrape_buzzheavier
+from data.scrapers.provider.buzzheavier import scrape_buzzheavier
-from core.data.scrapers.provider.gofile import scrape_gofile
+from data.scrapers.provider.gofile import scrape_gofile
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
+from utils.data.state import state
 from bs4 import BeautifulSoup
 from typing import Dict
 import webbrowser

src/data/scrapers/uztracker.py

@@ -1,6 +1,6 @@
-from core.utils.data.tracker import get_magnet_link
+from utils.data.tracker import get_magnet_link
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
+from utils.data.state import state
 from urllib.parse import urljoin
 from bs4 import BeautifulSoup
 from typing import Dict

src/interface/dialogs/contextmenu.py

@@ -1,7 +1,7 @@
-from core.utils.logging.logs import consoleLog, remove_download_log
+from utils.logging.logs import consoleLog, remove_download_log
 from PySide6.QtWidgets import QMessageBox
-from core.utils.data.state import state
 from PySide6.QtCore import Qt, QPoint
+from utils.data.state import state
 from PySide6 import QtWidgets
 import subprocess
 import platform

src/interface/dialogs/downloadlist.py

@@ -1,9 +1,9 @@
-from core.interface.dialogs.pauseresumedelegate import PauseResumeDelegate
+from interface.dialogs.pauseresumedelegate import PauseResumeDelegate
-from core.interface.dialogs.hoverrowdelegate import HoverRowDelegate
+from interface.dialogs.hoverrowdelegate import HoverRowDelegate
-from core.interface.dialogs.downloadmodel import DownloadModel
+from interface.dialogs.downloadmodel import DownloadModel
-from core.interface.dialogs.theme import _table_stylesheet
+from interface.dialogs.theme import _table_stylesheet
 from PySide6.QtWidgets import QTableView, QHeaderView
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
 from PySide6 import QtWidgets
 from PySide6.QtCore import Qt
 

src/interface/dialogs/downloadmodel.py

@@ -1,6 +1,6 @@
 from PySide6.QtCore import QAbstractTableModel, QModelIndex, Qt
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
+from utils.data.state import state
 import libtorrent as lt
 import subprocess
 import platform

src/interface/dialogs/elideditemdelegate.py

@@ -1,4 +1,4 @@
-from core.interface.dialogs.theme import _theme_colors
+from interface.dialogs.theme import _theme_colors
 from PySide6.QtWidgets import QStyledItemDelegate
 from PySide6.QtCore import Qt
 

src/interface/dialogs/eventfilter.py

@@ -1,5 +1,5 @@
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
+from utils.data.state import state
 from PySide6.QtCore import QEvent
 
 def eventFilter(self, obj, event):

src/interface/dialogs/hoverrowdelegate.py

@@ -1,11 +1,11 @@
-from core.interface.dialogs.theme import _theme_colors
+from interface.dialogs.theme import _theme_colors
 from PySide6.QtWidgets import QStyledItemDelegate
 from PySide6 import QtWidgets
 
 class HoverRowDelegate(QStyledItemDelegate):
 
     def paint(self, painter, option, index):
-        from core.interface.gui import MainWindow
+        from interface.gui import MainWindow
 
         opt = QtWidgets.QStyleOptionViewItem(option)
         option.state &= ~QtWidgets.QStyle.StateFlag.State_HasFocus

src/interface/dialogs/image.py

@@ -1,6 +1,6 @@
 from PySide6.QtGui import QImage, QPixmap
-from core.utils.data.state import state
 from PySide6.QtWidgets import QLabel
+from utils.data.state import state
 from PySide6.QtCore import Qt
 import os
 

src/interface/dialogs/pauseresumedelegate.py

@@ -1,8 +1,8 @@
-from core.interface.dialogs.theme import _theme_colors, SVG_PLAY, SVG_PAUSE, SVG_FOLDER
+from interface.dialogs.theme import _theme_colors, SVG_PLAY, SVG_PAUSE, SVG_FOLDER
 from PySide6.QtWidgets import QStyledItemDelegate, QWidget, QHBoxLayout
-from core.interface.utils.svghelper import svg_icon
+from interface.utils.svghelper import svg_icon
 from PySide6.QtCore import Qt, QSize, Signal
-from core.utils.data.state import state
+from utils.data.state import state
 from PySide6 import QtWidgets
 import libtorrent as lt
 
@@ -10,7 +10,7 @@ class PauseResumeDelegate(QStyledItemDelegate):
     clicked = Signal(int)
 
     def paint(self, painter, option, index):
-        from core.interface.gui import MainWindow
+        from interface.gui import MainWindow
 
         opt = QtWidgets.QStyleOptionViewItem(option)
         option.state &= ~QtWidgets.QStyle.StateFlag.State_HasFocus

src/interface/dialogs/settings.py

@@ -1,11 +1,11 @@
-from core.interface.utils.tabhelper import general_tab
+from interface.utils.tabhelper import general_tab
-from core.interface.utils.tabhelper import network_tab
+from interface.utils.tabhelper import network_tab
-from core.utils.config.settings import save_settings
+from utils.config.settings import save_settings
-from core.interface.utils.tabhelper import paths_tab
+from interface.utils.tabhelper import paths_tab
-from core.interface.utils.svghelper import svg_icon
+from interface.utils.svghelper import svg_icon
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
 from PySide6.QtCore import Qt, QSize
+from utils.data.state import state
 from PySide6 import QtWidgets
 from PySide6.QtWidgets import (
     QLineEdit, 

src/interface/dialogs/trackerhoverdelegate.py

@@ -1,4 +1,4 @@
-from core.interface.dialogs.theme import _theme_colors
+from interface.dialogs.theme import _theme_colors
 from PySide6.QtWidgets import QStyledItemDelegate
 
 class TrackerHoverDelegate(QStyledItemDelegate):

src/interface/dialogs/trackertable.py

@@ -1,4 +1,4 @@
-from core.interface.dialogs.theme import _table_stylesheet
+from interface.dialogs.theme import _table_stylesheet
 from PySide6.QtWidgets import QTableWidget
 from PySide6 import QtWidgets
 from PySide6.QtCore import Qt

src/interface/dialogs/update.py

@@ -1,8 +1,8 @@
-from core.utils.network.update_checker import get_updates
+from utils.network.update_checker import get_updates
-from core.utils.network.updater import download_update
 from PySide6.QtWidgets import QDialog, QMessageBox
-from core.utils.logging.logs import consoleLog
+from utils.network.updater import download_update
-from core.utils.data.state import state
+from utils.logging.logs import consoleLog
+from utils.data.state import state
 from pathlib import Path
 import platform
 import json

src/interface/gui.py

@@ -1,25 +1,25 @@
-from core.interface.dialogs.trackerhoverdelegate import TrackerHoverDelegate
+from interface.dialogs.trackerhoverdelegate import TrackerHoverDelegate
-from core.interface.dialogs.elideditemdelegate import ElidedItemDelegate
+from interface.dialogs.elideditemdelegate import ElidedItemDelegate
-from core.interface.dialogs.trackertable import _create_tracker_table
+from interface.dialogs.trackertable import _create_tracker_table
-from core.interface.dialogs.downloadlist import _create_download_list
+from interface.dialogs.downloadlist import _create_download_list
-from core.interface.assets.base64_icons import settings_white_base64
+from interface.assets.base64_icons import settings_white_base64
-from core.interface.assets.base64_icons import settings_black_base64
+from interface.assets.base64_icons import settings_black_base64
-from core.interface.dialogs.downloadlist import download_list_update
+from interface.dialogs.downloadlist import download_list_update
-from core.interface.dialogs.update import get_version, UpdateDialog
+from interface.dialogs.update import get_version, UpdateDialog
-from core.utils.logging.logs import consoleLog, flush_log_buffer
+from utils.logging.logs import consoleLog, flush_log_buffer
-from core.interface.dialogs.downloadmodel import DownloadModel
+from interface.dialogs.downloadmodel import DownloadModel
-from core.interface.dialogs.settings import settings_dialog
+from interface.dialogs.settings import settings_dialog
-from core.interface.assets.base64_icons import logo_base64
+from interface.assets.base64_icons import logo_base64
-from core.interface.dialogs.eventfilter import eventFilter
+from interface.dialogs.eventfilter import eventFilter
-from core.utils.network.download import download_selected
+from utils.network.download import download_selected
-from core.interface.utils.searchhelper import run_search
+from interface.utils.searchhelper import run_search
-from core.interface.utils.tabhelper import create_tab
+from interface.utils.tabhelper import create_tab
-from core.utils.general.shutdown import closehelper
+from utils.general.shutdown import closehelper
-from core.utils.general.wrappers import run_thread
+from utils.general.wrappers import run_thread
-from core.interface.dialogs.image import Image
+from interface.dialogs.image import Image
-from core.utils.data.state import state
+from utils.data.state import state
 
-import core.interface.dialogs.contextmenu
+import interface.dialogs.contextmenu
 
 from PySide6 import QtWidgets
 from PySide6.QtCore import (
@@ -86,7 +86,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
                 consoleLog(f"Could not set app ID: {e}")
 
         # Get current version
-        # core.interface.dialogs.update
+        # interface.dialogs.update
         get_version()
         UpdateDialog()
 
@@ -137,7 +137,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         containerLayout.addWidget(self.searchbar)
         containerLayout.addWidget(state.trackertable)
 
-        # core.interface.dialogs.hoverrowdelegate
+        # interface.dialogs.hoverrowdelegate
         self.download_model = DownloadModel()
         self.downloadList = _create_download_list(self)
         self.downloadList.viewport().installEventFilter(self)
@@ -246,7 +246,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
         self.active_timer.timeout.connect(self.show_empty_downloads)
         self.active_timer.start(500)
 
-        self._context_menu = core.interface.dialogs.contextmenu.ContextMenu(self)
+        self._context_menu = interface.dialogs.contextmenu.ContextMenu(self)
         self.image_overlay = Image(self)
 
     def _apply_default_headers(self, table):
@@ -384,7 +384,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
     def closeEvent(self, event: QCloseEvent):
         closehelper()
         event.accept()
-        from core.utils.general.shutdown import force_exit
+        from utils.general.shutdown import force_exit
         force_exit()
 
     def _invalidate_hover_row(self, row):

src/interface/utils/searchhelper.py

@@ -1,9 +1,9 @@
-from core.data.scrapers.rutracker import init_rutracker
+from data.scrapers.rutracker import init_rutracker
-from core.data.scrapers.uztracker import init_uztracker
+from data.scrapers.uztracker import init_uztracker
-from core.data.scrapers.steamrip import init_steamrip
+from data.scrapers.steamrip import init_steamrip
-from core.data.scrapers.monkrus import init_m0nkrus
+from data.scrapers.monkrus import init_m0nkrus
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
+from utils.data.state import state
 
 # Call initialization function for each tracker / site
 init_rutracker()
@@ -28,7 +28,7 @@ def run_search(self) -> None:
     state.posts = scrapefunc(search_text)
     
     # Late to prevent circular import
-    from core.interface.gui import MainWindow
+    from interface.gui import MainWindow
 
     # Update GUI Headers
     MainWindow._instance.search_results_signal.emit(tracker["headers"])

src/interface/utils/svghelper.py

@@ -1,9 +1,7 @@
-
-
-from PySide6 import QtWidgets
-from PySide6.QtCore import Qt, QByteArray
 from PySide6.QtGui import QIcon, QPixmap, QPainter
+from PySide6.QtCore import Qt, QByteArray
 from PySide6.QtSvg import QSvgRenderer
+from PySide6 import QtWidgets
 import darkdetect
 
 # Check if darkmode is enabled

src/main.py

@@ -1,15 +1,15 @@
-from core.network.libtorrent_misc import send_notification, update_log, check_deleted_files
+from network.libtorrent_misc import send_notification, update_log, check_deleted_files
-from core.utils.logging.loghandler import split_data, check_completed, check_downloads
+from utils.logging.loghandler import split_data, check_completed, check_downloads
-from core.network.interface import list_interfaces, init_interfaces
+from network.interface import list_interfaces, init_interfaces
-from core.utils.logging.logs import get_download_logs
+from utils.logging.logs import get_download_logs
-from core.utils.logging.logs import set_main_window
+from utils.logging.logs import set_main_window
-from core.utils.general.shutdown import closehelper
+from utils.general.shutdown import closehelper
-from core.utils.general.wrappers import run_thread
+from utils.general.wrappers import run_thread
-from core.utils.general.shutdown import force_exit
+from utils.general.shutdown import force_exit
-from core.utils.config.config import read_config
+from utils.config.config import read_config
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.interface.gui import MainWindow
+from interface.gui import MainWindow
-from core.utils.data.state import state
+from utils.data.state import state
 from PySide6 import QtWidgets
 from PySide6.QtCore import Qt
 import qdarktheme

src/network/direct_download/__init__.py

@@ -1,6 +1,7 @@
+from utils.logging.logs import consoleLog, add_download_log
+from utils.data.state import state
 from typing import Optional
-from core.utils.data.state import state
+
-from core.utils.logging.logs import consoleLog, add_download_log
 
 from .handle import DirectDownloadHandle
 from .utils import (

src/network/direct_download/handle.py

@@ -1,8 +1,8 @@
-from core.utils.logging.logs import consoleLog, update_download_completed
+from network.direct_download.status import DirectDownloadStatus, ChunkSpec
+from utils.logging.logs import consoleLog, update_download_completed
 from concurrent.futures import ThreadPoolExecutor, as_completed
-from .status import DirectDownloadStatus, ChunkSpec
+from network.direct_download.utils import format_size
-from core.utils.data.state import state
+from utils.data.state import state
-from .utils import format_size
 from typing import Optional
 import libtorrent as lt
 import threading

src/network/direct_download/utils.py

@@ -1,4 +1,4 @@
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
 from urllib.parse import urlparse, unquote
 from typing import Optional
 import requests

src/network/interface.py

@@ -1,5 +1,5 @@
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
+from utils.data.state import state
 import psutil
 
 def get_net_interfaces():

src/network/libtorrent_int.py

@@ -1,7 +1,7 @@
-from core.network.interface import get_interface_ip
+from network.interface import get_interface_ip
-from core.utils.general.wrappers import run_thread
+from utils.general.wrappers import run_thread
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
+from utils.data.state import state
 import libtorrent as lt
 import threading
 import platform

src/network/libtorrent_misc.py

@@ -1,6 +1,6 @@
-from core.utils.logging.logs import update_download_completed_by_hash
+from utils.logging.logs import update_download_completed_by_hash
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
+from utils.data.state import state
 from plyer import notification
 import libtorrent as lt
 import time

src/network/libtorrent_wrapper.py

@@ -1,5 +1,5 @@
-from core.network.libtorrent_int import add_download
+from network.libtorrent_int import add_download
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
 
 
 def add_magnet(uri):

src/utils/config/config.py

@@ -1,4 +1,4 @@
-from core.utils.data.state import state
+from utils.data.state import state
 import configparser
 import platform
 import os

src/utils/config/settings.py

@@ -1,7 +1,8 @@
-from core.network.libtorrent_int import update_settings
+from network.libtorrent_int import update_settings
-from core.utils.logging.logs import consoleLog
+from utils.config.config import create_config
-from core.utils.data.state import state
+from utils.logging.logs import consoleLog
-from core.utils.config.config import create_config
+from utils.data.state import state
+
 
 
 def save_settings(close=lambda: None, apiurl=None, download_path=None, down_speed_limit=None, up_speed_limit=None, image_path=None, autoresume=None, max_connections=None, max_downloads=None, bound_interface=None):

src/utils/data/tracker.py

@@ -1,4 +1,4 @@
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
 from bs4 import BeautifulSoup
 import requests
 

src/utils/general/shutdown.py

@@ -1,6 +1,6 @@
-from core.network.libtorrent_misc import cleanup_session
+from network.libtorrent_misc import cleanup_session
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
+from utils.data.state import state
 import os
 
 def closehelper():

src/utils/general/wrappers.py

@@ -1,4 +1,4 @@
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
 
 def run_thread(thread):
     target_name = thread._target.__name__

src/utils/logging/loghandler.py

@@ -1,5 +1,5 @@
-from core.utils.network.download import run_download_direct, seed_magnet
+from utils.network.download import run_download_direct, seed_magnet
-from core.utils.logging.logs import consoleLog, remove_download_log
+from utils.logging.logs import consoleLog, remove_download_log
 import os
 
 def split_data(data):
@@ -18,7 +18,7 @@ def check_completed(downloads, resume):
                     run_download_direct(download.magnet_uri, download.title)
                     consoleLog(f"Resuming Magnet: {download.title}")
                 elif download.url:
-                    from core.network.direct_download import add_direct_download
+                    from network.direct_download import add_direct_download
                     add_direct_download(download.url, download.title)
                     consoleLog(f"Resuming Direct Download: {download.title}")
 

src/utils/logging/logs.py

@@ -1,5 +1,5 @@
-from core.utils.data.models import Download, DownloadList
+from utils.data.models import Download, DownloadList
-from core.utils.data.state import state
+from utils.data.state import state
 from dataclasses import asdict
 from datetime import datetime
 import json
@@ -243,7 +243,7 @@ def set_main_window(window):
 def flush_log_buffer(): # credits to claude
     if state.log_buffer:
         try:
-            from core.interface.gui import MainWindow
+            from interface.gui import MainWindow
             for log_entry in state.log_buffer:
                 MainWindow.add_log(log_entry)
             state.log_buffer = []
@@ -256,7 +256,7 @@ def consoleLog(text, printAnyways = False):
     formatted_text = f"[{current_time}] {text}"
 
     try:
-        from core.interface.gui import MainWindow
+        from interface.gui import MainWindow
         if not MainWindow.add_log(formatted_text):
             state.log_buffer.append(formatted_text)
     except Exception:

src/utils/network/download.py

@@ -1,11 +1,11 @@
-from core.network.direct_download import add_direct_download
+from network.direct_download import add_direct_download
-from core.network.libtorrent_wrapper import add_magnet
+from 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 utils.logging.logs import add_download_log
-from core.utils.data.state import state
+from utils.general.wrappers import run_thread
+from network.libtorrent_int import add_seed
+from utils.logging.logs import consoleLog
+from utils.data.state import state
 from PySide6.QtCore import Qt
 from typing import Optional
 import threading

src/utils/network/update_checker.py

@@ -1,5 +1,5 @@
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
+from utils.data.state import state
 import requests
 
 

src/utils/network/updater.py

@@ -1,6 +1,6 @@
-from core.network.direct_download.handle import DirectDownloadHandle
+from network.direct_download.handle import DirectDownloadHandle
-from core.utils.logging.logs import consoleLog
+from utils.logging.logs import consoleLog
-from core.utils.data.state import state
+from utils.data.state import state
 from PySide6.QtCore import Qt
 from PySide6 import QtWidgets
 import libtorrent as lt