From 39935c58d96d5a440356057c8db28f5eaebd2ef3 Mon Sep 17 00:00:00 2001 From: Serene-Arc Date: Wed, 28 Apr 2021 18:58:33 +1000 Subject: [PATCH] Remove GifDeliveryNetwork module --- bdfr/site_downloaders/gif_delivery_network.py | 21 ----------- .../test_gif_delivery_network.py | 37 ------------------- tests/site_downloaders/test_redgifs.py | 6 +++ 3 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 bdfr/site_downloaders/gif_delivery_network.py delete mode 100644 tests/site_downloaders/test_gif_delivery_network.py diff --git a/bdfr/site_downloaders/gif_delivery_network.py b/bdfr/site_downloaders/gif_delivery_network.py deleted file mode 100644 index 26cc1c5..0000000 --- a/bdfr/site_downloaders/gif_delivery_network.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python3 - -from typing import Optional - -from praw.models import Submission - -from bdfr.resource import Resource -from bdfr.site_authenticator import SiteAuthenticator -from bdfr.site_downloaders.redgifs import Redgifs - - -class GifDeliveryNetwork(Redgifs): - def __init__(self, post: Submission): - super().__init__(post) - - def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: - return super(GifDeliveryNetwork, self).find_resources(authenticator) - - @staticmethod - def _get_link(url: str) -> str: - return super(GifDeliveryNetwork, GifDeliveryNetwork)._get_link(url) diff --git a/tests/site_downloaders/test_gif_delivery_network.py b/tests/site_downloaders/test_gif_delivery_network.py deleted file mode 100644 index 38819c1..0000000 --- a/tests/site_downloaders/test_gif_delivery_network.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python3 -# coding=utf-8 - -from unittest.mock import Mock - -import pytest - -from bdfr.resource import Resource -from bdfr.site_downloaders.gif_delivery_network import GifDeliveryNetwork - - -@pytest.mark.online -@pytest.mark.parametrize(('test_url', 'expected'), ( - ('https://www.gifdeliverynetwork.com/regalshoddyhorsechestnutleafminer', - 'https://thumbs2.redgifs.com/RegalShoddyHorsechestnutleafminer.mp4'), - ('https://www.gifdeliverynetwork.com/maturenexthippopotamus', - 'https://thumbs2.redgifs.com/MatureNextHippopotamus.mp4'), -)) -def test_get_link(test_url: str, expected: str): - result = GifDeliveryNetwork._get_link(test_url) - assert result == expected - - -@pytest.mark.online -@pytest.mark.parametrize(('test_url', 'expected_hash'), ( - ('https://www.gifdeliverynetwork.com/maturenexthippopotamus', '9bec0a9e4163a43781368ed5d70471df'), - ('https://www.gifdeliverynetwork.com/regalshoddyhorsechestnutleafminer', '8afb4e2c090a87140230f2352bf8beba'), -)) -def test_download_resource(test_url: str, expected_hash: str): - mock_submission = Mock() - mock_submission.url = test_url - test_site = GifDeliveryNetwork(mock_submission) - resources = test_site.find_resources() - assert len(resources) == 1 - assert isinstance(resources[0], Resource) - resources[0].download(120) - assert resources[0].hash.hexdigest() == expected_hash diff --git a/tests/site_downloaders/test_redgifs.py b/tests/site_downloaders/test_redgifs.py index a325025..71fc18e 100644 --- a/tests/site_downloaders/test_redgifs.py +++ b/tests/site_downloaders/test_redgifs.py @@ -15,6 +15,10 @@ from bdfr.site_downloaders.redgifs import Redgifs 'https://thumbs2.redgifs.com/FrighteningVictoriousSalamander.mp4'), ('https://redgifs.com/watch/springgreendecisivetaruca', 'https://thumbs2.redgifs.com/SpringgreenDecisiveTaruca.mp4'), + ('https://www.gifdeliverynetwork.com/regalshoddyhorsechestnutleafminer', + 'https://thumbs2.redgifs.com/RegalShoddyHorsechestnutleafminer.mp4'), + ('https://www.gifdeliverynetwork.com/maturenexthippopotamus', + 'https://thumbs2.redgifs.com/MatureNextHippopotamus.mp4'), )) def test_get_link(test_url: str, expected: str): result = Redgifs._get_link(test_url) @@ -25,6 +29,8 @@ def test_get_link(test_url: str, expected: str): @pytest.mark.parametrize(('test_url', 'expected_hash'), ( ('https://redgifs.com/watch/frighteningvictorioussalamander', '4007c35d9e1f4b67091b5f12cffda00a'), ('https://redgifs.com/watch/springgreendecisivetaruca', '8dac487ac49a1f18cc1b4dabe23f0869'), + ('https://www.gifdeliverynetwork.com/maturenexthippopotamus', '9bec0a9e4163a43781368ed5d70471df'), + ('https://www.gifdeliverynetwork.com/regalshoddyhorsechestnutleafminer', '8afb4e2c090a87140230f2352bf8beba'), )) def test_download_resource(test_url: str, expected_hash: str): mock_submission = Mock()