diff --git a/gallery_dl/extractor/civitai.py b/gallery_dl/extractor/civitai.py index acd27168..99846853 100644 --- a/gallery_dl/extractor/civitai.py +++ b/gallery_dl/extractor/civitai.py @@ -459,6 +459,7 @@ class CivitaiImagesExtractor(CivitaiExtractor): def images(self): params = self._parse_query(self.groups[0]) + params["types"] = ("image",) return self.api.images(params) @@ -521,6 +522,7 @@ class CivitaiUserImagesExtractor(CivitaiExtractor): def __init__(self, match): user, query = match.groups() self.params = self._parse_query(query) + self.params["types"] = ("image",) if self.params.get("section") == "reactions": self.subcategory = "reactions-images" self.images = self._image_reactions @@ -708,7 +710,6 @@ class CivitaiTrpcAPI(): "useIndex" : True, "period" : "AllTime", "sort" : "Newest", - "types" : ("image",), "withMeta" : False, # Metadata Only "fromPlatform" : False, # Made On-Site "browsingLevel": self.nsfw, diff --git a/test/results/civitai.py b/test/results/civitai.py index 7397c92d..22c8f842 100644 --- a/test/results/civitai.py +++ b/test/results/civitai.py @@ -363,6 +363,16 @@ __tests__ = ( "version": None, }, +{ + "#url" : "https://civitai.com/posts/20403514", + "#comment" : "mixed image & video (#8053)", + "#class" : civitai.CivitaiPostExtractor, + "#results" : ( + "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/62dbebbe-48e9-4232-b4da-33c70d19683d/original=true/91967659.png", + "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/e5786ddc-29b3-4a69-aec9-fba4dc2c78b5/quality=100/91967639.webm", + ), +}, + { "#url" : "https://civitai.com/tag/mecha", "#class": civitai.CivitaiTagExtractor,