From ba6cf420964867bf80dac30fc0fcbcea3527b78a Mon Sep 17 00:00:00 2001 From: Serene-Arc Date: Fri, 12 Mar 2021 13:29:12 +1000 Subject: [PATCH] Add shortened Youtube links to downloader factory --- bulkredditdownloader/site_downloaders/download_factory.py | 2 +- bulkredditdownloader/tests/downloaders/test_download_factory.py | 1 + bulkredditdownloader/tests/downloaders/test_youtube.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bulkredditdownloader/site_downloaders/download_factory.py b/bulkredditdownloader/site_downloaders/download_factory.py index db6adca..253e13b 100644 --- a/bulkredditdownloader/site_downloaders/download_factory.py +++ b/bulkredditdownloader/site_downloaders/download_factory.py @@ -38,7 +38,7 @@ class DownloadFactory: return SelfPost elif re.match(url_beginning + r'v\.redd\.it', url): return VReddit - elif re.match(url_beginning + r'youtube', url): + elif re.match(url_beginning + r'youtu\.?be', url): return Youtube elif re.match(url_beginning + r'i\.redd\.it.*', url) or re.match(url_beginning + r'.*\..{3,4}$', url): return Direct diff --git a/bulkredditdownloader/tests/downloaders/test_download_factory.py b/bulkredditdownloader/tests/downloaders/test_download_factory.py index 393e239..9d6624f 100644 --- a/bulkredditdownloader/tests/downloaders/test_download_factory.py +++ b/bulkredditdownloader/tests/downloaders/test_download_factory.py @@ -35,6 +35,7 @@ from bulkredditdownloader.site_downloaders.youtube import Youtube ('lupb4r', Youtube), ('lul6l7', Redgifs), ('luu376', GifDeliveryNetwork), + ('m2l5oo', Youtube), )) def test_factory_lever_good(test_submission_id: str, expected_class: BaseDownloader, reddit_instance: praw.Reddit): submission = reddit_instance.submission(id=test_submission_id) diff --git a/bulkredditdownloader/tests/downloaders/test_youtube.py b/bulkredditdownloader/tests/downloaders/test_youtube.py index 144de18..08d30fc 100644 --- a/bulkredditdownloader/tests/downloaders/test_youtube.py +++ b/bulkredditdownloader/tests/downloaders/test_youtube.py @@ -13,6 +13,7 @@ from bulkredditdownloader.site_downloaders.youtube import Youtube @pytest.mark.long @pytest.mark.parametrize(('test_submission_id', 'expected_hash'), ( ('ltnoqp', '468136300a106c67f1463a7011a6db4a'), + ('m2l5oo', 'a70512f7782f13922258297bb12055d9'), )) def test_find_resources(test_submission_id: str, expected_hash: str, reddit_instance: praw.Reddit): test_submission = reddit_instance.submission(id=test_submission_id)