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

Tweak regex to fix incorrect match (#237)

Browse Source
This commit is contained in:
Serene
2021-03-30 17:08:08 +10:00
committed by Ali Parlakci
parent 5d86c2d400
commit 44889d5264
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bulkredditdownloader/site_downloaders/download_factory.py
View File

@@ -44,7 +44,7 @@ class DownloadFactory:
return Youtube return Youtube
elif re.match(url_beginning + r'i\.redd\.it.*', url): elif re.match(url_beginning + r'i\.redd\.it.*', url):
return Direct return Direct
elif re.match(url_beginning + r'.*\..{3,4}$', url): elif re.match(url_beginning + r'.*/.*\.\w{3,4}$', url):
return Direct return Direct
else: else:
raise NotADownloadableLinkError('No downloader module exists for url {}'.format(url)) raise NotADownloadableLinkError('No downloader module exists for url {}'.format(url))

4
bulkredditdownloader/tests/downloaders/test_download_factory.py
View File

@@ -46,6 +46,10 @@ def test_factory_lever_good(test_submission_id: str, expected_class: BaseDownloa
@pytest.mark.parametrize('test_url', ( @pytest.mark.parametrize('test_url', (
'random.com', 'random.com',
'bad', 'bad',
'https://www.google.com/',
'https://www.google.com',
'https://www.google.com/test',
'https://www.google.com/test/',
)) ))
def test_factory_lever_bad(test_url: str): def test_factory_lever_bad(test_url: str):
with pytest.raises(NotADownloadableLinkError): with pytest.raises(NotADownloadableLinkError):