diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 4e76732a..bdf20c20 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -1365,7 +1365,7 @@ Consider all listed sites to potentially be NSFW. ImagePond - https://imagepond.net/ + https://www.imagepond.net/ Albums, Categories, Files, User Profiles diff --git a/gallery_dl/extractor/chevereto.py b/gallery_dl/extractor/chevereto.py index 4b69b9bd..782dd049 100644 --- a/gallery_dl/extractor/chevereto.py +++ b/gallery_dl/extractor/chevereto.py @@ -88,7 +88,7 @@ BASE_PATTERN = CheveretoExtractor.update({ "pattern": r"(?:www\.)?jpe?g\d?\.(?:cr|su|pet|fish(?:ing)?|church)", }, "imagepond": { - "root": "https://imagepond.net", + "root": "https://www.imagepond.net", "pattern": r"(?:www\.)?imagepond\.net", }, "imglike": { @@ -101,7 +101,7 @@ BASE_PATTERN = CheveretoExtractor.update({ class CheveretoFileExtractor(CheveretoExtractor): """Extractor for chevereto files""" subcategory = "file" - pattern = BASE_PATTERN + r"(/(?:im(?:g|age)|video)/[^/?#]+)" + pattern = BASE_PATTERN + r"(/(?:im(?:g|age)|video|i)/[^/?#]+)" example = "https://jpg7.cr/img/TITLE.ID" def items(self): @@ -232,5 +232,6 @@ class CheveretoUserExtractor(CheveretoExtractor): data_file = {"_extractor": CheveretoFileExtractor} data_album = {"_extractor": CheveretoAlbumExtractor} for url in self._pagination(self.root + self.path): - data = data_album if "/album/" in url else data_file + data = (data_album if "/album/" in url or "/a/" in url else + data_file) yield Message.Queue, url, data diff --git a/test/results/imagepond.py b/test/results/imagepond.py index f7ae0ad6..3592cdf2 100644 --- a/test/results/imagepond.py +++ b/test/results/imagepond.py @@ -55,6 +55,12 @@ __tests__ = ( "width" : 720, }, +{ + "#url" : "https://www.imagepond.net/i/chv_317512", + "#category": ("chevereto", "imagepond", "file"), + "#class" : chevereto.CheveretoFileExtractor, +}, + { "#url" : "https://imagepond.net/album/CDilP/?sort=date_desc&page=1", "#category": ("chevereto", "imagepond", "album"),