Fix time filters (#279)

bdfr/tests/site_downloaders/test_download_factory.py

@@ -58,3 +58,14 @@ def test_factory_lever_good(test_submission_url: str, expected_class: BaseDownlo
 def test_factory_lever_bad(test_url: str):
     with pytest.raises(NotADownloadableLinkError):
         DownloadFactory.pull_lever(test_url)
+
+
+@pytest.mark.parametrize(('test_url', 'expected'), (
+    ('www.test.com/test.png', 'test.com/test.png'),
+    ('www.test.com/test.png?test_value=random', 'test.com/test.png'),
+    ('https://youtube.com/watch?v=Gv8Wz74FjVA', 'youtube.com/watch'),
+    ('https://i.imgur.com/BuzvZwb.gifv', 'i.imgur.com/BuzvZwb.gifv'),
+))
+def test_sanitise_urll(test_url: str, expected: str):
+    result = DownloadFactory._sanitise_url(test_url)
+    assert result == expected

bdfr/tests/test_downloader.py

@@ -148,54 +148,71 @@ def test_get_submissions_from_link(
 
 @pytest.mark.online
 @pytest.mark.reddit
-@pytest.mark.parametrize(('test_subreddits', 'limit'), (
-    (('Futurology',), 10),
-    (('Futurology', 'Mindustry, Python'), 10),
-    (('Futurology',), 20),
-    (('Futurology', 'Python'), 10),
-    (('Futurology',), 100),
-    (('Futurology',), 0),
+@pytest.mark.parametrize(('test_subreddits', 'limit', 'sort_type', 'time_filter', 'max_expected_len'), (
+    (('Futurology',), 10, 'hot', 'all', 10),
+    (('Futurology', 'Mindustry, Python'), 10, 'hot', 'all', 30),
+    (('Futurology',), 20, 'hot', 'all', 20),
+    (('Futurology', 'Python'), 10, 'hot', 'all', 20),
+    (('Futurology',), 100, 'hot', 'all', 100),
+    (('Futurology',), 0, 'hot', 'all', 0),
+    (('Futurology',), 10, 'top', 'all', 10),
+    (('Futurology',), 10, 'top', 'week', 10),
+    (('Futurology',), 10, 'hot', 'week', 10),
 ))
 def test_get_subreddit_normal(
         test_subreddits: list[str],
         limit: int,
+        sort_type: str,
+        time_filter: str,
+        max_expected_len: int,
         downloader_mock: MagicMock,
-        reddit_instance: praw.Reddit):
+        reddit_instance: praw.Reddit,
+):
     downloader_mock._determine_sort_function.return_value = praw.models.Subreddit.hot
     downloader_mock.args.limit = limit
+    downloader_mock.args.sort = sort_type
     downloader_mock.args.subreddit = test_subreddits
     downloader_mock.reddit_instance = reddit_instance
-    downloader_mock.sort_filter = RedditTypes.SortType.HOT
+    downloader_mock.sort_filter = RedditDownloader._create_sort_filter(downloader_mock)
     results = RedditDownloader._get_subreddits(downloader_mock)
     test_subreddits = downloader_mock._split_args_input(test_subreddits)
-    results = assert_all_results_are_submissions(
-        (limit * len(test_subreddits)) if limit else None, results)
+    results = [sub for res1 in results for sub in res1]
+    assert all([isinstance(res1, praw.models.Submission) for res1 in results])
     assert all([res.subreddit.display_name in test_subreddits for res in results])
+    assert len(results) <= max_expected_len
 
 
 @pytest.mark.online
 @pytest.mark.reddit
-@pytest.mark.parametrize(('test_subreddits', 'search_term', 'limit'), (
-    (('Python',), 'scraper', 10),
-    (('Python',), '', 10),
-    (('Python',), 'djsdsgewef', 0),
+@pytest.mark.parametrize(('test_subreddits', 'search_term', 'limit', 'time_filter', 'max_expected_len'), (
+    (('Python',), 'scraper', 10, 'all', 10),
+    (('Python',), '', 10, 'all', 10),
+    (('Python',), 'djsdsgewef', 10, 'all', 0),
+    (('Python',), 'scraper', 10, 'year', 10),
+    (('Python',), 'scraper', 10, 'hour', 1),
 ))
 def test_get_subreddit_search(
         test_subreddits: list[str],
         search_term: str,
+        time_filter: str,
         limit: int,
+        max_expected_len: int,
         downloader_mock: MagicMock,
-        reddit_instance: praw.Reddit):
+        reddit_instance: praw.Reddit,
+):
     downloader_mock._determine_sort_function.return_value = praw.models.Subreddit.hot
     downloader_mock.args.limit = limit
     downloader_mock.args.search = search_term
     downloader_mock.args.subreddit = test_subreddits
     downloader_mock.reddit_instance = reddit_instance
     downloader_mock.sort_filter = RedditTypes.SortType.HOT
+    downloader_mock.args.time = time_filter
+    downloader_mock.time_filter = RedditDownloader._create_time_filter(downloader_mock)
     results = RedditDownloader._get_subreddits(downloader_mock)
-    results = assert_all_results_are_submissions(
-        (limit * len(test_subreddits)) if limit else None, results)
+    results = [sub for res in results for sub in res]
+    assert all([isinstance(res, praw.models.Submission) for res in results])
     assert all([res.subreddit.display_name in test_subreddits for res in results])
+    assert len(results) <= max_expected_len
 
 
 @pytest.mark.online
@@ -210,15 +227,23 @@ def test_get_multireddits_public(
         test_multireddits: list[str],
         limit: int,
         reddit_instance: praw.Reddit,
-        downloader_mock: MagicMock):
+        downloader_mock: MagicMock,
+):
     downloader_mock._determine_sort_function.return_value = praw.models.Subreddit.hot
     downloader_mock.sort_filter = RedditTypes.SortType.HOT
     downloader_mock.args.limit = limit
     downloader_mock.args.multireddit = test_multireddits
     downloader_mock.args.user = test_user
     downloader_mock.reddit_instance = reddit_instance
+    downloader_mock._create_filtered_listing_generator.return_value = \
+        RedditDownloader._create_filtered_listing_generator(
+            downloader_mock,
+            reddit_instance.multireddit(test_user, test_multireddits[0]),
+        )
     results = RedditDownloader._get_multireddits(downloader_mock)
-    assert_all_results_are_submissions((limit * len(test_multireddits)) if limit else None, results)
+    results = [sub for res in results for sub in res]
+    assert all([isinstance(res, praw.models.Submission) for res in results])
+    assert len(results) == limit
 
 
 @pytest.mark.online
@@ -236,6 +261,11 @@ def test_get_user_submissions(test_user: str, limit: int, downloader_mock: Magic
     downloader_mock.args.user = test_user
     downloader_mock.authenticated = False
     downloader_mock.reddit_instance = reddit_instance
+    downloader_mock._create_filtered_listing_generator.return_value = \
+        RedditDownloader._create_filtered_listing_generator(
+            downloader_mock,
+            reddit_instance.redditor(test_user).submissions,
+        )
     results = RedditDownloader._get_user_data(downloader_mock)
     results = assert_all_results_are_submissions(limit, results)
     assert all([res.author.name == test_user for res in results])

bdfr/tests/test_integration.py

@@ -101,7 +101,6 @@ def test_cli_download_multireddit_nonexistent(test_args: list[str], tmp_path: Pa
     ['--user', 'djnish', '--submitted', '-L', 10],
     ['--user', 'djnish', '--submitted', '-L', 10, '--time', 'month'],
     ['--user', 'djnish', '--submitted', '-L', 10, '--sort', 'controversial'],
-    ['--user', 'djnish', '--submitted', '-L', 10, '--sort', 'controversial', '--time', 'month'],
 ))
 def test_cli_download_user_data_good(test_args: list[str], tmp_path: Path):
     runner = CliRunner()

bdfr/tests/test_resource.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 # coding=utf-8
 
-import pytest
 from unittest.mock import MagicMock
 
+import pytest
+
 from bdfr.resource import Resource
 
 
@@ -15,8 +16,9 @@ from bdfr.resource import Resource
     ('https://www.resource.com/test/example.jpg', '.jpg'),
     ('hard.png.mp4', '.mp4'),
     ('https://preview.redd.it/7zkmr1wqqih61.png?width=237&format=png&auto=webp&s=19de214e634cbcad99', '.png'),
-    ('test.jpg#test','.jpg'),
-    ('test.jpg?width=247#test','.jpg'),
+    ('test.jpg#test', '.jpg'),
+    ('test.jpg?width=247#test', '.jpg'),
+    ('https://www.test.com/test/test2/example.png?random=test#thing', '.png'),
 ))
 def test_resource_get_extension(test_url: str, expected: str):
     test_resource = Resource(MagicMock(), test_url)