diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 9775d9cc..8e4e738e 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -1176,19 +1176,19 @@ Consider all listed sites to potentially be NSFW. JPG Fish https://jpg5.su/ - Albums, individual Images, User Profiles + Albums, individual Images, User Profiles, Videos IMG.Kiwi https://img.kiwi/ - Albums, individual Images, User Profiles + Albums, individual Images, User Profiles, Videos ImagePond https://imagepond.net/ - Albums, individual Images, User Profiles + Albums, individual Images, User Profiles, Videos diff --git a/gallery_dl/extractor/chevereto.py b/gallery_dl/extractor/chevereto.py index db67a9d0..b41ee9f2 100644 --- a/gallery_dl/extractor/chevereto.py +++ b/gallery_dl/extractor/chevereto.py @@ -54,7 +54,7 @@ BASE_PATTERN = CheveretoExtractor.update({ class CheveretoImageExtractor(CheveretoExtractor): - """Extractor for chevereto Images""" + """Extractor for chevereto images""" subcategory = "image" pattern = BASE_PATTERN + r"(/im(?:g|age)/[^/?#]+)" example = "https://jpg2.su/img/TITLE.ID" @@ -74,22 +74,66 @@ class CheveretoImageExtractor(CheveretoExtractor): url, b"seltilovessimpcity@simpcityhatesscrapers", fromhex=True) - image = { + file = { "id" : self.path.rpartition(".")[2], "url" : url, - "album": text.extr(extr("Added to "), ">", "<"), + "album": text.remove_html(extr( + "Added to ").rpartition(">")[2]), "date" : text.parse_datetime(extr( '', "—"), + "album": text.remove_html(extr( + "Added to ").rpartition(">")[2]), + "date" : text.parse_datetime(extr( + '