From 7f2a4d26050fc1745ea6de6ef462515fc70c88c9 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Sun, 16 Dec 2018 22:05:08 -0500 Subject: [PATCH] PEP8 Class name should be CamelCase --- TorrentToMedia.py | 20 ++++++++++---------- core/__init__.py | 10 +++++----- core/autoProcess/autoProcessComics.py | 2 +- core/autoProcess/autoProcessGames.py | 2 +- core/autoProcess/autoProcessMovie.py | 2 +- core/autoProcess/autoProcessMusic.py | 2 +- core/autoProcess/autoProcessTV.py | 2 +- nzbToMedia.py | 26 +++++++++++++------------- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/TorrentToMedia.py b/TorrentToMedia.py index e021ee1d..c06195c3 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -236,22 +236,22 @@ def process_torrent(inputDirectory, inputName, inputCategory, inputHash, inputID result = external_script(output_destination, input_name, input_category, section) elif section_name in ['CouchPotato', 'Radarr']: - result = core.autoProcessMovie().process(section_name, output_destination, input_name, - status, clientAgent, input_hash, input_category) + result = core.Movie().process(section_name, output_destination, input_name, + status, clientAgent, input_hash, input_category) elif section_name in ['SickBeard', 'NzbDrone', 'Sonarr']: if input_hash: input_hash = input_hash.upper() - result = core.autoProcessTV().process_episode(section_name, output_destination, input_name, - status, clientAgent, input_hash, input_category) + result = core.TV().process_episode(section_name, output_destination, input_name, + status, clientAgent, input_hash, input_category) elif section_name in ['HeadPhones', 'Lidarr']: - result = core.autoProcessMusic().process(section_name, output_destination, input_name, - status, clientAgent, input_category) + result = core.Music().process(section_name, output_destination, input_name, + status, clientAgent, input_category) elif section_name == 'Mylar': - result = core.autoProcessComics().process_episode(section_name, output_destination, input_name, - status, clientAgent, input_category) + result = core.Comic().process_episode(section_name, output_destination, input_name, + status, clientAgent, input_category) elif section_name == 'Gamez': - result = core.autoProcessGames().process(section_name, output_destination, input_name, - status, clientAgent, input_category) + result = core.Game().process(section_name, output_destination, input_name, + status, clientAgent, input_category) plex_update(input_category) diff --git a/core/__init__.py b/core/__init__.py index ca9f2d8d..c5fd2c95 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -37,11 +37,11 @@ import six from six.moves import reload_module from core import logger, nzbToMediaDB, versionCheck -from core.autoProcess.autoProcessComics import autoProcessComics -from core.autoProcess.autoProcessGames import autoProcessGames -from core.autoProcess.autoProcessMovie import autoProcessMovie -from core.autoProcess.autoProcessMusic import autoProcessMusic -from core.autoProcess.autoProcessTV import autoProcessTV +from core.autoProcess.autoProcessComics import Comic +from core.autoProcess.autoProcessGames import Game +from core.autoProcess.autoProcessMovie import Movie +from core.autoProcess.autoProcessMusic import Music +from core.autoProcess.autoProcessTV import TV from core.databases import mainDB from core.nzbToMediaConfig import config from core.nzbToMediaUtil import ( diff --git a/core/autoProcess/autoProcessComics.py b/core/autoProcess/autoProcessComics.py index c2d00bd1..b6381758 100644 --- a/core/autoProcess/autoProcessComics.py +++ b/core/autoProcess/autoProcessComics.py @@ -11,7 +11,7 @@ from core.nzbToMediaUtil import convert_to_ascii, remote_dir, server_responding requests.packages.urllib3.disable_warnings() -class autoProcessComics(object): +class Comic(object): def process_episode(self, section, dirName, inputName=None, status=0, clientAgent='manual', inputCategory=None): dir_name = dirName input_name = inputName diff --git a/core/autoProcess/autoProcessGames.py b/core/autoProcess/autoProcessGames.py index c45193c9..8f7b1190 100644 --- a/core/autoProcess/autoProcessGames.py +++ b/core/autoProcess/autoProcessGames.py @@ -12,7 +12,7 @@ from core.nzbToMediaUtil import convert_to_ascii, server_responding requests.packages.urllib3.disable_warnings() -class autoProcessGames(object): +class Game(object): def process(self, section, dirName, inputName=None, status=0, clientAgent='manual', inputCategory=None): dir_name = dirName input_name = inputName diff --git a/core/autoProcess/autoProcessMovie.py b/core/autoProcess/autoProcessMovie.py index 4a30e1cf..9629a9d5 100644 --- a/core/autoProcess/autoProcessMovie.py +++ b/core/autoProcess/autoProcessMovie.py @@ -15,7 +15,7 @@ from core.transcoder import transcoder requests.packages.urllib3.disable_warnings() -class autoProcessMovie(object): +class Movie(object): def get_release(self, baseURL, imdbid=None, download_id=None, release_id=None): results = {} params = {} diff --git a/core/autoProcess/autoProcessMusic.py b/core/autoProcess/autoProcessMusic.py index 343bbe92..f5eaeb1a 100644 --- a/core/autoProcess/autoProcessMusic.py +++ b/core/autoProcess/autoProcessMusic.py @@ -14,7 +14,7 @@ from core.nzbToMediaUtil import convert_to_ascii, list_media_files, remote_dir, requests.packages.urllib3.disable_warnings() -class autoProcessMusic(object): +class Music(object): def command_complete(self, url, params, headers, section): try: r = requests.get(url, params=params, headers=headers, stream=True, verify=False, timeout=(30, 60)) diff --git a/core/autoProcess/autoProcessTV.py b/core/autoProcess/autoProcessTV.py index 0a2b7761..8d85fddc 100644 --- a/core/autoProcess/autoProcessTV.py +++ b/core/autoProcess/autoProcessTV.py @@ -18,7 +18,7 @@ from core.transcoder import transcoder requests.packages.urllib3.disable_warnings() -class autoProcessTV(object): +class TV(object): def command_complete(self, url, params, headers, section): try: r = requests.get(url, params=params, headers=headers, stream=True, verify=False, timeout=(30, 60)) diff --git a/nzbToMedia.py b/nzbToMedia.py index 4735f018..8eae32cc 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -629,11 +629,11 @@ import sys import core from core import logger, nzbToMediaDB -from core.autoProcess.autoProcessComics import autoProcessComics -from core.autoProcess.autoProcessGames import autoProcessGames -from core.autoProcess.autoProcessMovie import autoProcessMovie -from core.autoProcess.autoProcessMusic import autoProcessMusic -from core.autoProcess.autoProcessTV import autoProcessTV +from core.autoProcess.autoProcessComics import Comic +from core.autoProcess.autoProcessGames import Game +from core.autoProcess.autoProcessMovie import Movie +from core.autoProcess.autoProcessMusic import Music +from core.autoProcess.autoProcessTV import TV from core.nzbToMediaUserScript import external_script from core.nzbToMediaUtil import char_replace, clean_dir, convert_to_ascii, extract_files, get_dirs, get_download_info, get_nzoid, plex_update, update_download_info_status @@ -732,18 +732,18 @@ def process(inputDirectory, inputName=None, status=0, clientAgent='manual', down logger.info("Calling {0}:{1} to post-process:{2}".format(section_name, input_category, input_name)) if section_name in ["CouchPotato", "Radarr"]: - result = autoProcessMovie().process(section_name, input_directory, input_name, status, clientAgent, download_id, - input_category, failureLink) + result = Movie().process(section_name, input_directory, input_name, status, clientAgent, download_id, + input_category, failureLink) elif section_name in ["SickBeard", "NzbDrone", "Sonarr"]: - result = autoProcessTV().process_episode(section_name, input_directory, input_name, status, clientAgent, - download_id, input_category, failureLink) + result = TV().process_episode(section_name, input_directory, input_name, status, clientAgent, + download_id, input_category, failureLink) elif section_name in ["HeadPhones", "Lidarr"]: - result = autoProcessMusic().process(section_name, input_directory, input_name, status, clientAgent, input_category) + result = Music().process(section_name, input_directory, input_name, status, clientAgent, input_category) elif section_name == "Mylar": - result = autoProcessComics().process_episode(section_name, input_directory, input_name, status, clientAgent, - input_category) + result = Comic().process_episode(section_name, input_directory, input_name, status, clientAgent, + input_category) elif section_name == "Gamez": - result = autoProcessGames().process(section_name, input_directory, input_name, status, clientAgent, input_category) + result = Game().process(section_name, input_directory, input_name, status, clientAgent, input_category) elif section_name == 'UserScript': result = external_script(input_directory, input_name, input_category, section[usercat]) else: