Reduce nested imports

nzb2media/__init__.py

@@ -43,15 +43,16 @@ CONFIG_TV_FILE = APP_ROOT / 'autoProcessTv.cfg'
 TEST_FILE = APP_ROOT / 'tests' / 'test.mp4'
 MYAPP = None
 
-from nzb2media import logger, main_db, version_check, databases, transcoder
+from nzb2media import logger
+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.plugins.downloaders.nzb.configuration import configure_nzbs
+from nzb2media.nzb.configuration import configure_nzbs
-from nzb2media.plugins.downloaders.torrent.configuration import configure_torrent_class
-from nzb2media.plugins.downloaders.torrent.configuration import configure_torrents
-from nzb2media.plugins.downloaders.torrent.utils import pause_torrent
-from nzb2media.plugins.downloaders.torrent.utils import remove_torrent
-from nzb2media.plugins.downloaders.torrent.utils import resume_torrent
 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
@@ -70,6 +71,9 @@ 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'

nzb2media/auto_process/movies.py

@@ -12,7 +12,6 @@ from nzb2media import transcoder
 from nzb2media.auto_process.common import ProcessResult
 from nzb2media.auto_process.common import command_complete
 from nzb2media.auto_process.common import completed_download_handling
-from nzb2media.plugins.downloaders.nzb.utils import report_nzb
 from nzb2media.plugins.subtitles import import_subs
 from nzb2media.plugins.subtitles import rename_subs
 from nzb2media.scene_exceptions import process_all_exceptions
@@ -22,6 +21,7 @@ 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 remote_dir
 from nzb2media.utils.paths import remove_dir
 

nzb2media/auto_process/tv.py

@@ -16,8 +16,7 @@ from nzb2media import transcoder
 from nzb2media.auto_process.common import ProcessResult
 from nzb2media.auto_process.common import command_complete
 from nzb2media.auto_process.common import completed_download_handling
-from nzb2media.auto_process.managers.sickbeard import InitSickBeard
+from nzb2media.managers.sickbeard import InitSickBeard
-from nzb2media.plugins.downloaders.nzb.utils import report_nzb
 from nzb2media.plugins.subtitles import import_subs
 from nzb2media.plugins.subtitles import rename_subs
 from nzb2media.scene_exceptions import process_all_exceptions
@@ -25,6 +24,7 @@ from nzb2media.utils.common import flatten
 from nzb2media.utils.encoding import convert_to_ascii
 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 remote_dir
 from nzb2media.utils.paths import remove_dir
 

nzb2media/managers/pymedusa.py

@@ -7,7 +7,7 @@ import requests
 import nzb2media.utils.common
 from nzb2media import logger
 from nzb2media.auto_process.common import ProcessResult
-from nzb2media.auto_process.managers.sickbeard import SickBeard
+from nzb2media.managers.sickbeard import SickBeard
 
 
 class PyMedusa(SickBeard):

nzb2media/managers/sickbeard.py

@@ -8,9 +8,7 @@ from requests_oauthlib import OAuth2Session
 
 import nzb2media
 from nzb2media import logger
-from nzb2media.auto_process.common import (
+from nzb2media.auto_process.common import ProcessResult
-    ProcessResult,
-)
 from nzb2media.utils.paths import remote_dir
 
 

nzb2media/processor/nzb.py

@@ -12,7 +12,6 @@ from nzb2media.auto_process import movies
 from nzb2media.auto_process import music
 from nzb2media.auto_process import tv
 from nzb2media.auto_process.common import ProcessResult
-from nzb2media.plugins.downloaders.nzb.utils import get_nzoid
 from nzb2media.plugins.plex import plex_update
 from nzb2media.user_scripts import external_script
 from nzb2media.utils.common import clean_dir
@@ -20,6 +19,7 @@ from nzb2media.utils.download_info import update_download_info_status
 from nzb2media.utils.encoding import char_replace
 from nzb2media.utils.encoding import convert_to_ascii
 from nzb2media.utils.files import extract_files
+from nzb2media.utils.nzb import get_nzoid
 
 
 def process(

nzb2media/torrent/configuration.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import nzb2media
-from nzb2media.plugins.downloaders.torrent.utils import create_torrent_class
+from nzb2media.utils.torrent import create_torrent_class
 
 
 def configure_torrents(config):

nzb2media/utils/torrent.py

@@ -4,18 +4,18 @@ import time
 
 import nzb2media
 from nzb2media import logger
-from nzb2media.plugins.downloaders.torrent.deluge import configure_client as deluge_client
+from nzb2media.torrent import deluge
-from nzb2media.plugins.downloaders.torrent.qbittorrent import configure_client as qbittorrent_client
+from nzb2media.torrent import qbittorrent
-from nzb2media.plugins.downloaders.torrent.synology import configure_client as synology_client
+from nzb2media.torrent import synology
-from nzb2media.plugins.downloaders.torrent.transmission import configure_client as transmission_client
+from nzb2media.torrent import transmission
-from nzb2media.plugins.downloaders.torrent.utorrent import configure_client as utorrent_client
+from nzb2media.torrent import utorrent
 
 torrent_clients = {
-    'deluge': deluge_client,
+    'deluge': deluge,
-    'qbittorrent': qbittorrent_client,
+    'qbittorrent': qbittorrent,
-    'transmission': transmission_client,
+    'transmission': transmission,
-    'utorrent': utorrent_client,
+    'utorrent': utorrent,
-    'synods': synology_client,
+    'synods': synology,
 }
 
 
@@ -23,9 +23,12 @@ def create_torrent_class(client_agent):
     if not nzb2media.APP_NAME == 'TorrentToMedia.py':
         return  # Skip loading Torrent for NZBs.
 
-    client = torrent_clients.get(client_agent)
+    try:
-    if client:
+        agent = torrent_clients[client_agent]
-        return client()
+    except KeyError:
+        return
+    else:
+        return agent.configure_client()
 
 
 def pause_torrent(client_agent, input_hash, input_id, input_name):