github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[imagetwist] simplify pattern and add tests

Browse Source
This commit is contained in:
Mike Fährmann
2023-02-06 14:51:57 +01:00
parent 29f0830b53
commit 706ec70e89
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gallery_dl/extractor/imagehosts.py
View File

@@ -187,13 +187,19 @@ class ImagevenueImageExtractor(ImagehostImageExtractor):
class ImagetwistImageExtractor(ImagehostImageExtractor): class ImagetwistImageExtractor(ImagehostImageExtractor):
"""Extractor for single images from imagetwist.com""" """Extractor for single images from imagetwist.com"""
category = "imagetwist" category = "imagetwist"
pattern = (r"(?:https?://)?((?:www|phun\.)?" pattern = (r"(?:https?://)?((?:www\.|phun\.)?"
r"(?:imagetwist|imagehaha)\.com/([a-z0-9]{12}))") r"image(?:twist|haha)\.com/([a-z0-9]{12}))")
test = ("https://imagetwist.com/f1i2s4vhvbrq/test.png", { test = (
"url": "8d5e168c0bee30211f821c6f3b2116e419d42671", ("https://imagetwist.com/f1i2s4vhvbrq/test.png", {
"keyword": "d1060a4c2e3b73b83044e20681712c0ffdd6cfef", "url": "8d5e168c0bee30211f821c6f3b2116e419d42671",
"content": "0c8768055e4e20e7c7259608b67799171b691140", "keyword": "d1060a4c2e3b73b83044e20681712c0ffdd6cfef",
}) "content": "0c8768055e4e20e7c7259608b67799171b691140",
}),
("https://www.imagetwist.com/f1i2s4vhvbrq/test.png"),
("https://phun.imagetwist.com/f1i2s4vhvbrq/test.png"),
("https://imagehaha.com/f1i2s4vhvbrq/test.png"),
("https://www.imagehaha.com/f1i2s4vhvbrq/test.png"),
)
@property @property
@memcache(maxage=3*3600) @memcache(maxage=3*3600)