From 41d03160ff0a22ad33f1d7510c30c0189fde4a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Thu, 4 Jun 2020 14:47:08 +0200 Subject: [PATCH] [deviantart] also search journals for sta.sh links (#712) when 'extra' is enabled --- docs/configuration.rst | 3 ++- gallery_dl/extractor/deviantart.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/configuration.rst b/docs/configuration.rst index 69829735..72f0d4cb 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -576,7 +576,8 @@ extractor.deviantart.extra =========== ===== Type ``bool`` Default ``false`` -Description Download extra Sta.sh resources from description texts. +Description Download extra Sta.sh resources from + description texts and journals. Note: Enabling this option also enables deviantart.metadata_. =========== ===== diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index cda357a3..9dd1cd30 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -123,6 +123,10 @@ class DeviantartExtractor(Extractor): journal = self.api.deviation_content(deviation["deviationid"]) 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", "")):