ModerateWinGuy/BDFR_Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert some strings to f-strings

Browse Source
This commit is contained in:
Serene-Arc
2021-03-10 11:08:24 +10:00
committed by Ali Parlakci
parent 09e42ff5f9
commit a471629287
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bulkredditdownloader/downloader.py
View File

@@ -261,33 +261,33 @@ class RedditDownloader:
def _download_submission(self, submission: praw.models.Submission): def _download_submission(self, submission: praw.models.Submission):
if self.download_filter.check_url(submission.url): if self.download_filter.check_url(submission.url):
logger.debug('Attempting to download submission {}'.format(submission.id)) logger.debug(f'Attempting to download submission {submission.id}')
try: try:
downloader_class = DownloadFactory.pull_lever(submission.url) downloader_class = DownloadFactory.pull_lever(submission.url)
downloader = downloader_class(submission) downloader = downloader_class(submission)
except errors.NotADownloadableLinkError as e: except errors.NotADownloadableLinkError as e:
logger.error('Could not download submission {}: {}'.format(submission.name, e)) logger.error(f'Could not download submission {submission.name}: {e}')
return return
if self.args.no_download: if self.args.no_download:
logger.info('Skipping download for submission {}'.format(submission.id)) logger.info(f'Skipping download for submission {submission.id}')
else: else:
content = downloader.find_resources(self.authenticator) content = downloader.find_resources(self.authenticator)
for res in content: for res in content:
destination = self.file_name_formatter.format_path(res, self.download_directory) destination = self.file_name_formatter.format_path(res, self.download_directory)
if destination.exists(): if destination.exists():
logger.debug('File already exists: {}'.format(destination)) logger.debug(f'File already exists: {destination}')
else: else:
if res.hash.hexdigest() not in self.master_hash_list and not self.args.no_dupes: if res.hash.hexdigest() not in self.master_hash_list and not self.args.no_dupes:
# TODO: consider making a hard link/symlink here # TODO: consider making a hard link/symlink here
destination.parent.mkdir(parents=True, exist_ok=True) destination.parent.mkdir(parents=True, exist_ok=True)
with open(destination, 'wb') as file: with open(destination, 'wb') as file:
file.write(res.content) file.write(res.content)
logger.debug('Written file to {}'.format(destination)) logger.debug(f'Written file to {destination}')
self.master_hash_list.append(res.hash.hexdigest()) self.master_hash_list.append(res.hash.hexdigest())
logger.debug('Hash added to master list: {}'.format(res.hash.hexdigest())) logger.debug(f'Hash added to master list: {res.hash.hexdigest()}')
else: else:
logger.debug(f'Resource from {res.url} downloaded elsewhere') logger.debug(f'Resource from {res.url} downloaded elsewhere')
logger.info('Downloaded submission {}'.format(submission.name)) logger.info(f'Downloaded submission {submission.name}')