From 78f28f382eaa1773bda30ace04abc568df4d8720 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Sun, 18 Dec 2022 02:29:40 -0500 Subject: [PATCH] Fix tests and flake --- nzb2media/__init__.py | 12 +++++------- nzb2media/auto_process/books.py | 1 - nzb2media/auto_process/comics.py | 1 - nzb2media/auto_process/games.py | 1 - nzb2media/auto_process/movies.py | 1 - nzb2media/auto_process/music.py | 1 - nzb2media/auto_process/tv.py | 5 ++--- nzb2media/extractor/__init__.py | 2 +- nzb2media/managers/sickbeard.py | 4 ++-- nzb2media/plugins/subtitles.py | 2 +- nzb2media/processor/sab.py | 3 ++- nzb2media/transcoder.py | 5 +++-- nzb2media/utils/parsers.py | 2 +- nzb2media/version_check.py | 2 +- tox.ini | 6 ++++-- 15 files changed, 22 insertions(+), 26 deletions(-) diff --git a/nzb2media/__init__.py b/nzb2media/__init__.py index feaaf24c..6222d4ef 100644 --- a/nzb2media/__init__.py +++ b/nzb2media/__init__.py @@ -202,13 +202,11 @@ FORKS: typing.Mapping[str, typing.Mapping] = { ALL_FORKS = { k: None for k in set( - list( - itertools.chain.from_iterable( - [ - FORKS[x].keys() - for x in FORKS.keys() - ], - ), + itertools.chain.from_iterable( + [ + FORKS[x].keys() + for x in FORKS.keys() + ], ), ) } diff --git a/nzb2media/auto_process/books.py b/nzb2media/auto_process/books.py index f7b573b6..32221740 100644 --- a/nzb2media/auto_process/books.py +++ b/nzb2media/auto_process/books.py @@ -6,7 +6,6 @@ import requests import nzb2media from nzb2media.auto_process.common import ProcessResult -from nzb2media.utils.common import flatten from nzb2media.utils.encoding import convert_to_ascii from nzb2media.utils.network import server_responding from nzb2media.utils.paths import remote_dir diff --git a/nzb2media/auto_process/comics.py b/nzb2media/auto_process/comics.py index 2a9298a2..ddff35ea 100644 --- a/nzb2media/auto_process/comics.py +++ b/nzb2media/auto_process/comics.py @@ -7,7 +7,6 @@ import requests import nzb2media from nzb2media.auto_process.common import ProcessResult -from nzb2media.utils.common import flatten from nzb2media.utils.encoding import convert_to_ascii from nzb2media.utils.network import server_responding from nzb2media.utils.paths import remote_dir diff --git a/nzb2media/auto_process/games.py b/nzb2media/auto_process/games.py index 332a24cd..14427aef 100644 --- a/nzb2media/auto_process/games.py +++ b/nzb2media/auto_process/games.py @@ -8,7 +8,6 @@ import requests import nzb2media from nzb2media.auto_process.common import ProcessResult -from nzb2media.utils.common import flatten 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 12028a18..7d875976 100644 --- a/nzb2media/auto_process/movies.py +++ b/nzb2media/auto_process/movies.py @@ -15,7 +15,6 @@ from nzb2media.auto_process.common import completed_download_handling 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.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 diff --git a/nzb2media/auto_process/music.py b/nzb2media/auto_process/music.py index 2e31b535..67c85e08 100644 --- a/nzb2media/auto_process/music.py +++ b/nzb2media/auto_process/music.py @@ -11,7 +11,6 @@ import nzb2media from nzb2media.auto_process.common import ProcessResult from nzb2media.auto_process.common import command_complete from nzb2media.scene_exceptions import process_all_exceptions -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 diff --git a/nzb2media/auto_process/tv.py b/nzb2media/auto_process/tv.py index c2e3ea26..39c29b5d 100644 --- a/nzb2media/auto_process/tv.py +++ b/nzb2media/auto_process/tv.py @@ -394,8 +394,7 @@ def process( else: s = requests.Session() - log.debug(f'Opening URL: {url} with params: {fork_params}', section, - ) + log.debug(f'Opening URL: {url} with params: {fork_params}') if not apikey and username and password: login = f'{web_root}/login' login_params = {'username': username, 'password': password} @@ -569,7 +568,7 @@ def process( # f'{section}: Failed to post-process {input_name}' # ) - url2 = nzb2media.utils.common.create_url(scheme, host, port, route) + url2 = nzb2media.utils.common.create_url(scheme, host, port, route2) if completed_download_handling(url2, headers, section=section): log.debug(f'The Scan command did not return status completed, but complete Download Handling is enabled. Passing back to {section}.') return ProcessResult( diff --git a/nzb2media/extractor/__init__.py b/nzb2media/extractor/__init__.py index 6b1c7cb8..c2c25b70 100644 --- a/nzb2media/extractor/__init__.py +++ b/nzb2media/extractor/__init__.py @@ -199,7 +199,7 @@ def extract(file_path, output_destination): if res == 0: # Both Linux and Windows return 0 for successful. log.info(f'EXTRACTOR: Extraction was successful for {file_path} to {output_destination}') success = 1 - elif len(passwords) > 0 and not 'gunzip' in cmd: + elif len(passwords) > 0 and 'gunzip' not in cmd: log.info('EXTRACTOR: Attempting to extract with passwords') for password in passwords: if ( diff --git a/nzb2media/managers/sickbeard.py b/nzb2media/managers/sickbeard.py index 3aac8329..e877d39e 100644 --- a/nzb2media/managers/sickbeard.py +++ b/nzb2media/managers/sickbeard.py @@ -161,7 +161,7 @@ class InitSickBeard: token = oauth_token['access_token'] response = requests.get( url, - headers={f'Authorization': f'Bearer {token}'}, + headers={'Authorization': f'Bearer {token}'}, stream=True, verify=False, ) @@ -236,7 +236,7 @@ class InitSickBeard: log.debug(f'Removing excess parameters: ' f'{sorted(excess_parameters)}') rem_params.extend(excess_parameters) return rem_params, True - except: + except Exception: log.error('Failed to identify optionalParameters') return rem_params, False diff --git a/nzb2media/plugins/subtitles.py b/nzb2media/plugins/subtitles.py index 97c9278b..93703cf5 100644 --- a/nzb2media/plugins/subtitles.py +++ b/nzb2media/plugins/subtitles.py @@ -87,7 +87,7 @@ def rename_subs(path): lan = Language.fromname(word.lower()) if lan: break - except: # if we didn't find a language, try next word. + except Exception: # if we didn't find a language, try next word. continue # rename the sub file as name.lan.ext if not lan: diff --git a/nzb2media/processor/sab.py b/nzb2media/processor/sab.py index 6bee57a4..578677bc 100644 --- a/nzb2media/processor/sab.py +++ b/nzb2media/processor/sab.py @@ -26,7 +26,8 @@ def process_script(): def process(args): - """ + """Process job from SABnzb. + SABnzbd arguments: 1. The final directory of the job (full path) 2. The original name of the NZB file diff --git a/nzb2media/transcoder.py b/nzb2media/transcoder.py index 98559dcd..dbe8ba3a 100644 --- a/nzb2media/transcoder.py +++ b/nzb2media/transcoder.py @@ -922,7 +922,7 @@ def mount_iso( nzb2media.MOUNTED = ( mount_point # Allows us to verify this has been done and then cleanup. ) - for root, dirs, files in os.walk(mount_point): + for root, _dirs, files in os.walk(mount_point): for file in files: full_path = os.path.join(root, file) if ( @@ -1118,7 +1118,8 @@ def combine_mts(mts_path): def combine_cd(combine): new_files = [] for item in { - re.match('(.+)[cC][dD][0-9].', item).groups()[0] for item in combine + re.match('(.+)[cC][dD][0-9].', ea_item).groups()[0] + for ea_item in combine }: concat = '' for n in range(99): diff --git a/nzb2media/utils/parsers.py b/nzb2media/utils/parsers.py index f9edc490..3e237090 100644 --- a/nzb2media/utils/parsers.py +++ b/nzb2media/utils/parsers.py @@ -110,7 +110,7 @@ def parse_synods(args): task = [task for task in tasks if task['id'] == input_id][0] input_id = task['id'] input_directory = task['additional']['detail']['destination'] - except: + except Exception: log.error('unable to find download details in Synology DS') # Syno paths appear to be relative. Let's test to see if the returned path exists, and if not append to /volume1/ if not os.path.isdir(input_directory): diff --git a/nzb2media/version_check.py b/nzb2media/version_check.py index a13e5e05..15a36029 100644 --- a/nzb2media/version_check.py +++ b/nzb2media/version_check.py @@ -535,7 +535,7 @@ class SourceUpdateManager(UpdateManager): with open(version_path, 'w') as ver_file: ver_file.write(self._newest_commit_hash) except OSError as error: - log.error('Unable to write version file, update not complete: {msg}'.format(msg=error),) + log.error(f'Unable to write version file, update not complete: {error}') return False except Exception as error: diff --git a/tox.ini b/tox.ini index 92d36ed8..3a9471b1 100644 --- a/tox.ini +++ b/tox.ini @@ -27,7 +27,7 @@ deps = pytest-cov -rrequirements.txt commands = - {posargs:pytest --cov --cov-report=term-missing --cov-branch tests} + {posargs:pytest -vvv --cov --cov-report=term-missing --cov-branch tests} [flake8] max-line-length = 79 @@ -47,8 +47,10 @@ exclude = ignore = ; -- flake8 -- ; E501 line too long +; E722 do not use bare 'except' (duplicates B001) +; W503 line break before binary operator ; W505 doc line too long - E501, W505 + E501, E722, W503, W505 ; -- flake8-docstrings -- ; D100 Missing docstring in public module