diff --git a/bdfr/archiver.py b/bdfr/archiver.py index a2e54e52..559dcc17 100644 --- a/bdfr/archiver.py +++ b/bdfr/archiver.py @@ -28,10 +28,11 @@ def __init__(self, args: Configuration): def download(self): for generator in self.reddit_lists: 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( 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 logger.debug(f'Attempting to archive submission {submission.id}') self.write_entry(submission) diff --git a/bdfr/downloader.py b/bdfr/downloader.py index 028430f1..02f5c685 100644 --- a/bdfr/downloader.py +++ b/bdfr/downloader.py @@ -51,10 +51,11 @@ def _download_submission(self, submission: praw.models.Submission): 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') 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( 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 elif not isinstance(submission, praw.models.Submission): logger.warning(f'{submission.id} is not a submission') diff --git a/setup.cfg b/setup.cfg index e5e244b3..c476c0e6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,7 @@ description_file = README.md description_content_type = text/markdown home_page = https://github.com/aliparlakci/bulk-downloader-for-reddit keywords = reddit, download, archive -version = 2.5.0 +version = 2.5.1 author = Ali Parlakci author_email = parlakciali@gmail.com maintainer = Serene Arc