CodeMirror/bulk-downloader-for-reddit
1
0
Fork 0
mirror of synced 2024-09-28 23:31:40 +12:00
Code Issues Releases Wiki Activity

Fix regex

Browse source
This commit is contained in:
Serene-Arc 2021-11-15 11:03:12 +10:00 committed by Ali Parlakçı
parent 8c3af7029e
commit 53562f4873
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bdfr/site_downloaders/download_factory.py
View file

@ -24,7 +24,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\.)?imgur.*\.gif.+$', 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):

4
bdfr/site_downloaders/imgur.py
View file

@ -42,9 +42,9 @@ class Imgur(BaseDownloader):
@staticmethod @staticmethod
def _get_data(link: str) -> dict: def _get_data(link: str) -> dict:
link = link.rstrip('?') link = link.rstrip('?')
if re.match(r'(?i).*\.gif.*$', link): if re.match(r'(?i).*\.gif.+$', link):
link = link.replace('i.imgur', 'imgur') link = link.replace('i.imgur', 'imgur')
link = re.sub('(?i)\\.gif.*$', '', link) link = re.sub('(?i)\\.gif.+$', '', link)
res = Imgur.retrieve_url(link, cookies={'over18': '1', 'postpagebeta': '0'}) res = Imgur.retrieve_url(link, cookies={'over18': '1', 'postpagebeta': '0'})

1
tests/site_downloaders/test_download_factory.py
View file

@ -30,6 +30,7 @@ from bdfr.site_downloaders.youtube import Youtube
('https://imgur.com/BuzvZwb.gifv', Imgur), ('https://imgur.com/BuzvZwb.gifv', Imgur),
('https://i.imgur.com/6fNdLst.gif', Direct), ('https://i.imgur.com/6fNdLst.gif', Direct),
('https://imgur.com/a/MkxAzeg', Imgur), ('https://imgur.com/a/MkxAzeg', Imgur),
('https://i.imgur.com/OGeVuAe.giff', Imgur),
('https://www.reddit.com/gallery/lu93m7', Gallery), ('https://www.reddit.com/gallery/lu93m7', Gallery),
('https://gfycat.com/concretecheerfulfinwhale', Gfycat), ('https://gfycat.com/concretecheerfulfinwhale', Gfycat),
('https://www.erome.com/a/NWGw0F09', Erome), ('https://www.erome.com/a/NWGw0F09', Erome),