diff --git a/bdfr/site_downloaders/gfycat.py b/bdfr/site_downloaders/gfycat.py index f77f05b..eb33620 100644 --- a/bdfr/site_downloaders/gfycat.py +++ b/bdfr/site_downloaders/gfycat.py @@ -10,10 +10,10 @@ from praw.models import Submission from bdfr.exceptions import SiteDownloaderError from bdfr.resource import Resource from bdfr.site_authenticator import SiteAuthenticator -from bdfr.site_downloaders.gif_delivery_network import GifDeliveryNetwork +from bdfr.site_downloaders.redgifs import Redgifs -class Gfycat(GifDeliveryNetwork): +class Gfycat(Redgifs): def __init__(self, post: Submission): super().__init__(post) @@ -26,8 +26,8 @@ class Gfycat(GifDeliveryNetwork): url = 'https://gfycat.com/' + gfycat_id response = Gfycat.retrieve_url(url) - if 'gifdeliverynetwork' in response.url: - return GifDeliveryNetwork._get_link(url) + if re.search(r'(redgifs|gifdeliverynetwork)', response.url): + return Redgifs._get_link(url) soup = BeautifulSoup(response.text, 'html.parser') content = soup.find('script', attrs={'data-react-helmet': 'true', 'type': 'application/ld+json'}) diff --git a/bdfr/site_downloaders/gif_delivery_network.py b/bdfr/site_downloaders/gif_delivery_network.py index 1127301..26cc1c5 100644 --- a/bdfr/site_downloaders/gif_delivery_network.py +++ b/bdfr/site_downloaders/gif_delivery_network.py @@ -1,36 +1,21 @@ #!/usr/bin/env python3 from typing import Optional -import json -from bs4 import BeautifulSoup from praw.models import Submission -from bdfr.exceptions import SiteDownloaderError from bdfr.resource import Resource from bdfr.site_authenticator import SiteAuthenticator -from bdfr.site_downloaders.base_downloader import BaseDownloader +from bdfr.site_downloaders.redgifs import Redgifs -class GifDeliveryNetwork(BaseDownloader): +class GifDeliveryNetwork(Redgifs): def __init__(self, post: Submission): super().__init__(post) def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: - media_url = self._get_link(self.post.url) - return [Resource(self.post, media_url, '.mp4')] + return super(GifDeliveryNetwork, self).find_resources(authenticator) @staticmethod def _get_link(url: str) -> str: - page = GifDeliveryNetwork.retrieve_url(url) - - soup = BeautifulSoup(page.text, 'html.parser') - content = soup.find('script', attrs={'data-react-helmet': 'true', 'type': 'application/ld+json'}) - - try: - content = json.loads(content.string) - out = content['video']['contentUrl'] - except (json.JSONDecodeError, KeyError, TypeError, AttributeError): - raise SiteDownloaderError('Could not find source link') - - return out + return super(GifDeliveryNetwork, GifDeliveryNetwork)._get_link(url) diff --git a/bdfr/site_downloaders/redgifs.py b/bdfr/site_downloaders/redgifs.py index cd429e2..051bc12 100644 --- a/bdfr/site_downloaders/redgifs.py +++ b/bdfr/site_downloaders/redgifs.py @@ -10,15 +10,16 @@ from praw.models import Submission from bdfr.exceptions import SiteDownloaderError from bdfr.resource import Resource from bdfr.site_authenticator import SiteAuthenticator -from bdfr.site_downloaders.gif_delivery_network import GifDeliveryNetwork +from bdfr.site_downloaders.base_downloader import BaseDownloader -class Redgifs(GifDeliveryNetwork): +class Redgifs(BaseDownloader): def __init__(self, post: Submission): super().__init__(post) def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: - return super().find_resources(authenticator) + media_url = self._get_link(self.post.url) + return [Resource(self.post, media_url, '.mp4')] @staticmethod def _get_link(url: str) -> str: