1
0
Fork 0
mirror of synced 2024-06-29 11:30:30 +12:00

Use .format() instead of regular expression

This commit is contained in:
Ali Parlakci 2021-03-27 19:21:02 +03:00
parent 3d2e11dc1d
commit 7a436d0481

View file

@ -27,20 +27,15 @@ class FileNameFormatter:
@staticmethod @staticmethod
def _format_name(submission: praw.models.Submission, format_string: str) -> str: def _format_name(submission: praw.models.Submission, format_string: str) -> str:
submission_attributes = { submission_attributes = {
'title': submission.title, 'TITLE': submission.title,
'subreddit': submission.subreddit.display_name, 'SUBREDDIT': submission.subreddit.display_name,
'redditor': submission.author.name if submission.author else 'DELETED', 'REDDITOR': submission.author.name if submission.author else 'DELETED',
'postid': submission.id, 'POSTID': submission.id,
'upvotes': submission.score, 'UPVOTES': submission.score,
'flair': submission.link_flair_text, 'FLAIR': submission.link_flair_text,
'date': submission.created_utc 'DATE': submission.created_utc
} }
result = format_string result = format_string.format(**submission_attributes)
for key in submission_attributes.keys():
if re.search(r'(?i).*{{{}}}.*'.format(key), result):
result = re.sub(r'(?i){{{}}}'.format(key), str(submission_attributes.get(key, 'unknown')), result)
logger.log(9, f'Found key string {key} in name')
result = result.replace('/', '') result = result.replace('/', '')
if platform.system() == 'Windows': if platform.system() == 'Windows':