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

Rename function

Browse Source
This commit is contained in:
Serene-Arc
2021-05-25 18:51:24 +10:00
parent b74e93d2b7
commit f47688812d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bdfr/site_downloaders/download_factory.py
View File

@@ -21,7 +21,7 @@ from bdfr.site_downloaders.youtube import Youtube
class DownloadFactory: 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.*\.gifv$', sanitised_url): if re.match(r'(i\.)?imgur.*\.gifv$', sanitised_url):
return Imgur return Imgur
elif re.match(r'.*/.*\.\w{3,4}(\?[\w;&=]*)?$', sanitised_url): elif re.match(r'.*/.*\.\w{3,4}(\?[\w;&=]*)?$', sanitised_url):
@@ -49,7 +49,7 @@ class DownloadFactory:
f'No downloader module exists for url {url}') f'No downloader module exists for url {url}')
@staticmethod @staticmethod
def _sanitise_url(url: str) -> str: def sanitise_url(url: str) -> str:
beginning_regex = re.compile(r'\s*(www\.?)?') beginning_regex = re.compile(r'\s*(www\.?)?')
split_url = urllib.parse.urlsplit(url) split_url = urllib.parse.urlsplit(url)
split_url = split_url.netloc + split_url.path split_url = split_url.netloc + split_url.path

2
tests/site_downloaders/test_download_factory.py
View File

@@ -70,5 +70,5 @@ def test_factory_lever_bad(test_url: str):
('https://i.imgur.com/BuzvZwb.gifv', 'i.imgur.com/BuzvZwb.gifv'), ('https://i.imgur.com/BuzvZwb.gifv', 'i.imgur.com/BuzvZwb.gifv'),
)) ))
def test_sanitise_url(test_url: str, expected: str): def test_sanitise_url(test_url: str, expected: str):
result = DownloadFactory._sanitise_url(test_url) result = DownloadFactory.sanitise_url(test_url)
assert result == expected assert result == expected