From b6db785c9221638c152a10a5c0555ba24f19b8e3 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Sun, 10 Mar 2019 11:28:54 -0400 Subject: [PATCH] Refactor utils.subtitles to plugins.subtitles --- core/auto_process/movies.py | 2 +- core/auto_process/tv.py | 2 +- core/{utils => plugins}/subtitles.py | 0 core/user_scripts.py | 3 ++- core/utils/__init__.py | 1 - 5 files changed, 4 insertions(+), 4 deletions(-) rename core/{utils => plugins}/subtitles.py (100%) diff --git a/core/auto_process/movies.py b/core/auto_process/movies.py index 98ce62ad..b7fe3a66 100644 --- a/core/auto_process/movies.py +++ b/core/auto_process/movies.py @@ -14,12 +14,12 @@ from core.auto_process.common import ( completed_download_handling, ) from core.plugins.downloaders.nzb.utils import report_nzb +from core.plugins.subtitles import import_subs from core.scene_exceptions import process_all_exceptions from core.utils import ( convert_to_ascii, find_download, find_imdbid, - import_subs, list_media_files, remote_dir, remove_dir, diff --git a/core/auto_process/tv.py b/core/auto_process/tv.py index 3b9b46d3..c4a68f59 100644 --- a/core/auto_process/tv.py +++ b/core/auto_process/tv.py @@ -17,11 +17,11 @@ from core.auto_process.common import ( ) from core.forks import auto_fork from core.plugins.downloaders.nzb.utils import report_nzb +from core.plugins.subtitles import import_subs from core.scene_exceptions import process_all_exceptions from core.utils import ( convert_to_ascii, flatten, - import_subs, list_media_files, remote_dir, remove_dir, diff --git a/core/utils/subtitles.py b/core/plugins/subtitles.py similarity index 100% rename from core/utils/subtitles.py rename to core/plugins/subtitles.py diff --git a/core/user_scripts.py b/core/user_scripts.py index 83f17d60..5d447670 100644 --- a/core/user_scripts.py +++ b/core/user_scripts.py @@ -5,7 +5,8 @@ from subprocess import Popen import core from core import logger, transcoder -from core.utils import import_subs, list_media_files, remove_dir +from core.plugins.subtitles import import_subs +from core.utils import list_media_files, remove_dir def external_script(output_destination, torrent_name, torrent_label, settings): diff --git a/core/utils/__init__.py b/core/utils/__init__.py index 88b9692f..470fe4fd 100644 --- a/core/utils/__init__.py +++ b/core/utils/__init__.py @@ -42,7 +42,6 @@ from core.utils.paths import ( remove_read_only, ) from core.utils.processes import RunningProcess, restart -from core.utils.subtitles import import_subs requests.packages.urllib3.disable_warnings() shutil_custom.monkey_patch()