{cyberdrop] restore video extraction (fixes #1993)

fixes a regression introduced in f33c2ef7
pull/2005/head
Mike Fährmann 3 years ago
parent fa5646eadc
commit dd88a7d980
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88

@ -17,8 +17,10 @@ class CyberdropAlbumExtractor(Extractor):
directory_fmt = ("{category}", "{album_name} ({album_id})") directory_fmt = ("{category}", "{album_name} ({album_id})")
archive_fmt = "{album_id}_{id}" archive_fmt = "{album_id}_{id}"
pattern = r"(?:https?://)?(?:www\.)?cyberdrop\.me/a/([^/?#]+)" pattern = r"(?:https?://)?(?:www\.)?cyberdrop\.me/a/([^/?#]+)"
test = ("https://cyberdrop.me/a/keKRjm4t", { test = (
"pattern": r"https://fs-\d+\.cyberdrop\.to/.*\.[a-z]+$", # images
("https://cyberdrop.me/a/keKRjm4t", {
"pattern": r"https://fs-\d+\.cyberdrop\.to/.*\.(jpg|png|webp)$",
"keyword": { "keyword": {
"album_id": "keKRjm4t", "album_id": "keKRjm4t",
"album_name": "Fate (SFW)", "album_name": "Fate (SFW)",
@ -28,7 +30,19 @@ class CyberdropAlbumExtractor(Extractor):
"description": "", "description": "",
"id": r"re:\w{8}", "id": r"re:\w{8}",
}, },
}) }),
# videos
("https://cyberdrop.me/a/l8gIAXVD", {
"pattern": r"https://fs-\d+\.cyberdrop\.to/.*\.mp4$",
"count": 31,
"keyword": {
"album_id": "l8gIAXVD",
"album_name": "Achelois17 videos",
"album_size": 652037121,
"date": "dt:2020-06-16 15:40:44",
},
}),
)
def __init__(self, match): def __init__(self, match):
Extractor.__init__(self, match) Extractor.__init__(self, match)
@ -41,7 +55,7 @@ class CyberdropAlbumExtractor(Extractor):
files = [] files = []
append = files.append append = files.append
while True: while True:
url = extr('downloadUrl: "', '"') url = extr('id="file" href="', '"')
if not url: if not url:
break break
append(text.unescape(url)) append(text.unescape(url))

Loading…
Cancel
Save