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

Merge pull request #565 from dbanon87/dbanon87-patch-1

Browse Source
This commit is contained in:
Serene
2021-11-30 17:38:54 +10:00
committed by GitHub
parent 8718295ee5 1530456cf7
commit 5333705440
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bdfr/archiver.py
View File

@@ -28,10 +28,11 @@ class Archiver(RedditConnector):
def download(self): def download(self):
for generator in self.reddit_lists: for generator in self.reddit_lists:
for submission in generator: for submission in generator:
if submission.author.name in self.args.ignore_user: if (submission.author and submission.author.name in self.args.ignore_user) or \
(submission.author is None and 'DELETED' in self.args.ignore_user):
logger.debug( logger.debug(
f'Submission {submission.id} in {submission.subreddit.display_name} skipped' f'Submission {submission.id} in {submission.subreddit.display_name} skipped'
f' due to {submission.author.name} being an ignored user') f' due to {submission.author.name if submission.author else "DELETED"} being an ignored user')
continue continue
logger.debug(f'Attempting to archive submission {submission.id}') logger.debug(f'Attempting to archive submission {submission.id}')
self.write_entry(submission) self.write_entry(submission)

5
bdfr/downloader.py
View File

@@ -51,10 +51,11 @@ class RedditDownloader(RedditConnector):
elif submission.subreddit.display_name.lower() in self.args.skip_subreddit: elif submission.subreddit.display_name.lower() in self.args.skip_subreddit:
logger.debug(f'Submission {submission.id} in {submission.subreddit.display_name} in skip list') logger.debug(f'Submission {submission.id} in {submission.subreddit.display_name} in skip list')
return return
elif submission.author.name in self.args.ignore_user: elif (submission.author and submission.author.name in self.args.ignore_user) or \
(submission.author is None and 'DELETED' in self.args.ignore_user):
logger.debug( logger.debug(
f'Submission {submission.id} in {submission.subreddit.display_name} skipped' f'Submission {submission.id} in {submission.subreddit.display_name} skipped'
f' due to {submission.author.name} being an ignored user') f' due to {submission.author.name if submission.author else "DELETED"} being an ignored user')
return return
elif not isinstance(submission, praw.models.Submission): elif not isinstance(submission, praw.models.Submission):
logger.warning(f'{submission.id} is not a submission') logger.warning(f'{submission.id} is not a submission')