From 0ab920675cb12f99b2795c29c8053e2d1e6a3215 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Sun, 4 Dec 2022 11:18:21 -0500 Subject: [PATCH] Standardize auto-processor signature and imports --- core/auto_process/books.py | 32 ++++++++++++++++++++++++++++---- core/auto_process/comics.py | 36 ++++++++++++++++++++++++++++++++---- core/auto_process/games.py | 36 +++++++++++++++++++++++++++++++----- core/auto_process/movies.py | 12 +++++++++++- core/auto_process/music.py | 34 +++++++++++++++++++++++++++++----- core/auto_process/tv.py | 7 ++++++- 6 files changed, 137 insertions(+), 20 deletions(-) diff --git a/core/auto_process/books.py b/core/auto_process/books.py index 98d328ae..2c7428e0 100644 --- a/core/auto_process/books.py +++ b/core/auto_process/books.py @@ -1,11 +1,33 @@ +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 core -from core import logger -from core.auto_process.common import ProcessResult +from core import logger, transcoder +from core.auto_process.common import ( + ProcessResult, + command_complete, + completed_download_handling, +) +from core.auto_process.managers.sickbeard import InitSickBeard +from core.plugins.downloaders.nzb.utils import report_nzb +from core.plugins.subtitles import import_subs, rename_subs +from core.scene_exceptions import process_all_exceptions from core.utils import ( convert_to_ascii, + find_download, + find_imdbid, + flatten, + list_media_files, remote_dir, + remove_dir, server_responding, ) @@ -17,11 +39,13 @@ def process( section, dir_name, input_name=None, - status=0, + status: int = 0, + failed=False, client_agent='manual', + download_id='', input_category=None, + failure_link=None, ) -> ProcessResult: - status = int(status) cfg = dict(core.CFG[section][input_category]) diff --git a/core/auto_process/comics.py b/core/auto_process/comics.py index 22badb22..f04daa6a 100644 --- a/core/auto_process/comics.py +++ b/core/auto_process/comics.py @@ -1,11 +1,36 @@ +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 core -from core import logger -from core.auto_process.common import ProcessResult -from core.utils import convert_to_ascii, remote_dir, server_responding +from core import logger, transcoder +from core.auto_process.common import ( + ProcessResult, + command_complete, + completed_download_handling, +) +from core.auto_process.managers.sickbeard import InitSickBeard +from core.plugins.downloaders.nzb.utils import report_nzb +from core.plugins.subtitles import import_subs, rename_subs +from core.scene_exceptions import process_all_exceptions +from core.utils import ( + convert_to_ascii, + find_download, + find_imdbid, + flatten, + list_media_files, + remote_dir, + remove_dir, + server_responding, +) + requests.packages.urllib3.disable_warnings() @@ -14,9 +39,12 @@ def process( section, dir_name, input_name=None, - status=0, + status: int = 0, + failed=False, client_agent='manual', + download_id='', input_category=None, + failure_link=None, ) -> ProcessResult: apc_version = '2.04' comicrn_version = '1.01' diff --git a/core/auto_process/games.py b/core/auto_process/games.py index e3c1cd0b..21224c27 100644 --- a/core/auto_process/games.py +++ b/core/auto_process/games.py @@ -1,12 +1,36 @@ +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 core -from core import logger -from core.auto_process.common import ProcessResult -from core.utils import convert_to_ascii, server_responding +from core import logger, transcoder +from core.auto_process.common import ( + ProcessResult, + command_complete, + completed_download_handling, +) +from core.auto_process.managers.sickbeard import InitSickBeard +from core.plugins.downloaders.nzb.utils import report_nzb +from core.plugins.subtitles import import_subs, rename_subs +from core.scene_exceptions import process_all_exceptions +from core.utils import ( + convert_to_ascii, + find_download, + find_imdbid, + flatten, + list_media_files, + remote_dir, + remove_dir, + server_responding, +) + requests.packages.urllib3.disable_warnings() @@ -15,11 +39,13 @@ def process( section, dir_name, input_name=None, - status=0, + status: int = 0, + failed=False, client_agent='manual', + download_id='', input_category=None, + failure_link=None, ) -> ProcessResult: - status = int(status) cfg = dict(core.CFG[section][input_category]) diff --git a/core/auto_process/movies.py b/core/auto_process/movies.py index 6ce8a347..bc07f4fd 100644 --- a/core/auto_process/movies.py +++ b/core/auto_process/movies.py @@ -1,8 +1,13 @@ +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 core from core import logger, transcoder @@ -11,6 +16,7 @@ from core.auto_process.common import ( command_complete, completed_download_handling, ) +from core.auto_process.managers.sickbeard import InitSickBeard from core.plugins.downloaders.nzb.utils import report_nzb from core.plugins.subtitles import import_subs, rename_subs from core.scene_exceptions import process_all_exceptions @@ -18,12 +24,14 @@ from core.utils import ( convert_to_ascii, find_download, find_imdbid, + flatten, list_media_files, remote_dir, remove_dir, server_responding, ) + requests.packages.urllib3.disable_warnings() @@ -31,12 +39,14 @@ def process( section, dir_name, input_name=None, - status=0, + status: int = 0, + failed=False, client_agent='manual', download_id='', input_category=None, failure_link=None, ) -> ProcessResult: + cfg = dict(core.CFG[section][input_category]) host = cfg['host'] diff --git a/core/auto_process/music.py b/core/auto_process/music.py index 29adda5d..971d03ed 100644 --- a/core/auto_process/music.py +++ b/core/auto_process/music.py @@ -1,14 +1,36 @@ +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 core -from core import logger -from core.auto_process.common import command_complete, ProcessResult +from core import logger, transcoder +from core.auto_process.common import ( + ProcessResult, + command_complete, + completed_download_handling, +) +from core.auto_process.managers.sickbeard import InitSickBeard +from core.plugins.downloaders.nzb.utils import report_nzb +from core.plugins.subtitles import import_subs, rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import convert_to_ascii, list_media_files, remote_dir, remove_dir, server_responding +from core.utils import ( + convert_to_ascii, + find_download, + find_imdbid, + flatten, + list_media_files, + remote_dir, + remove_dir, + server_responding, +) + requests.packages.urllib3.disable_warnings() @@ -17,11 +39,13 @@ def process( section, dir_name, input_name=None, - status=0, + status: int = 0, + failed=False, client_agent='manual', + download_id='', input_category=None, + failure_link=None, ) -> ProcessResult: - status = int(status) cfg = dict(core.CFG[section][input_category]) diff --git a/core/auto_process/tv.py b/core/auto_process/tv.py index b3bc76ca..71286cf4 100644 --- a/core/auto_process/tv.py +++ b/core/auto_process/tv.py @@ -2,6 +2,7 @@ import copy import errno import json import os +import shutil import time import requests @@ -21,6 +22,8 @@ from core.plugins.subtitles import import_subs, rename_subs from core.scene_exceptions import process_all_exceptions from core.utils import ( convert_to_ascii, + find_download, + find_imdbid, flatten, list_media_files, remote_dir, @@ -36,12 +39,14 @@ def process( section, dir_name, input_name=None, + status: int = 0, failed=False, client_agent='manual', - download_id=None, + download_id='', input_category=None, failure_link=None, ) -> ProcessResult: + cfg = dict(core.CFG[section][input_category]) host = cfg['host']