Merge pull request #1935 from clinton-hall/uninitialized

Remove code from __init__.py

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 (
+from core.utils.processes import RunningProcess
-    RunningProcess,
+from core.utils.processes import restart
-    category_search,
+from core.utils.files import copy_link
-    clean_dir,
+from core.utils.files import extract_files
-    copy_link,
+from core.utils.files import list_media_files
-    extract_files,
+from core.utils.files import make_dir
-    flatten,
+from core.utils.files import sanitize_name
-    get_dirs,
+from core.utils.paths import rchmod
-    get_download_info,
+from core.utils.paths import remove_dir
-    list_media_files,
+from core.utils.paths import remove_read_only
-    make_dir,
+from core.utils.common import clean_dir
-    parse_args,
+from core.utils.common import flatten
-    rchmod,
+from core.utils.common import get_dirs
-    remove_dir,
+from core.utils.download_info import get_download_info
-    remove_read_only,
+from core.utils.download_info import update_download_info_status
-    restart,
+from core.utils.parsers import parse_args
-    sanitize_name,
+from core.utils.network import wake_up
-    update_download_info_status,
+from core.utils.identification import category_search
-    wake_up,
+
-)
 
 __version__ = '12.1.11'
 

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.encoding import convert_to_ascii
-from core.utils import find_download
+from core.utils.network import find_download
-from core.utils import find_imdbid
+from core.utils.identification import find_imdbid
-from core.utils import flatten
+from core.utils.common import flatten
-from core.utils import list_media_files
+from core.utils.files import list_media_files
-from core.utils import remote_dir
+from core.utils.paths import remote_dir
-from core.utils import remove_dir
+from core.utils.paths import remove_dir
-from core.utils import server_responding
+from core.utils.network import server_responding
 
 
 requests.packages.urllib3.disable_warnings()

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.encoding import convert_to_ascii
-from core.utils import find_download
+from core.utils.network import find_download
-from core.utils import find_imdbid
+from core.utils.identification import find_imdbid
-from core.utils import flatten
+from core.utils.common import flatten
-from core.utils import list_media_files
+from core.utils.files import list_media_files
-from core.utils import remote_dir
+from core.utils.paths import remote_dir
-from core.utils import remove_dir
+from core.utils.paths import remove_dir
-from core.utils import server_responding
+from core.utils.network import server_responding
 
 
 requests.packages.urllib3.disable_warnings()

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.encoding import convert_to_ascii
-from core.utils import find_download
+from core.utils.network import find_download
-from core.utils import find_imdbid
+from core.utils.identification import find_imdbid
-from core.utils import flatten
+from core.utils.common import flatten
-from core.utils import list_media_files
+from core.utils.files import list_media_files
-from core.utils import remote_dir
+from core.utils.paths import remote_dir
-from core.utils import remove_dir
+from core.utils.paths import remove_dir
-from core.utils import server_responding
+from core.utils.network import server_responding
 
 
 requests.packages.urllib3.disable_warnings()

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:

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.encoding import convert_to_ascii
-from core.utils import find_download
+from core.utils.network import find_download
-from core.utils import find_imdbid
+from core.utils.identification import find_imdbid
-from core.utils import flatten
+from core.utils.common import flatten
-from core.utils import list_media_files
+from core.utils.files import list_media_files
-from core.utils import remote_dir
+from core.utils.paths import remote_dir
-from core.utils import remove_dir
+from core.utils.paths import remove_dir
-from core.utils import server_responding
+from core.utils.network import server_responding
 
 
 requests.packages.urllib3.disable_warnings()

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.encoding import convert_to_ascii
-from core.utils import find_download
+from core.utils.network import find_download
-from core.utils import find_imdbid
+from core.utils.identification import find_imdbid
-from core.utils import flatten
+from core.utils.common import flatten
-from core.utils import list_media_files
+from core.utils.files import list_media_files
-from core.utils import remote_dir
+from core.utils.paths import remote_dir
-from core.utils import remove_dir
+from core.utils.paths import remove_dir
-from core.utils import server_responding
+from core.utils.network import server_responding
 
 
 requests.packages.urllib3.disable_warnings()

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.encoding import convert_to_ascii
-from core.utils import find_download
+from core.utils.network import find_download
-from core.utils import find_imdbid
+from core.utils.identification import find_imdbid
-from core.utils import flatten
+from core.utils.common import flatten
-from core.utils import list_media_files
+from core.utils.files import list_media_files
-from core.utils import remote_dir
+from core.utils.paths import remote_dir
-from core.utils import remove_dir
+from core.utils.paths import remove_dir
-from core.utils import server_responding
+from core.utils.network import server_responding
 
 
 requests.packages.urllib3.disable_warnings()

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

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.common import get_dirs
-from core.utils import get_download_info
+from core.utils.download_info import get_download_info
 
 
 def process():

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.encoding import char_replace
-from core.utils import clean_dir
+from core.utils.common import clean_dir
-from core.utils import convert_to_ascii
+from core.utils.encoding import convert_to_ascii
-from core.utils import extract_files
+from core.utils.files import extract_files
-from core.utils import update_download_info_status
+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):

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\.',

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'
 

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.utils.files import list_media_files
-from core.auto_process.common import (
+from core.utils.paths import remove_dir
-    ProcessResult,
+from core.auto_process.common import ProcessResult
-)
 
 
 def external_script(output_destination, torrent_name, torrent_label, settings):

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()