From 91ae9924c35e4cdbe6cfe338df0bb2770f745fa7 Mon Sep 17 00:00:00 2001 From: Serene-Arc Date: Thu, 11 Feb 2021 16:31:28 +1000 Subject: [PATCH] Add search functionality --- bulkredditdownloader/downloader.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/bulkredditdownloader/downloader.py b/bulkredditdownloader/downloader.py index fc10ee0..274d8d8 100644 --- a/bulkredditdownloader/downloader.py +++ b/bulkredditdownloader/downloader.py @@ -90,15 +90,18 @@ class RedditDownloader: def _get_subreddits(self, args: argparse.Namespace) -> list[praw.models.ListingGenerator]: if args.subreddit: subreddits = [self.reddit_instance.subreddit(chosen_subreddit) for chosen_subreddit in args.subreddit] - if self.sort_filter is RedditTypes.SortType.NEW: - sort_function = praw.models.Subreddit.new - elif self.sort_filter is RedditTypes.SortType.RISING: - sort_function = praw.models.Subreddit.rising - elif self.sort_filter is RedditTypes.SortType.CONTROVERSIAL: - sort_function = praw.models.Subreddit.controversial + if args.search: + return [reddit.search(args.search, sort=self.sort_filter.name.lower()) for reddit in subreddits] else: - sort_function = praw.models.Subreddit.hot - return [sort_function(reddit) for reddit in subreddits] + if self.sort_filter is RedditTypes.SortType.NEW: + sort_function = praw.models.Subreddit.new + elif self.sort_filter is RedditTypes.SortType.RISING: + sort_function = praw.models.Subreddit.rising + elif self.sort_filter is RedditTypes.SortType.CONTROVERSIAL: + sort_function = praw.models.Subreddit.controversial + else: + sort_function = praw.models.Subreddit.hot + return [sort_function(reddit) for reddit in subreddits] else: return []