From fc8c5e642017e2b4e5299e2093e72b316479690d Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Wed, 10 Nov 2021 01:26:06 -0500 Subject: New upstream version 1.19.2. --- gallery_dl/extractor/deviantart.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'gallery_dl/extractor/deviantart.py') diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index 4604d39..61affb5 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -137,11 +137,12 @@ class DeviantartExtractor(Extractor): def prepare(self, deviation): """Adjust the contents of a Deviation-object""" - try: - deviation["index"] = text.parse_int( - deviation["url"].rpartition("-")[2]) - except KeyError: - deviation["index"] = 0 + if "index" not in deviation: + try: + deviation["index"] = text.parse_int( + deviation["url"].rpartition("-")[2]) + except KeyError: + deviation["index"] = 0 if self.user: deviation["username"] = self.user @@ -602,7 +603,10 @@ class DeviantartStashExtractor(DeviantartExtractor): if stash_id[0] == "0": uuid = text.extract(page, '//deviation/', '"')[0] if uuid: - yield self.api.deviation(uuid) + deviation = self.api.deviation(uuid) + deviation["index"] = text.parse_int(text.extract( + page, 'gmi-deviationid="', '"')[0]) + yield deviation return for item in text.extract_iter( -- cgit v1.2.3