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

[chevereto] extract 'album_id' & 'album_slug' metadata (#8604)

Browse Source
This commit is contained in:
Mike Fährmann
2025-12-07 17:40:08 +01:00
parent 526a42a04d
commit d2b3eb6adb
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gallery_dl/extractor/chevereto.py
View File

@@ -74,15 +74,18 @@ class CheveretoImageExtractor(CheveretoExtractor):
url, b"seltilovessimpcity@simpcityhatesscrapers", url, b"seltilovessimpcity@simpcityhatesscrapers",
fromhex=True) fromhex=True)
album_url, _, album_name = extr("Added to <a", "</a>").rpartition(">")
file = { file = {
"id" : self.path.rpartition("/")[2].rpartition(".")[2], "id" : self.path.rpartition("/")[2].rpartition(".")[2],
"url" : url, "url" : url,
"album": text.remove_html(extr( "album": text.remove_html(album_name),
"Added to <a", "</a>").rpartition(">")[2]),
"date" : self.parse_datetime_iso(extr('<span title="', '"')), "date" : self.parse_datetime_iso(extr('<span title="', '"')),
"user" : extr('username: "', '"'), "user" : extr('username: "', '"'),
} }
file["album_slug"], _, file["album_id"] = text.rextr(
album_url, "/", '"').rpartition(".")
text.nameext_from_url(file["url"], file) text.nameext_from_url(file["url"], file)
yield Message.Directory, "", file yield Message.Directory, "", file
yield Message.Url, file["url"], file yield Message.Url, file["url"], file
@@ -113,12 +116,17 @@ class CheveretoVideoExtractor(CheveretoExtractor):
'property="video:height" content="', '"')), 'property="video:height" content="', '"')),
"duration" : extr( "duration" : extr(
'class="far fa-clock"></i>', "—"), 'class="far fa-clock"></i>', "—"),
"album": text.remove_html(extr( "album" : extr(
"Added to <a", "</a>").rpartition(">")[2]), "Added to <a", "</a>"),
"date" : self.parse_datetime_iso(extr('<span title="', '"')), "date" : self.parse_datetime_iso(extr('<span title="', '"')),
"user" : extr('username: "', '"'), "user" : extr('username: "', '"'),
} }
album_url, _, album_name = file["album"].rpartition(">")
file["album"] = text.remove_html(album_name)
file["album_slug"], _, file["album_id"] = text.rextr(
album_url, "/", '"').rpartition(".")
try: try:
min, _, sec = file["duration"].partition(":") min, _, sec = file["duration"].partition(":")
file["duration"] = int(min) * 60 + int(sec) file["duration"] = int(min) * 60 + int(sec)

2
test/results/imagepond.py
View File

@@ -37,6 +37,8 @@ __tests__ = (
"#results" : "https://media.imagepond.net/media/100042393993a6bfa75fc505e9.mp4", "#results" : "https://media.imagepond.net/media/100042393993a6bfa75fc505e9.mp4",
"album" : "", "album" : "",
"album_id" : "",
"album_slug": "",
"date" : "dt:2025-08-29 18:01:20", "date" : "dt:2025-08-29 18:01:20",
"duration" : 7, "duration" : 7,
"extension": "mp4", "extension": "mp4",

9
test/results/jpgfish.py
View File

@@ -16,6 +16,8 @@ __tests__ = (
"#sha1_content": "098e5e9b17ad634358426e0ffd1c93871474d13c", "#sha1_content": "098e5e9b17ad634358426e0ffd1c93871474d13c",
"album" : "", "album" : "",
"album_id" : "",
"album_slug": "",
"date" : "dt:2022-06-05 03:24:25", "date" : "dt:2022-06-05 03:24:25",
"extension": "jpg", "extension": "jpg",
"filename" : "funnymeme", "filename" : "funnymeme",
@@ -62,8 +64,11 @@ __tests__ = (
"#class" : chevereto.CheveretoImageExtractor, "#class" : chevereto.CheveretoImageExtractor,
"#results" : "https://simp2.selti-delivery.ru/hannahowo_00457.jpg", "#results" : "https://simp2.selti-delivery.ru/hannahowo_00457.jpg",
"album": "401-500", "album" : "401-500",
"date" : "dt:2022-03-23 13:50:52", "album_id" : "atYaG",
"album_slug": "401-500",
"date" : "dt:2022-03-23 13:50:52",
"id" : "auCruA",
}, },
{ {