From 5c32a7bf58176bb5d2c5e22260cfe1d8a0844808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Sat, 6 Mar 2021 21:31:28 +0100
Subject: [PATCH] [deviantart] allow selecting source for 'extra' (#1356)

Setting 'extra' to "stash" or "deviations" will only download embedded
sta.sh content or deviations. 'true' still downloads both.
---
 docs/configuration.rst             |  9 +++++---
 gallery_dl/extractor/deviantart.py | 37 +++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index aacf0d49..7171238d 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -745,14 +745,18 @@ Description
 extractor.deviantart.extra
 --------------------------
 Type
-    ``bool``
+    ``bool`` or ``string``
 Default
     ``false``
 Description
     Download embedded Deviations and Sta.sh resources from
     description texts and journals.
 
-    Note: Enabling this option also enables deviantart.metadata_.
+    Set this option to ``"stash"`` or ``"deviations"``
+    to select only one of them as a source.
+
+    Note: Enabling this option also enables
+    `deviantart.metadata <extractor.deviantart.metadata_>`_.
 
 
 extractor.deviantart.flat
@@ -2760,7 +2764,6 @@ Description
 
 .. _base-directory: `extractor.*.base-directory`_
 .. _date-format: `extractor.*.date-format`_
-.. _deviantart.metadata: `extractor.deviantart.metadata`_
 .. _postprocessors: `extractor.*.postprocessors`_
 .. _download archive: `extractor.*.archive`_
 
diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py
index 47286b76..acbaf5be 100644
--- a/gallery_dl/extractor/deviantart.py
+++ b/gallery_dl/extractor/deviantart.py
@@ -78,9 +78,18 @@ class DeviantartExtractor(Extractor):
             else:
                 self.user = profile["user"]["username"]
 
-        if self.extra:
-            finditer_stash = DeviantartStashExtractor.pattern.finditer
-            finditer_deviation = DeviantartDeviationExtractor.pattern.finditer
+        extra = self.extra
+        if extra:
+            if extra == "stash":
+                extra_stash = DeviantartStashExtractor.pattern.finditer
+                extra_deviation = None
+            elif extra == "deviations":
+                extra_deviation = DeviantartDeviationExtractor.pattern.finditer
+                extra_stash = None
+            else:
+                extra_stash = DeviantartStashExtractor.pattern.finditer
+                extra_deviation = DeviantartDeviationExtractor.pattern.finditer
+            extra = True
 
         yield Message.Version, 1
         for deviation in self.deviations():
@@ -131,21 +140,23 @@ class DeviantartExtractor(Extractor):
 
             if "excerpt" in deviation and self.commit_journal:
                 journal = self.api.deviation_content(deviation["deviationid"])
-                if self.extra:
+                if extra:
                     deviation["_journal"] = journal["html"]
                 yield self.commit_journal(deviation, journal)
 
-            if self.extra:
+            if extra:
                 txt = (deviation.get("description", "") +
                        deviation.get("_journal", ""))
-                for match in finditer_stash(txt):
-                    url = text.ensure_http_scheme(match.group(0))
-                    deviation["_extractor"] = DeviantartStashExtractor
-                    yield Message.Queue, url, deviation
-                for match in finditer_deviation(txt):
-                    url = text.ensure_http_scheme(match.group(0))
-                    deviation["_extractor"] = DeviantartDeviationExtractor
-                    yield Message.Queue, url, deviation
+                if extra_stash:
+                    for match in extra_stash(txt):
+                        url = text.ensure_http_scheme(match.group(0))
+                        deviation["_extractor"] = DeviantartStashExtractor
+                        yield Message.Queue, url, deviation
+                if extra_deviation:
+                    for match in extra_deviation(txt):
+                        url = text.ensure_http_scheme(match.group(0))
+                        deviation["_extractor"] = DeviantartDeviationExtractor
+                        yield Message.Queue, url, deviation
 
     def deviations(self):
         """Return an iterable containing all relevant Deviation-objects"""