diff --git a/nzb2media/__init__.py b/nzb2media/__init__.py index e74e9667..fa5f319c 100644 --- a/nzb2media/__init__.py +++ b/nzb2media/__init__.py @@ -45,35 +45,31 @@ MYAPP = None from nzb2media import logger, main_db, version_check, databases, transcoder from nzb2media.configuration import config -from nzb2media.plugins.downloaders.configuration import ( - configure_nzbs, - configure_torrents, - configure_torrent_class, -) -from nzb2media.plugins.downloaders.utils import ( - pause_torrent, - remove_torrent, - resume_torrent, -) +from nzb2media.plugins.downloaders.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.utils.processes import RunningProcess -from nzb2media.utils.processes import restart -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.paths import rchmod -from nzb2media.utils.paths import remove_dir -from nzb2media.utils.paths import remove_read_only 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.parsers import parse_args -from nzb2media.utils.network import wake_up +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 __version__ = '12.1.11' diff --git a/nzb2media/auto_process/books.py b/nzb2media/auto_process/books.py index c1ac5aad..694d3e86 100644 --- a/nzb2media/auto_process/books.py +++ b/nzb2media/auto_process/books.py @@ -1,35 +1,14 @@ from __future__ import annotations -import copy -import errno -import json -import os -import shutil -import time - import requests -from oauthlib.oauth2 import LegacyApplicationClient -from requests_oauthlib import OAuth2Session import nzb2media from nzb2media import logger -from nzb2media import transcoder -from nzb2media.auto_process.common import command_complete -from nzb2media.auto_process.common import completed_download_handling from nzb2media.auto_process.common import ProcessResult -from nzb2media.auto_process.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 -from nzb2media.utils.encoding import convert_to_ascii -from nzb2media.utils.network import find_download -from nzb2media.utils.identification import find_imdbid from nzb2media.utils.common import flatten -from nzb2media.utils.files import list_media_files -from nzb2media.utils.paths import remote_dir -from nzb2media.utils.paths import remove_dir +from nzb2media.utils.encoding import convert_to_ascii from nzb2media.utils.network import server_responding +from nzb2media.utils.paths import remote_dir def process( diff --git a/nzb2media/auto_process/comics.py b/nzb2media/auto_process/comics.py index ee1c2b82..31dc6a43 100644 --- a/nzb2media/auto_process/comics.py +++ b/nzb2media/auto_process/comics.py @@ -1,35 +1,16 @@ from __future__ import annotations -import copy -import errno -import json import os -import shutil -import time import requests -from oauthlib.oauth2 import LegacyApplicationClient -from requests_oauthlib import OAuth2Session import nzb2media from nzb2media import logger -from nzb2media import transcoder -from nzb2media.auto_process.common import command_complete -from nzb2media.auto_process.common import completed_download_handling from nzb2media.auto_process.common import ProcessResult -from nzb2media.auto_process.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 -from nzb2media.utils.encoding import convert_to_ascii -from nzb2media.utils.network import find_download -from nzb2media.utils.identification import find_imdbid from nzb2media.utils.common import flatten -from nzb2media.utils.files import list_media_files -from nzb2media.utils.paths import remote_dir -from nzb2media.utils.paths import remove_dir +from nzb2media.utils.encoding import convert_to_ascii from nzb2media.utils.network import server_responding +from nzb2media.utils.paths import remote_dir def process( diff --git a/nzb2media/auto_process/games.py b/nzb2media/auto_process/games.py index f44c0ffb..5238d6f3 100644 --- a/nzb2media/auto_process/games.py +++ b/nzb2media/auto_process/games.py @@ -1,34 +1,15 @@ from __future__ import annotations -import copy -import errno -import json import os import shutil -import time import requests -from oauthlib.oauth2 import LegacyApplicationClient -from requests_oauthlib import OAuth2Session import nzb2media from nzb2media import logger -from nzb2media import transcoder -from nzb2media.auto_process.common import command_complete -from nzb2media.auto_process.common import completed_download_handling from nzb2media.auto_process.common import ProcessResult -from nzb2media.auto_process.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 -from nzb2media.utils.encoding import convert_to_ascii -from nzb2media.utils.network import find_download -from nzb2media.utils.identification import find_imdbid from nzb2media.utils.common import flatten -from nzb2media.utils.files import list_media_files -from nzb2media.utils.paths import remote_dir -from nzb2media.utils.paths import remove_dir +from nzb2media.utils.encoding import convert_to_ascii from nzb2media.utils.network import server_responding diff --git a/nzb2media/auto_process/movies.py b/nzb2media/auto_process/movies.py index 4863960d..8ee6e4d9 100644 --- a/nzb2media/auto_process/movies.py +++ b/nzb2media/auto_process/movies.py @@ -1,35 +1,29 @@ from __future__ import annotations -import copy -import errno import json import os -import shutil import time import requests -from oauthlib.oauth2 import LegacyApplicationClient -from requests_oauthlib import OAuth2Session import nzb2media from nzb2media import logger 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.common import ProcessResult -from nzb2media.auto_process.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 -from nzb2media.utils.encoding import convert_to_ascii -from nzb2media.utils.network import find_download -from nzb2media.utils.identification import find_imdbid 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.identification import find_imdbid +from nzb2media.utils.network import find_download +from nzb2media.utils.network import server_responding from nzb2media.utils.paths import remote_dir from nzb2media.utils.paths import remove_dir -from nzb2media.utils.network import server_responding def process( diff --git a/nzb2media/auto_process/music.py b/nzb2media/auto_process/music.py index c3a1bd17..09e46009 100644 --- a/nzb2media/auto_process/music.py +++ b/nzb2media/auto_process/music.py @@ -1,35 +1,22 @@ from __future__ import annotations -import copy -import errno import json import os -import shutil import time import requests -from oauthlib.oauth2 import LegacyApplicationClient -from requests_oauthlib import OAuth2Session import nzb2media from nzb2media import logger -from nzb2media import transcoder -from nzb2media.auto_process.common import command_complete -from nzb2media.auto_process.common import completed_download_handling from nzb2media.auto_process.common import ProcessResult -from nzb2media.auto_process.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.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.network import find_download -from nzb2media.utils.identification import find_imdbid 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.paths import remote_dir from nzb2media.utils.paths import remove_dir -from nzb2media.utils.network import server_responding def process( diff --git a/nzb2media/auto_process/tv.py b/nzb2media/auto_process/tv.py index 21b0fd09..a5c801c3 100644 --- a/nzb2media/auto_process/tv.py +++ b/nzb2media/auto_process/tv.py @@ -4,7 +4,6 @@ import copy import errno import json import os -import shutil import time import requests @@ -14,22 +13,20 @@ from requests_oauthlib import OAuth2Session import nzb2media from nzb2media import logger 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.common import ProcessResult from nzb2media.auto_process.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 -from nzb2media.utils.encoding import convert_to_ascii -from nzb2media.utils.network import find_download -from nzb2media.utils.identification import find_imdbid 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.paths import remote_dir from nzb2media.utils.paths import remove_dir -from nzb2media.utils.network import server_responding def process( diff --git a/nzb2media/plugins/downloaders/configuration.py b/nzb2media/plugins/downloaders/configuration.py deleted file mode 100644 index febd092f..00000000 --- a/nzb2media/plugins/downloaders/configuration.py +++ /dev/null @@ -1,7 +0,0 @@ -from __future__ import annotations - -from nzb2media.plugins.downloaders.nzb.configuration import configure_nzbs -from nzb2media.plugins.downloaders.torrent.configuration import ( - configure_torrent_class, -) -from nzb2media.plugins.downloaders.torrent.configuration import configure_torrents diff --git a/nzb2media/plugins/downloaders/torrent/utils.py b/nzb2media/plugins/downloaders/torrent/utils.py index ea1fc282..c2dcee42 100644 --- a/nzb2media/plugins/downloaders/torrent/utils.py +++ b/nzb2media/plugins/downloaders/torrent/utils.py @@ -4,12 +4,11 @@ import time import nzb2media from nzb2media import logger - -from .deluge import configure_client as deluge_client -from .qbittorrent import configure_client as qbittorrent_client -from .synology import configure_client as synology_client -from .transmission import configure_client as transmission_client -from .utorrent import configure_client as utorrent_client +from nzb2media.plugins.downloaders.torrent.deluge import configure_client as deluge_client +from nzb2media.plugins.downloaders.torrent.qbittorrent import configure_client as qbittorrent_client +from nzb2media.plugins.downloaders.torrent.synology import configure_client as synology_client +from nzb2media.plugins.downloaders.torrent.transmission import configure_client as transmission_client +from nzb2media.plugins.downloaders.torrent.utorrent import configure_client as utorrent_client torrent_clients = { 'deluge': deluge_client, diff --git a/nzb2media/plugins/downloaders/utils.py b/nzb2media/plugins/downloaders/utils.py deleted file mode 100644 index d7f5442c..00000000 --- a/nzb2media/plugins/downloaders/utils.py +++ /dev/null @@ -1,5 +0,0 @@ -from __future__ import annotations - -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 diff --git a/nzb2media/processor/nzb.py b/nzb2media/processor/nzb.py index e07e7166..cc112fbc 100644 --- a/nzb2media/processor/nzb.py +++ b/nzb2media/processor/nzb.py @@ -15,11 +15,11 @@ 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.encoding import char_replace from nzb2media.utils.common import clean_dir +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.download_info import update_download_info_status def process( diff --git a/nzb2media/user_scripts.py b/nzb2media/user_scripts.py index b97d0a48..8a197b3c 100644 --- a/nzb2media/user_scripts.py +++ b/nzb2media/user_scripts.py @@ -5,10 +5,10 @@ from subprocess import Popen import nzb2media from nzb2media import logger, transcoder +from nzb2media.auto_process.common import ProcessResult from nzb2media.plugins.subtitles import import_subs from nzb2media.utils.files import list_media_files from nzb2media.utils.paths import remove_dir -from nzb2media.auto_process.common import ProcessResult def external_script(output_destination, torrent_name, torrent_label, settings): diff --git a/nzb2media/utils/common.py b/nzb2media/utils/common.py index 108f8c91..8bb15448 100644 --- a/nzb2media/utils/common.py +++ b/nzb2media/utils/common.py @@ -1,7 +1,6 @@ from __future__ import annotations import os.path -import typing import urllib.parse import nzb2media diff --git a/nzb2media/utils/processes.py b/nzb2media/utils/processes.py index 8da27c42..6182cd91 100644 --- a/nzb2media/utils/processes.py +++ b/nzb2media/utils/processes.py @@ -8,8 +8,8 @@ import typing import nzb2media from nzb2media import APP_FILENAME -from nzb2media import logger from nzb2media import SYS_ARGV +from nzb2media import logger from nzb2media import version_check if os.name == 'nt':