From 38eb31ad761421663f62e708927050bcd528336a Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Fri, 9 Dec 2022 17:40:42 -0500 Subject: [PATCH] Modify imports --- core/__init__.py | 39 +++++++++--------- core/auto_process/books.py | 16 ++++---- core/auto_process/comics.py | 16 ++++---- core/auto_process/games.py | 16 ++++---- core/auto_process/managers/sickbeard.py | 2 +- core/auto_process/movies.py | 16 ++++---- core/auto_process/music.py | 16 ++++---- core/auto_process/tv.py | 16 ++++---- core/databases.py | 2 +- core/processor/manual.py | 4 +- core/processor/nzb.py | 10 ++--- core/scene_exceptions.py | 2 +- core/transcoder.py | 2 +- core/user_scripts.py | 7 ++-- core/utils/__init__.py | 53 ------------------------- 15 files changed, 81 insertions(+), 136 deletions(-) diff --git a/core/__init__.py b/core/__init__.py index 946e48a5..9868fd24 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -52,26 +52,25 @@ from core.plugins.downloaders.utils import ( resume_torrent, ) from core.plugins.plex import configure_plex -from core.utils import ( - RunningProcess, - category_search, - clean_dir, - copy_link, - extract_files, - flatten, - get_dirs, - get_download_info, - list_media_files, - make_dir, - parse_args, - rchmod, - remove_dir, - remove_read_only, - restart, - sanitize_name, - update_download_info_status, - wake_up, -) +from core.utils.processes import RunningProcess +from core.utils.processes import restart +from core.utils.files import copy_link +from core.utils.files import extract_files +from core.utils.files import list_media_files +from core.utils.files import make_dir +from core.utils.files import sanitize_name +from core.utils.paths import rchmod +from core.utils.paths import remove_dir +from core.utils.paths import remove_read_only +from core.utils.common import clean_dir +from core.utils.common import flatten +from core.utils.common import get_dirs +from core.utils.download_info import get_download_info +from core.utils.download_info import update_download_info_status +from core.utils.parsers import parse_args +from core.utils.network import wake_up +from core.utils.identification import category_search + __version__ = '12.1.11' diff --git a/core/auto_process/books.py b/core/auto_process/books.py index fe3705f1..f1b9db17 100644 --- a/core/auto_process/books.py +++ b/core/auto_process/books.py @@ -22,14 +22,14 @@ from core.plugins.downloaders.nzb.utils import report_nzb from core.plugins.subtitles import import_subs from core.plugins.subtitles import rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import convert_to_ascii -from core.utils import find_download -from core.utils import find_imdbid -from core.utils import flatten -from core.utils import list_media_files -from core.utils import remote_dir -from core.utils import remove_dir -from core.utils import server_responding +from core.utils.encoding import convert_to_ascii +from core.utils.network import find_download +from core.utils.identification import find_imdbid +from core.utils.common import flatten +from core.utils.files import list_media_files +from core.utils.paths import remote_dir +from core.utils.paths import remove_dir +from core.utils.network import server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/auto_process/comics.py b/core/auto_process/comics.py index aeed6c8c..00e77bf0 100644 --- a/core/auto_process/comics.py +++ b/core/auto_process/comics.py @@ -22,14 +22,14 @@ from core.plugins.downloaders.nzb.utils import report_nzb from core.plugins.subtitles import import_subs from core.plugins.subtitles import rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import convert_to_ascii -from core.utils import find_download -from core.utils import find_imdbid -from core.utils import flatten -from core.utils import list_media_files -from core.utils import remote_dir -from core.utils import remove_dir -from core.utils import server_responding +from core.utils.encoding import convert_to_ascii +from core.utils.network import find_download +from core.utils.identification import find_imdbid +from core.utils.common import flatten +from core.utils.files import list_media_files +from core.utils.paths import remote_dir +from core.utils.paths import remove_dir +from core.utils.network import server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/auto_process/games.py b/core/auto_process/games.py index 01f4199f..44dcbc02 100644 --- a/core/auto_process/games.py +++ b/core/auto_process/games.py @@ -22,14 +22,14 @@ from core.plugins.downloaders.nzb.utils import report_nzb from core.plugins.subtitles import import_subs from core.plugins.subtitles import rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import convert_to_ascii -from core.utils import find_download -from core.utils import find_imdbid -from core.utils import flatten -from core.utils import list_media_files -from core.utils import remote_dir -from core.utils import remove_dir -from core.utils import server_responding +from core.utils.encoding import convert_to_ascii +from core.utils.network import find_download +from core.utils.identification import find_imdbid +from core.utils.common import flatten +from core.utils.files import list_media_files +from core.utils.paths import remote_dir +from core.utils.paths import remove_dir +from core.utils.network import server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/auto_process/managers/sickbeard.py b/core/auto_process/managers/sickbeard.py index 526d2dde..32324fab 100644 --- a/core/auto_process/managers/sickbeard.py +++ b/core/auto_process/managers/sickbeard.py @@ -11,7 +11,7 @@ from core import logger from core.auto_process.common import ( ProcessResult, ) -from core.utils import remote_dir +from core.utils.paths import remote_dir class InitSickBeard: diff --git a/core/auto_process/movies.py b/core/auto_process/movies.py index 30b94b05..590e9585 100644 --- a/core/auto_process/movies.py +++ b/core/auto_process/movies.py @@ -22,14 +22,14 @@ from core.plugins.downloaders.nzb.utils import report_nzb from core.plugins.subtitles import import_subs from core.plugins.subtitles import rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import convert_to_ascii -from core.utils import find_download -from core.utils import find_imdbid -from core.utils import flatten -from core.utils import list_media_files -from core.utils import remote_dir -from core.utils import remove_dir -from core.utils import server_responding +from core.utils.encoding import convert_to_ascii +from core.utils.network import find_download +from core.utils.identification import find_imdbid +from core.utils.common import flatten +from core.utils.files import list_media_files +from core.utils.paths import remote_dir +from core.utils.paths import remove_dir +from core.utils.network import server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/auto_process/music.py b/core/auto_process/music.py index 51733306..a9367e54 100644 --- a/core/auto_process/music.py +++ b/core/auto_process/music.py @@ -22,14 +22,14 @@ from core.plugins.downloaders.nzb.utils import report_nzb from core.plugins.subtitles import import_subs from core.plugins.subtitles import rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import convert_to_ascii -from core.utils import find_download -from core.utils import find_imdbid -from core.utils import flatten -from core.utils import list_media_files -from core.utils import remote_dir -from core.utils import remove_dir -from core.utils import server_responding +from core.utils.encoding import convert_to_ascii +from core.utils.network import find_download +from core.utils.identification import find_imdbid +from core.utils.common import flatten +from core.utils.files import list_media_files +from core.utils.paths import remote_dir +from core.utils.paths import remove_dir +from core.utils.network import server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/auto_process/tv.py b/core/auto_process/tv.py index ce2d2d6d..26e58db3 100644 --- a/core/auto_process/tv.py +++ b/core/auto_process/tv.py @@ -22,14 +22,14 @@ from core.plugins.downloaders.nzb.utils import report_nzb from core.plugins.subtitles import import_subs from core.plugins.subtitles import rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import convert_to_ascii -from core.utils import find_download -from core.utils import find_imdbid -from core.utils import flatten -from core.utils import list_media_files -from core.utils import remote_dir -from core.utils import remove_dir -from core.utils import server_responding +from core.utils.encoding import convert_to_ascii +from core.utils.network import find_download +from core.utils.identification import find_imdbid +from core.utils.common import flatten +from core.utils.files import list_media_files +from core.utils.paths import remote_dir +from core.utils.paths import remove_dir +from core.utils.network import server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/databases.py b/core/databases.py index a6c77415..1f004d7a 100644 --- a/core/databases.py +++ b/core/databases.py @@ -2,7 +2,7 @@ from __future__ import annotations from core import logger from core import main_db -from core.utils import backup_versioned_file +from core.utils.files import backup_versioned_file MIN_DB_VERSION = 1 # oldest db version we support migrating from MAX_DB_VERSION = 2 diff --git a/core/processor/manual.py b/core/processor/manual.py index 99b7b41e..d50e936b 100644 --- a/core/processor/manual.py +++ b/core/processor/manual.py @@ -6,8 +6,8 @@ import core from core import logger from core.auto_process.common import ProcessResult from core.processor import nzb -from core.utils import get_dirs -from core.utils import get_download_info +from core.utils.common import get_dirs +from core.utils.download_info import get_download_info def process(): diff --git a/core/processor/nzb.py b/core/processor/nzb.py index 8572aabf..b58fcbdc 100644 --- a/core/processor/nzb.py +++ b/core/processor/nzb.py @@ -15,11 +15,11 @@ from core.auto_process.common import ProcessResult from core.plugins.downloaders.nzb.utils import get_nzoid from core.plugins.plex import plex_update from core.user_scripts import external_script -from core.utils import char_replace -from core.utils import clean_dir -from core.utils import convert_to_ascii -from core.utils import extract_files -from core.utils import update_download_info_status +from core.utils.encoding import char_replace +from core.utils.common import clean_dir +from core.utils.encoding import convert_to_ascii +from core.utils.files import extract_files +from core.utils.download_info import update_download_info_status def process(input_directory, input_name=None, status=0, client_agent='manual', download_id=None, input_category=None, failure_link=None): diff --git a/core/scene_exceptions.py b/core/scene_exceptions.py index f1217037..58d83ec1 100644 --- a/core/scene_exceptions.py +++ b/core/scene_exceptions.py @@ -8,7 +8,7 @@ import subprocess import core from core import logger -from core.utils import list_media_files +from core.utils.files import list_media_files reverse_list = [ r'\.\d{2}e\d{2}s\.', r'\.[pi]0801\.', r'\.p027\.', r'\.[pi]675\.', r'\.[pi]084\.', r'\.p063\.', diff --git a/core/transcoder.py b/core/transcoder.py index 278e864e..0708b81d 100644 --- a/core/transcoder.py +++ b/core/transcoder.py @@ -14,7 +14,7 @@ from babelfish import Language import core from core import logger -from core.utils import make_dir +from core.utils.paths import make_dir __author__ = 'Justin' diff --git a/core/user_scripts.py b/core/user_scripts.py index cac9c839..d7d18e65 100644 --- a/core/user_scripts.py +++ b/core/user_scripts.py @@ -6,10 +6,9 @@ from subprocess import Popen import core from core import logger, transcoder from core.plugins.subtitles import import_subs -from core.utils import list_media_files, remove_dir -from core.auto_process.common import ( - ProcessResult, -) +from core.utils.files import list_media_files +from core.utils.paths import remove_dir +from core.auto_process.common import ProcessResult def external_script(output_destination, torrent_name, torrent_label, settings): diff --git a/core/utils/__init__.py b/core/utils/__init__.py index d5f64a3e..e69de29b 100644 --- a/core/utils/__init__.py +++ b/core/utils/__init__.py @@ -1,53 +0,0 @@ -from __future__ import annotations - -import requests - -from core.utils.common import clean_dir -from core.utils.common import flatten -from core.utils.common import get_dirs -from core.utils.common import process_dir -from core.utils.download_info import get_download_info -from core.utils.download_info import update_download_info_status -from core.utils.encoding import char_replace -from core.utils.encoding import convert_to_ascii -from core.utils.files import backup_versioned_file -from core.utils.files import extract_files -from core.utils.files import is_archive_file -from core.utils.files import is_media_file -from core.utils.files import is_min_size -from core.utils.files import list_media_files -from core.utils.files import move_file -from core.utils.identification import category_search -from core.utils.identification import find_imdbid -from core.utils.links import copy_link -from core.utils.links import replace_links -from core.utils.naming import clean_file_name -from core.utils.naming import is_sample -from core.utils.naming import sanitize_name -from core.utils.network import find_download -from core.utils.network import server_responding -from core.utils.network import test_connection -from core.utils.network import wake_on_lan -from core.utils.network import wake_up -from core.utils.parsers import parse_args -from core.utils.parsers import parse_deluge -from core.utils.parsers import parse_other -from core.utils.parsers import parse_qbittorrent -from core.utils.parsers import parse_rtorrent -from core.utils.parsers import parse_transmission -from core.utils.parsers import parse_utorrent -from core.utils.parsers import parse_vuze -from core.utils.paths import clean_directory -from core.utils.paths import flatten_dir -from core.utils.paths import get_dir_size -from core.utils.paths import make_dir -from core.utils.paths import onerror -from core.utils.paths import rchmod -from core.utils.paths import remote_dir -from core.utils.paths import remove_dir -from core.utils.paths import remove_empty_folders -from core.utils.paths import remove_read_only -from core.utils.processes import restart -from core.utils.processes import RunningProcess - -requests.packages.urllib3.disable_warnings()