From 9931839d1477b749f48e5e57d9ecaac15f77d60c Mon Sep 17 00:00:00 2001 From: Serene-Arc Date: Wed, 28 Apr 2021 18:53:24 +1000 Subject: [PATCH] Remove gifdeliverynetwork from download factory --- bdfr/site_downloaders/download_factory.py | 5 +---- tests/site_downloaders/test_download_factory.py | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bdfr/site_downloaders/download_factory.py b/bdfr/site_downloaders/download_factory.py index 4bd6225..974e817 100644 --- a/bdfr/site_downloaders/download_factory.py +++ b/bdfr/site_downloaders/download_factory.py @@ -11,7 +11,6 @@ from bdfr.site_downloaders.direct import Direct from bdfr.site_downloaders.erome import Erome from bdfr.site_downloaders.gallery import Gallery from bdfr.site_downloaders.gfycat import Gfycat -from bdfr.site_downloaders.gif_delivery_network import GifDeliveryNetwork from bdfr.site_downloaders.imgur import Imgur from bdfr.site_downloaders.redgifs import Redgifs from bdfr.site_downloaders.self_post import SelfPost @@ -33,11 +32,9 @@ class DownloadFactory: return Gallery elif re.match(r'gfycat\.', sanitised_url): return Gfycat - elif re.match(r'gifdeliverynetwork', sanitised_url): - return GifDeliveryNetwork elif re.match(r'(m\.)?imgur.*', sanitised_url): return Imgur - elif re.match(r'redgifs.com', sanitised_url): + elif re.match(r'(redgifs|gifdeliverynetwork)', sanitised_url): return Redgifs elif re.match(r'reddit\.com/r/', sanitised_url): return SelfPost diff --git a/tests/site_downloaders/test_download_factory.py b/tests/site_downloaders/test_download_factory.py index 65625b7..99299cb 100644 --- a/tests/site_downloaders/test_download_factory.py +++ b/tests/site_downloaders/test_download_factory.py @@ -11,7 +11,6 @@ from bdfr.site_downloaders.download_factory import DownloadFactory from bdfr.site_downloaders.erome import Erome from bdfr.site_downloaders.gallery import Gallery from bdfr.site_downloaders.gfycat import Gfycat -from bdfr.site_downloaders.gif_delivery_network import GifDeliveryNetwork from bdfr.site_downloaders.imgur import Imgur from bdfr.site_downloaders.redgifs import Redgifs from bdfr.site_downloaders.self_post import SelfPost @@ -35,7 +34,7 @@ from bdfr.site_downloaders.youtube import Youtube ('https://www.erome.com/a/NWGw0F09', Erome), ('https://youtube.com/watch?v=Gv8Wz74FjVA', Youtube), ('https://redgifs.com/watch/courageousimpeccablecanvasback', Redgifs), - ('https://www.gifdeliverynetwork.com/repulsivefinishedandalusianhorse', GifDeliveryNetwork), + ('https://www.gifdeliverynetwork.com/repulsivefinishedandalusianhorse', Redgifs), ('https://youtu.be/DevfjHOhuFc', Youtube), ('https://m.youtube.com/watch?v=kr-FeojxzUM', Youtube), ('https://i.imgur.com/3SKrQfK.jpg?1', Direct),