Fix circular imports

nzb2media/__init__.py

@@ -12,6 +12,19 @@ import sys
 import time
 import typing
 
+from nzb2media import main_db
+from nzb2media import version_check
+from nzb2media import databases
+from nzb2media.configuration import config
+from nzb2media.nzb.configuration import configure_nzbs
+from nzb2media.plugins.plex import configure_plex
+from nzb2media.torrent.configuration import configure_torrent_class
+from nzb2media.torrent.configuration import configure_torrents
+from nzb2media.utils.files import make_dir
+from nzb2media.utils.network import wake_up
+from nzb2media.utils.processes import RunningProcess
+from nzb2media.utils.processes import restart
+
 log = logging.getLogger(__name__)
 log.addHandler(logging.NullHandler())
 
@@ -47,38 +60,6 @@ CONFIG_TV_FILE = APP_ROOT / 'autoProcessTv.cfg'
 TEST_FILE = APP_ROOT / 'tests' / 'test.mp4'
 MYAPP = None
 
-from nzb2media import main_db
-from nzb2media import version_check
-from nzb2media import databases
-from nzb2media import transcoder
-from nzb2media.configuration import config
-from nzb2media.nzb.configuration import configure_nzbs
-from nzb2media.plugins.plex import configure_plex
-from nzb2media.torrent.configuration import configure_torrent_class
-from nzb2media.torrent.configuration import configure_torrents
-from nzb2media.utils.common import clean_dir
-from nzb2media.utils.common import flatten
-from nzb2media.utils.common import get_dirs
-from nzb2media.utils.download_info import get_download_info
-from nzb2media.utils.download_info import update_download_info_status
-from nzb2media.utils.files import copy_link
-from nzb2media.utils.files import extract_files
-from nzb2media.utils.files import list_media_files
-from nzb2media.utils.files import make_dir
-from nzb2media.utils.files import sanitize_name
-from nzb2media.utils.identification import category_search
-from nzb2media.utils.network import wake_up
-from nzb2media.utils.parsers import parse_args
-from nzb2media.utils.paths import rchmod
-from nzb2media.utils.paths import remove_dir
-from nzb2media.utils.paths import remove_read_only
-from nzb2media.utils.processes import RunningProcess
-from nzb2media.utils.processes import restart
-from nzb2media.utils.torrent import pause_torrent
-from nzb2media.utils.torrent import remove_torrent
-from nzb2media.utils.torrent import resume_torrent
-
-
 __version__ = '12.1.11'
 
 # Client Agents

nzb2media/auto_process/movies.py

@@ -16,11 +16,13 @@ from nzb2media.plugins.subtitles import import_subs
 from nzb2media.plugins.subtitles import rename_subs
 from nzb2media.scene_exceptions import process_all_exceptions
 from nzb2media.utils.encoding import convert_to_ascii
+from nzb2media.utils.files import extract_files
 from nzb2media.utils.files import list_media_files
 from nzb2media.utils.identification import find_imdbid
 from nzb2media.utils.network import find_download
 from nzb2media.utils.network import server_responding
 from nzb2media.utils.nzb import report_nzb
+from nzb2media.utils.paths import rchmod
 from nzb2media.utils.paths import remote_dir
 from nzb2media.utils.paths import remove_dir
 
@@ -142,7 +144,7 @@ def process(
         and extract
     ):
         log.debug(f'Checking for archives to extract in directory: {dir_name}')
-        nzb2media.extract_files(dir_name)
+        extract_files(dir_name)
         input_name, dir_name = convert_to_ascii(input_name, dir_name)
 
     good_files = 0
@@ -206,7 +208,7 @@ def process(
                 log.debug(f'Config setting \'chmodDirectory\' currently set to {oct(chmod_directory)}')
                 if chmod_directory:
                     log.info(f'Attempting to set the octal permission of \'{oct(chmod_directory)}\' on directory \'{dir_name}\'')
-                    nzb2media.rchmod(dir_name, chmod_directory)
+                    rchmod(dir_name, chmod_directory)
             else:
                 log.error(f'Transcoding failed for files in {dir_name}')
                 return ProcessResult(

nzb2media/auto_process/music.py

@@ -12,6 +12,7 @@ from nzb2media.auto_process.common import ProcessResult
 from nzb2media.auto_process.common import command_complete
 from nzb2media.scene_exceptions import process_all_exceptions
 from nzb2media.utils.encoding import convert_to_ascii
+from nzb2media.utils.files import extract_files
 from nzb2media.utils.files import list_media_files
 from nzb2media.utils.network import server_responding
 from nzb2media.utils.paths import remote_dir
@@ -92,7 +93,7 @@ def process(
         and extract
     ):
         log.debug(f'Checking for archives to extract in directory: {dir_name}')
-        nzb2media.extract_files(dir_name)
+        extract_files(dir_name)
         input_name, dir_name = convert_to_ascii(input_name, dir_name)
 
     # if listMediaFiles(dir_name, media=False, audio=True, meta=False, archives=False) and status:

nzb2media/auto_process/tv.py

@@ -22,9 +22,11 @@ from nzb2media.plugins.subtitles import rename_subs
 from nzb2media.scene_exceptions import process_all_exceptions
 from nzb2media.utils.common import flatten
 from nzb2media.utils.encoding import convert_to_ascii
+from nzb2media.utils.files import extract_files
 from nzb2media.utils.files import list_media_files
 from nzb2media.utils.network import server_responding
 from nzb2media.utils.nzb import report_nzb
+from nzb2media.utils.paths import rchmod
 from nzb2media.utils.paths import remote_dir
 from nzb2media.utils.paths import remove_dir
 
@@ -153,7 +155,7 @@ def process(
                 and extract
             ):
                 log.debug(f'Checking for archives to extract in directory: {dir_name}')
-                nzb2media.extract_files(dir_name)
+                extract_files(dir_name)
                 input_name, dir_name = convert_to_ascii(input_name, dir_name)
 
         if list_media_files(
@@ -228,7 +230,7 @@ def process(
             log.debug(f'Config setting \'chmodDirectory\' currently set to {oct(chmod_directory)}')
             if chmod_directory:
                 log.info(f'Attempting to set the octal permission of \'{oct(chmod_directory)}\' on directory \'{dir_name}\'')
-                nzb2media.rchmod(dir_name, chmod_directory)
+                rchmod(dir_name, chmod_directory)
         else:
             log.error(f'FAILED: Transcoding failed for files in {dir_name}')
             return ProcessResult.failure(

nzb2media/utils/processes.py

@@ -8,9 +8,6 @@ import sys
 import typing
 
 import nzb2media
-from nzb2media import APP_FILENAME
-from nzb2media import SYS_ARGV
-from nzb2media import version_check
 
 if os.name == 'nt':
     from win32event import CreateMutex
@@ -103,16 +100,16 @@ else:
 
 
 def restart():
-    install_type = version_check.CheckVersion().install_type
+    install_type = nzb2media.version_check.CheckVersion().install_type
 
     status = 0
     popen_list = []
 
     if install_type in ('git', 'source'):
-        popen_list = [sys.executable, APP_FILENAME]
+        popen_list = [sys.executable, nzb2media.APP_FILENAME]
 
     if popen_list:
-        popen_list += SYS_ARGV
+        popen_list += nzb2media.SYS_ARGV
         log.info(f'Restarting nzbToMedia with {popen_list}')
         p = subprocess.Popen(popen_list, cwd=os.getcwd())
         p.wait()