From 8bd4b8b3a975328990bad935b2404c109f0806b8 Mon Sep 17 00:00:00 2001 From: Serene-Arc Date: Sun, 28 Mar 2021 10:10:46 +1000 Subject: [PATCH] Split regex for download factory --- bulkredditdownloader/site_downloaders/download_factory.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bulkredditdownloader/site_downloaders/download_factory.py b/bulkredditdownloader/site_downloaders/download_factory.py index a4d96cf..466dc3d 100644 --- a/bulkredditdownloader/site_downloaders/download_factory.py +++ b/bulkredditdownloader/site_downloaders/download_factory.py @@ -30,7 +30,9 @@ class DownloadFactory: return Gfycat elif re.match(url_beginning + r'gifdeliverynetwork', url): return GifDeliveryNetwork - elif re.match(url_beginning + r'imgur.*', url) or re.match(url_beginning + r'i\.imgur.*\.gifv$', url): + elif re.match(url_beginning + r'imgur.*', url): + return Imgur + elif re.match(url_beginning + r'i\.imgur.*\.gifv$', url): return Imgur elif re.match(url_beginning + r'redgifs.com', url): return Redgifs @@ -40,7 +42,9 @@ class DownloadFactory: return VReddit 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): + elif re.match(url_beginning + r'i\.redd\.it.*', url): + return Direct + elif re.match(url_beginning + r'.*\..{3,4}$', url): return Direct else: raise NotADownloadableLinkError('No downloader module exists for url {}'.format(url))