diff --git a/TorrentToMedia.py b/TorrentToMedia.py index a1208b93..55840dd5 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -237,14 +237,14 @@ def process_torrent(input_directory, input_name, input_category, input_hash, inp elif section_name in ['SickBeard', 'NzbDrone', 'Sonarr']: if input_hash: input_hash = input_hash.upper() - result = core.TV().process_episode(section_name, output_destination, input_name, - status, client_agent, input_hash, input_category) + result = core.TV().process(section_name, output_destination, input_name, + status, client_agent, input_hash, input_category) elif section_name in ['HeadPhones', 'Lidarr']: result = core.Music().process(section_name, output_destination, input_name, status, client_agent, input_category) elif section_name == 'Mylar': - result = core.Comic().process_episode(section_name, output_destination, input_name, - status, client_agent, input_category) + result = core.Comic().process(section_name, output_destination, input_name, + status, client_agent, input_category) elif section_name == 'Gamez': result = core.Game().process(section_name, output_destination, input_name, status, client_agent, input_category) diff --git a/core/auto_process/comics.py b/core/auto_process/comics.py index 383105e2..40accce1 100644 --- a/core/auto_process/comics.py +++ b/core/auto_process/comics.py @@ -12,7 +12,7 @@ requests.packages.urllib3.disable_warnings() class Comic(object): - def process_episode(self, section, dir_name, input_name=None, status=0, client_agent='manual', input_category=None): + def process(self, section, dir_name, input_name=None, status=0, client_agent='manual', input_category=None): apc_version = "2.04" comicrn_version = "1.01" diff --git a/core/auto_process/tv.py b/core/auto_process/tv.py index 800776d6..988ebade 100644 --- a/core/auto_process/tv.py +++ b/core/auto_process/tv.py @@ -51,7 +51,7 @@ class TV(object): # ValueError catches simplejson's JSONDecodeError and json's ValueError return False - def process_episode(self, section, dir_name, input_name=None, failed=False, client_agent="manual", download_id=None, input_category=None, failure_link=None): + def process(self, section, dir_name, input_name=None, failed=False, client_agent="manual", download_id=None, input_category=None, failure_link=None): cfg = dict(core.CFG[section][input_category]) diff --git a/nzbToMedia.py b/nzbToMedia.py index bea35444..c29a3de4 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -728,13 +728,13 @@ def process(input_directory, input_name=None, status=0, client_agent='manual', d result = Movie().process(section_name, input_directory, input_name, status, client_agent, download_id, input_category, failure_link) elif section_name in ["SickBeard", "NzbDrone", "Sonarr"]: - result = TV().process_episode(section_name, input_directory, input_name, status, client_agent, - download_id, input_category, failure_link) + result = TV().process(section_name, input_directory, input_name, status, client_agent, + download_id, input_category, failure_link) elif section_name in ["HeadPhones", "Lidarr"]: result = Music().process(section_name, input_directory, input_name, status, client_agent, input_category) elif section_name == "Mylar": - result = Comic().process_episode(section_name, input_directory, input_name, status, client_agent, - input_category) + result = Comic().process(section_name, input_directory, input_name, status, client_agent, + input_category) elif section_name == "Gamez": result = Game().process(section_name, input_directory, input_name, status, client_agent, input_category) elif section_name == 'UserScript':