From 9cb4dd4cf3a32f78a0821eed6f7f012b8868a031 Mon Sep 17 00:00:00 2001 From: Serene-Arc Date: Tue, 6 Apr 2021 10:48:21 +1000 Subject: [PATCH] Rename function --- bulkredditdownloader/site_downloaders/base_downloader.py | 2 +- bulkredditdownloader/site_downloaders/erome.py | 2 +- bulkredditdownloader/site_downloaders/gallery.py | 2 +- bulkredditdownloader/site_downloaders/gfycat.py | 2 +- bulkredditdownloader/site_downloaders/gif_delivery_network.py | 2 +- bulkredditdownloader/site_downloaders/imgur.py | 2 +- bulkredditdownloader/site_downloaders/redgifs.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bulkredditdownloader/site_downloaders/base_downloader.py b/bulkredditdownloader/site_downloaders/base_downloader.py index 9c44de6..85eee0b 100644 --- a/bulkredditdownloader/site_downloaders/base_downloader.py +++ b/bulkredditdownloader/site_downloaders/base_downloader.py @@ -26,7 +26,7 @@ class BaseDownloader(ABC): raise NotImplementedError @staticmethod - def get_link(url: str, cookies: dict = None, headers: dict = None) -> requests.Response: + def retrieve_url(url: str, cookies: dict = None, headers: dict = None) -> requests.Response: res = requests.get(url, cookies=cookies, headers=headers) if res.status_code != 200: raise ResourceNotFound(f'Server responded with {res.status_code} to {url}') diff --git a/bulkredditdownloader/site_downloaders/erome.py b/bulkredditdownloader/site_downloaders/erome.py index c452175..c223cd1 100644 --- a/bulkredditdownloader/site_downloaders/erome.py +++ b/bulkredditdownloader/site_downloaders/erome.py @@ -33,7 +33,7 @@ class Erome(BaseDownloader): @staticmethod def _get_links(url: str) -> set[str]: - page = Erome.get_link(url) + page = Erome.retrieve_url(url) soup = bs4.BeautifulSoup(page.text, 'html.parser') front_images = soup.find_all('img', attrs={'class': 'lasyload'}) out = [im.get('data-src') for im in front_images] diff --git a/bulkredditdownloader/site_downloaders/gallery.py b/bulkredditdownloader/site_downloaders/gallery.py index bc9390f..8d7c074 100644 --- a/bulkredditdownloader/site_downloaders/gallery.py +++ b/bulkredditdownloader/site_downloaders/gallery.py @@ -32,7 +32,7 @@ class Gallery(BaseDownloader): ' Chrome/67.0.3396.87 Safari/537.36 OPR/54.0.2952.64', 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8', } - page = Gallery.get_link(url, headers=resource_headers) + page = Gallery.retrieve_url(url, headers=resource_headers) soup = bs4.BeautifulSoup(page.text, 'html.parser') links = soup.findAll('a', attrs={'target': '_blank', 'href': re.compile(r'https://preview\.redd\.it.*')}) diff --git a/bulkredditdownloader/site_downloaders/gfycat.py b/bulkredditdownloader/site_downloaders/gfycat.py index d54fcf6..6d1c3c7 100644 --- a/bulkredditdownloader/site_downloaders/gfycat.py +++ b/bulkredditdownloader/site_downloaders/gfycat.py @@ -24,7 +24,7 @@ class Gfycat(GifDeliveryNetwork): gfycat_id = re.match(r'.*/(.*?)/?$', url).group(1) url = 'https://gfycat.com/' + gfycat_id - response = Gfycat.get_link(url) + response = Gfycat.retrieve_url(url) if 'gifdeliverynetwork' in response.url: return GifDeliveryNetwork._get_link(url) diff --git a/bulkredditdownloader/site_downloaders/gif_delivery_network.py b/bulkredditdownloader/site_downloaders/gif_delivery_network.py index 878dcb6..2d433d5 100644 --- a/bulkredditdownloader/site_downloaders/gif_delivery_network.py +++ b/bulkredditdownloader/site_downloaders/gif_delivery_network.py @@ -21,7 +21,7 @@ class GifDeliveryNetwork(BaseDownloader): @staticmethod def _get_link(url: str) -> str: - page = GifDeliveryNetwork.get_link(url) + page = GifDeliveryNetwork.retrieve_url(url) soup = BeautifulSoup(page.text, 'html.parser') content = soup.find('source', attrs={'id': 'mp4Source', 'type': 'video/mp4'}) diff --git a/bulkredditdownloader/site_downloaders/imgur.py b/bulkredditdownloader/site_downloaders/imgur.py index 4314db3..d72f66a 100644 --- a/bulkredditdownloader/site_downloaders/imgur.py +++ b/bulkredditdownloader/site_downloaders/imgur.py @@ -41,7 +41,7 @@ class Imgur(BaseDownloader): link = link.replace('i.imgur', 'imgur') link = link.rstrip('.gifv') - res = Imgur.get_link(link, cookies={'over18': '1', 'postpagebeta': '0'}) + res = Imgur.retrieve_url(link, cookies={'over18': '1', 'postpagebeta': '0'}) soup = bs4.BeautifulSoup(res.text, 'html.parser') scripts = soup.find_all('script', attrs={'type': 'text/javascript'}) diff --git a/bulkredditdownloader/site_downloaders/redgifs.py b/bulkredditdownloader/site_downloaders/redgifs.py index 46adb8d..8f16447 100644 --- a/bulkredditdownloader/site_downloaders/redgifs.py +++ b/bulkredditdownloader/site_downloaders/redgifs.py @@ -30,7 +30,7 @@ class Redgifs(GifDeliveryNetwork): ' Chrome/67.0.3396.87 Safari/537.36 OPR/54.0.2952.64', } - page = Redgifs.get_link(url, headers=headers) + page = Redgifs.retrieve_url(url, headers=headers) soup = BeautifulSoup(page.text, 'html.parser') content = soup.find('script', attrs={'data-react-helmet': 'true', 'type': 'application/ld+json'})