From c9c864b71b2c2fffe02ad6d441bbd5f504942d62 Mon Sep 17 00:00:00 2001 From: BlipRanger Date: Fri, 2 Apr 2021 11:51:00 -0400 Subject: [PATCH] Update regex to be more concise, add test for m.youtube. --- bulkredditdownloader/site_downloaders/download_factory.py | 4 +--- .../tests/downloaders/test_download_factory.py | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bulkredditdownloader/site_downloaders/download_factory.py b/bulkredditdownloader/site_downloaders/download_factory.py index 81c020e..84a6382 100644 --- a/bulkredditdownloader/site_downloaders/download_factory.py +++ b/bulkredditdownloader/site_downloaders/download_factory.py @@ -40,9 +40,7 @@ class DownloadFactory: return SelfPost elif re.match(url_beginning + r'v\.redd\.it', url): return VReddit - elif re.match(url_beginning + r'youtu\.?be', url): - return Youtube - elif re.match(url_beginning + r'm.youtu\.?be', url): + elif re.match(url_beginning + r'(m\.)?youtu\.?be', url): return Youtube elif re.match(url_beginning + r'i\.redd\.it.*', url): return Direct diff --git a/bulkredditdownloader/tests/downloaders/test_download_factory.py b/bulkredditdownloader/tests/downloaders/test_download_factory.py index 3f648a1..65de2ea 100644 --- a/bulkredditdownloader/tests/downloaders/test_download_factory.py +++ b/bulkredditdownloader/tests/downloaders/test_download_factory.py @@ -34,6 +34,7 @@ from bulkredditdownloader.site_downloaders.youtube import Youtube ('https://redgifs.com/watch/courageousimpeccablecanvasback', Redgifs), ('https://www.gifdeliverynetwork.com/repulsivefinishedandalusianhorse', GifDeliveryNetwork), ('https://youtu.be/DevfjHOhuFc', Youtube), + ('https://m.youtube.com/watch?v=kr-FeojxzUM', Youtube), )) def test_factory_lever_good(test_submission_url: str, expected_class: BaseDownloader, reddit_instance: praw.Reddit): result = DownloadFactory.pull_lever(test_submission_url)