summaryrefslogtreecommitdiffstats
path: root/gallery_dl/extractor/deviantart.py
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@unit193.net>2020-06-16 02:01:17 -0400
committerLibravatarUnit 193 <unit193@unit193.net>2020-06-16 02:01:17 -0400
commit8c911e3d62a430f5630c13d51b47201fa8ff3cd1 (patch)
tree6e0e6f65abc37d7f35ea96d323031a52c7fa966d /gallery_dl/extractor/deviantart.py
parenta70a3246927b72f1ded37acd55ee719515441b5b (diff)
New upstream version 1.14.1.upstream/1.14.1
Diffstat (limited to 'gallery_dl/extractor/deviantart.py')
-rw-r--r--gallery_dl/extractor/deviantart.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py
index cda357a..73ef20d 100644
--- a/gallery_dl/extractor/deviantart.py
+++ b/gallery_dl/extractor/deviantart.py
@@ -121,11 +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:
- 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