From 1ad2b68e03c9ae7f5619e81f93caa81335bd8506 Mon Sep 17 00:00:00 2001 From: Jacob Chapman <7908073+chapmanjacobd@users.noreply.github.com> Date: Thu, 28 Apr 2022 19:44:17 -0500 Subject: [PATCH 1/3] fix: Redirect to /subreddits/search ``` File "/home/xk/github/o/bulk-downloader-for-reddit/bdfr/connector.py", line 413, in check_subreddit_status assert subreddit.id File "/home/xk/.local/share/virtualenvs/bulk-downloader-for-reddit-dCAFmVJi/lib/python3.10/site-packages/praw/models/reddit/base.py", line 34, in __getattr__ self._fetch() File "/home/xk/.local/share/virtualenvs/bulk-downloader-for-reddit-dCAFmVJi/lib/python3.10/site-packages/praw/models/reddit/subreddit.py", line 584, in _fetch data = self._fetch_data() File "/home/xk/.local/share/virtualenvs/bulk-downloader-for-reddit-dCAFmVJi/lib/python3.10/site-packages/praw/models/reddit/subreddit.py", line 581, in _fetch_data return self._reddit.request("GET", path, params) File "/home/xk/.local/share/virtualenvs/bulk-downloader-for-reddit-dCAFmVJi/lib/python3.10/site-packages/praw/reddit.py", line 885, in request return self._core.request( File "/home/xk/.local/share/virtualenvs/bulk-downloader-for-reddit-dCAFmVJi/lib/python3.10/site-packages/prawcore/sessions.py", line 330, in request return self._request_with_retries( File "/home/xk/.local/share/virtualenvs/bulk-downloader-for-reddit-dCAFmVJi/lib/python3.10/site-packages/prawcore/sessions.py", line 266, in _request_with_retries raise self.STATUS_EXCEPTIONS[response.status_code](response) prawcore.exceptions.Redirect: Redirect to /subreddits/search ``` --- bdfr/connector.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bdfr/connector.py b/bdfr/connector.py index e04d9ef..61ed8f4 100644 --- a/bdfr/connector.py +++ b/bdfr/connector.py @@ -414,7 +414,9 @@ class RedditConnector(metaclass=ABCMeta): try: assert subreddit.id except prawcore.NotFound: - raise errors.BulkDownloaderException(f'Source {subreddit.display_name} does not exist or cannot be found') + raise errors.BulkDownloaderException(f"Source {subreddit.display_name} cannot be found") + except prawcore.Redirect: + raise errors.BulkDownloaderException(f"Source {subreddit.display_name} does not exist") except prawcore.Forbidden: raise errors.BulkDownloaderException(f'Source {subreddit.display_name} is private and cannot be scraped') From bfd481739b28c132e6bcc35595e3853a30d51a53 Mon Sep 17 00:00:00 2001 From: Jacob Chapman <7908073+chapmanjacobd@users.noreply.github.com> Date: Sun, 8 May 2022 08:45:34 -0500 Subject: [PATCH 2/3] Update test_connector.py --- tests/test_connector.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_connector.py b/tests/test_connector.py index 3a10757..4a2d461 100644 --- a/tests/test_connector.py +++ b/tests/test_connector.py @@ -448,6 +448,7 @@ def test_check_user_existence_banned( @pytest.mark.parametrize(('test_subreddit_name', 'expected_message'), ( ('donaldtrump', 'cannot be found'), ('submitters', 'private and cannot be scraped') + ('lhnhfkuhwreolo', 'does not exist') )) def test_check_subreddit_status_bad(test_subreddit_name: str, expected_message: str, reddit_instance: praw.Reddit): test_subreddit = reddit_instance.subreddit(test_subreddit_name) From 7100291ed90d617ceb7bf8d627fce65f4c032e97 Mon Sep 17 00:00:00 2001 From: Jacob Chapman <7908073+chapmanjacobd@users.noreply.github.com> Date: Sat, 16 Jul 2022 10:38:34 -0500 Subject: [PATCH 3/3] forgot comma --- tests/test_connector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_connector.py b/tests/test_connector.py index 4a2d461..e928000 100644 --- a/tests/test_connector.py +++ b/tests/test_connector.py @@ -447,7 +447,7 @@ def test_check_user_existence_banned( @pytest.mark.reddit @pytest.mark.parametrize(('test_subreddit_name', 'expected_message'), ( ('donaldtrump', 'cannot be found'), - ('submitters', 'private and cannot be scraped') + ('submitters', 'private and cannot be scraped'), ('lhnhfkuhwreolo', 'does not exist') )) def test_check_subreddit_status_bad(test_subreddit_name: str, expected_message: str, reddit_instance: praw.Reddit):