ModerateWinGuy/BDFR_Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Imgur updates

Browse Source 
Update Imgur logic to cover malformed links that cause a redirect leading to the html of the page being saved as an image.
This commit is contained in:
SoulSuck24
2022-09-18 23:27:17 -04:00
parent d60b4e7fdd
commit 106d7596b1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bdfr/site_downloaders/download_factory.py
View File

@@ -25,7 +25,7 @@ class DownloadFactory:
@staticmethod @staticmethod
def pull_lever(url: str) -> Type[BaseDownloader]: def pull_lever(url: str) -> Type[BaseDownloader]:
sanitised_url = DownloadFactory.sanitise_url(url) sanitised_url = DownloadFactory.sanitise_url(url)
if re.match(r'(i\.)?imgur.*\.gif.+$', sanitised_url): if re.match(r'(i\.|m\.)?imgur', sanitised_url):
return Imgur return Imgur
elif re.match(r'.*/.*\.\w{3,4}(\?[\w;&=]*)?$', sanitised_url) and \ elif re.match(r'.*/.*\.\w{3,4}(\?[\w;&=]*)?$', sanitised_url) and \
not DownloadFactory.is_web_resource(sanitised_url): not DownloadFactory.is_web_resource(sanitised_url):
@@ -38,8 +38,6 @@ class DownloadFactory:
return Gallery return Gallery
elif re.match(r'gfycat\.', sanitised_url): elif re.match(r'gfycat\.', sanitised_url):
return Gfycat return Gfycat
elif re.match(r'(m\.)?imgur.*', sanitised_url):
return Imgur
elif re.match(r'(redgifs|gifdeliverynetwork)', sanitised_url): elif re.match(r'(redgifs|gifdeliverynetwork)', sanitised_url):
return Redgifs return Redgifs
elif re.match(r'reddit\.com/r/', sanitised_url): elif re.match(r'reddit\.com/r/', sanitised_url):

10
bdfr/site_downloaders/imgur.py
View File

@@ -41,10 +41,12 @@ class Imgur(BaseDownloader):
@staticmethod @staticmethod
def _get_data(link: str) -> dict: def _get_data(link: str) -> dict:
link = link.rstrip('?') try:
if re.match(r'(?i).*\.gif.+$', link): imgur_id = re.match(r'.*/(.*?)(\..{0,})?$', link).group(1)
link = link.replace('i.imgur', 'imgur') gallery = 'a/' if re.search(r'.*/(.*?)(gallery/|a/)', link) else ''
link = re.sub('(?i)\\.gif.+$', '', link) link = f'https://imgur.com/{gallery}{imgur_id}'
except AttributeError:
raise SiteDownloaderError(f'Could not extract Imgur ID from {link}')
res = Imgur.retrieve_url(link, cookies={'over18': '1', 'postpagebeta': '0'}) res = Imgur.retrieve_url(link, cookies={'over18': '1', 'postpagebeta': '0'})