From 831f49daa65afa5a0485426d2a090b8354275ac6 Mon Sep 17 00:00:00 2001 From: OMEGARAZER <869111+OMEGARAZER@users.noreply.github.com> Date: Wed, 30 Nov 2022 17:19:02 -0500 Subject: [PATCH] Refurb linting Lint with [refurb](https://github.com/dosisod/refurb) using `--disable 126 --python-version 3.9` --- bdfr/configuration.py | 2 +- bdfr/connector.py | 8 ++++---- bdfr/download_filter.py | 4 ++-- bdfr/downloader.py | 4 ++-- bdfr/file_name_formatter.py | 2 +- bdfr/site_downloaders/youtube.py | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bdfr/configuration.py b/bdfr/configuration.py index 46c4cf0..c15e429 100644 --- a/bdfr/configuration.py +++ b/bdfr/configuration.py @@ -75,7 +75,7 @@ class Configuration(Namespace): if not yaml_file_loc.exists(): logger.error(f'No YAML file found at {yaml_file_loc}') return - with open(yaml_file_loc) as file: + with yaml_file_loc.open() as file: try: opts = yaml.load(file, Loader=yaml.FullLoader) except yaml.YAMLError as e: diff --git a/bdfr/connector.py b/bdfr/connector.py index 9aa2a6e..3b359e8 100644 --- a/bdfr/connector.py +++ b/bdfr/connector.py @@ -91,7 +91,7 @@ class RedditConnector(metaclass=ABCMeta): logger.log(9, 'Created site authenticator') self.args.skip_subreddit = self.split_args_input(self.args.skip_subreddit) - self.args.skip_subreddit = set([sub.lower() for sub in self.args.skip_subreddit]) + self.args.skip_subreddit = {sub.lower() for sub in self.args.skip_subreddit} def read_config(self): """Read any cfg values that need to be processed""" @@ -113,7 +113,7 @@ class RedditConnector(metaclass=ABCMeta): def parse_disabled_modules(self): disabled_modules = self.args.disable_module disabled_modules = self.split_args_input(disabled_modules) - disabled_modules = set([name.strip().lower() for name in disabled_modules]) + disabled_modules = {name.strip().lower() for name in disabled_modules} self.args.disable_module = disabled_modules logger.debug(f'Disabling the following modules: {", ".join(self.args.disable_module)}') @@ -249,7 +249,7 @@ class RedditConnector(metaclass=ABCMeta): if self.args.authenticate: try: subscribed_subreddits = list(self.reddit_instance.user.subreddits(limit=None)) - subscribed_subreddits = set([s.display_name for s in subscribed_subreddits]) + subscribed_subreddits = {s.display_name for s in subscribed_subreddits} except prawcore.InsufficientScope: logger.error('BDFR has insufficient scope to access subreddit lists') else: @@ -428,7 +428,7 @@ class RedditConnector(metaclass=ABCMeta): if not id_file.exists(): logger.warning(f'ID file at {id_file} does not exist') continue - with open(id_file, 'r') as file: + with id_file.open('r') as file: for line in file: out.append(line.strip()) return set(out) diff --git a/bdfr/download_filter.py b/bdfr/download_filter.py index 3bbbdec..28053be 100644 --- a/bdfr/download_filter.py +++ b/bdfr/download_filter.py @@ -36,7 +36,7 @@ class DownloadFilter: combined_extensions = '|'.join(self.excluded_extensions) pattern = re.compile(r'.*({})$'.format(combined_extensions)) if re.match(pattern, resource_extension): - logger.log(9, f'Url "{resource_extension}" matched with "{str(pattern)}"') + logger.log(9, f'Url "{resource_extension}" matched with "{pattern}"') return False else: return True @@ -47,7 +47,7 @@ class DownloadFilter: combined_domains = '|'.join(self.excluded_domains) pattern = re.compile(r'https?://.*({}).*'.format(combined_domains)) if re.match(pattern, url): - logger.log(9, f'Url "{url}" matched with "{str(pattern)}"') + logger.log(9, f'Url "{url}" matched with "{pattern}"') return False else: return True diff --git a/bdfr/downloader.py b/bdfr/downloader.py index 057f6af..6f26937 100644 --- a/bdfr/downloader.py +++ b/bdfr/downloader.py @@ -25,7 +25,7 @@ logger = logging.getLogger(__name__) def _calc_hash(existing_file: Path): chunk_size = 1024 * 1024 md5_hash = hashlib.md5() - with open(existing_file, 'rb') as file: + with existing_file.open('rb') as file: chunk = file.read(chunk_size) while chunk: md5_hash.update(chunk) @@ -127,7 +127,7 @@ class RedditDownloader(RedditConnector): f' in submission {submission.id}') return try: - with open(destination, 'wb') as file: + with destination.open('wb') as file: file.write(res.content) logger.debug(f'Written file to {destination}') except OSError as e: diff --git a/bdfr/file_name_formatter.py b/bdfr/file_name_formatter.py index 1dabd34..70bd527 100644 --- a/bdfr/file_name_formatter.py +++ b/bdfr/file_name_formatter.py @@ -107,7 +107,7 @@ class FileNameFormatter: destination_directory, *[self._format_name(resource.source_submission, part) for part in self.directory_format_string], ) - index = f'_{str(index)}' if index else '' + index = f'_{index}' if index else '' if not resource.extension: raise BulkDownloaderException(f'Resource from {resource.url} has no extension') file_name = str(self._format_name(resource.source_submission, self.file_format_string)) diff --git a/bdfr/site_downloaders/youtube.py b/bdfr/site_downloaders/youtube.py index 70c35ae..315fd0a 100644 --- a/bdfr/site_downloaders/youtube.py +++ b/bdfr/site_downloaders/youtube.py @@ -48,11 +48,11 @@ class Youtube(BaseDownloader): raise SiteDownloaderError(f'Youtube download failed: {e}') downloaded_files = list(download_path.iterdir()) - if len(downloaded_files) > 0: + if downloaded_files: downloaded_file = downloaded_files[0] else: raise NotADownloadableLinkError(f"No media exists in the URL {self.post.url}") - with open(downloaded_file, 'rb') as file: + with downloaded_file.open('rb') as file: content = file.read() return content return download