CodeMirror/bulk-downloader-for-reddit
1
0
Fork 0
mirror of synced 2024-06-21 11:40:21 +12:00
Code Issues Releases Wiki Activity

Invert inheritance direction

Browse source
This commit is contained in:
Serene-Arc 2021-04-28 18:50:18 +10:00 committed by Serene
parent 3c6e9f6ccf
commit 760e59e1f7
3 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bdfr/site_downloaders/gfycat.py
View file

@ -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'})

23
bdfr/site_downloaders/gif_delivery_network.py
View file

@ -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)

7
bdfr/site_downloaders/redgifs.py
View file

@ -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: