Merge branch 'development' into imgur
This commit is contained in:
commit
85ab2590a9
3 changed files with 4 additions and 3 deletions
|
@ -27,7 +27,7 @@ class DownloadFactory:
|
||||||
sanitised_url = DownloadFactory.sanitise_url(url).lower()
|
sanitised_url = DownloadFactory.sanitise_url(url).lower()
|
||||||
if re.match(r"(i\.|m\.|o\.)?imgur", sanitised_url):
|
if re.match(r"(i\.|m\.|o\.)?imgur", sanitised_url):
|
||||||
return Imgur
|
return Imgur
|
||||||
elif re.match(r"(i\.|thumbs\d\.|v\d\.)?(redgifs|gifdeliverynetwork)", sanitised_url):
|
elif re.match(r"(i\.|thumbs\d{1,2}\.|v\d\.)?(redgifs|gifdeliverynetwork)", sanitised_url):
|
||||||
return Redgifs
|
return Redgifs
|
||||||
elif re.match(r"(thumbs\.|giant\.)?gfycat\.", sanitised_url):
|
elif re.match(r"(thumbs\.|giant\.)?gfycat\.", sanitised_url):
|
||||||
return Gfycat
|
return Gfycat
|
||||||
|
|
|
@ -33,8 +33,7 @@ class Redgifs(BaseDownloader):
|
||||||
if url.endswith("/"):
|
if url.endswith("/"):
|
||||||
url = url.removesuffix("/")
|
url = url.removesuffix("/")
|
||||||
redgif_id = re.match(r".*/(.*?)(?:#.*|\?.*|\..{0,})?$", url).group(1).lower()
|
redgif_id = re.match(r".*/(.*?)(?:#.*|\?.*|\..{0,})?$", url).group(1).lower()
|
||||||
if redgif_id.endswith("-mobile"):
|
redgif_id = re.sub(r"(-.*)$", "", redgif_id)
|
||||||
redgif_id = redgif_id.removesuffix("-mobile")
|
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
raise SiteDownloaderError(f"Could not extract Redgifs ID from {url}")
|
raise SiteDownloaderError(f"Could not extract Redgifs ID from {url}")
|
||||||
return redgif_id
|
return redgif_id
|
||||||
|
|
|
@ -25,6 +25,7 @@ def test_auth_cache():
|
||||||
("https://thumbs4.redgifs.com/DismalIgnorantDrongo.mp4", "dismalignorantdrongo"),
|
("https://thumbs4.redgifs.com/DismalIgnorantDrongo.mp4", "dismalignorantdrongo"),
|
||||||
("https://thumbs4.redgifs.com/DismalIgnorantDrongo-mobile.mp4", "dismalignorantdrongo"),
|
("https://thumbs4.redgifs.com/DismalIgnorantDrongo-mobile.mp4", "dismalignorantdrongo"),
|
||||||
("https://v3.redgifs.com/watch/newilliteratemeerkat#rel=user%3Atastynova", "newilliteratemeerkat"),
|
("https://v3.redgifs.com/watch/newilliteratemeerkat#rel=user%3Atastynova", "newilliteratemeerkat"),
|
||||||
|
("https://thumbs46.redgifs.com/BabyishCharmingAidi-medium.jpg", "babyishcharmingaidi"),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
def test_get_id(test_url: str, expected: str):
|
def test_get_id(test_url: str, expected: str):
|
||||||
|
@ -81,6 +82,7 @@ def test_get_link(test_url: str, expected: set[str]):
|
||||||
"44fb28f72ec9a5cca63fa4369ab4f672",
|
"44fb28f72ec9a5cca63fa4369ab4f672",
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
("https://thumbs46.redgifs.com/BabyishCharmingAidi-medium.jpg", {"bf14b9f3d5b630cb5fd271661226f1af"}),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
def test_download_resource(test_url: str, expected_hashes: set[str]):
|
def test_download_resource(test_url: str, expected_hashes: set[str]):
|
||||||
|
|
Loading…
Reference in a new issue