From c6c06c41f647cc29475cd05b423b2eaabd6e9dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 5 Jun 2020 21:56:12 +0200 Subject: [PATCH] [deviantart] don't add journal text to description (#712) --- gallery_dl/extractor/deviantart.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index 9dd1cd30..73ef20da 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -121,15 +121,14 @@ class DeviantartExtractor(Extractor): if "excerpt" in deviation and self.commit_journal: journal = self.api.deviation_content(deviation["deviationid"]) + if self.extra: + deviation["_journal"] = journal["html"] yield self.commit_journal(deviation, journal) - if self.extra: - deviation["description"] = \ - deviation.get("description", "") + journal["html"] - if self.extra: - for match in DeviantartStashExtractor.pattern.finditer( - deviation.get("description", "")): + txt = (deviation.get("description", "") + + deviation.get("_journal", "")) + for match in DeviantartStashExtractor.pattern.finditer(txt): url = text.ensure_http_scheme(match.group(0)) deviation["_extractor"] = DeviantartStashExtractor yield Message.Queue, url, deviation