From b0438c8f99b84be6df3ec90c506d47efc32d4614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Fri, 19 Mar 2021 16:24:23 +0100
Subject: [PATCH] Revert "[deviantart] extend 'extra' option"

This reverts commit
5ad2b9c82bd9a92b80b935cb268cedb35008da86,
5c32a7bf58176bb5d2c5e22260cfe1d8a0844808, and
83f465faca3107c6406972d913d3f194412d9494.

(#1387, #1356)
---
 docs/configuration.rst             | 20 ++++++-------------
 docs/gallery-dl.conf               |  2 +-
 gallery_dl/extractor/deviantart.py | 31 ++++++++----------------------
 3 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 90ec847a..53368ab7 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -755,23 +755,14 @@ Description
 extractor.deviantart.extra
 --------------------------
 Type
-    ``string`` or ``list`` of ``strings``
+    ``bool``
 Default
-    ``null``
-Example
-    ``stash,posts``
+    ``false``
 Description
-    A (comma-separated) list of extra content to extract
-    from description texts and journals.
+    Download extra Sta.sh resources from
+    description texts and journals.
 
-    Possible values are
-    ``"posts"`` (embedded DeviantArt posts) and
-    ``"stash"`` (Sta.sh resources).
-
-    You can use ``"all"`` instead of listing all values separately.
-
-    Note: Enabling this option also enables
-    `deviantart.metadata <extractor.deviantart.metadata_>`_.
+    Note: Enabling this option also enables deviantart.metadata_.
 
 
 extractor.deviantart.flat
@@ -2793,6 +2784,7 @@ 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/docs/gallery-dl.conf b/docs/gallery-dl.conf
index ca34eb51..7702e4a9 100644
--- a/docs/gallery-dl.conf
+++ b/docs/gallery-dl.conf
@@ -58,7 +58,7 @@
         },
         "deviantart":
         {
-            "extra": null,
+            "extra": false,
             "flat": true,
             "folders": false,
             "include": "gallery",
diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py
index 8ff4e4b5..d81fdb56 100644
--- a/gallery_dl/extractor/deviantart.py
+++ b/gallery_dl/extractor/deviantart.py
@@ -78,21 +78,7 @@ class DeviantartExtractor(Extractor):
             else:
                 self.user = profile["user"]["username"]
 
-        extra = self.extra
-        if extra:
-            if extra is True or extra == "all":
-                extra = (DeviantartStashExtractor,
-                         DeviantartDeviationExtractor)
-            else:
-                items = extra
-                extra = []
-                if isinstance(items, str):
-                    items = items.split(",")
-                if "stash" in items:
-                    extra.append(DeviantartStashExtractor)
-                if "posts" in items:
-                    extra.append(DeviantartDeviationExtractor)
-
+        yield Message.Version, 1
         for deviation in self.deviations():
             if isinstance(deviation, tuple):
                 url, data = deviation
@@ -141,18 +127,17 @@ class DeviantartExtractor(Extractor):
 
             if "excerpt" in deviation and self.commit_journal:
                 journal = self.api.deviation_content(deviation["deviationid"])
-                if extra:
+                if self.extra:
                     deviation["_journal"] = journal["html"]
                 yield self.commit_journal(deviation, journal)
 
-            if extra:
+            if self.extra:
                 txt = (deviation.get("description", "") +
                        deviation.get("_journal", ""))
-                for extr in extra:
-                    for match in extr.pattern.finditer(txt):
-                        url = text.ensure_http_scheme(match.group(0))
-                        deviation["_extractor"] = extr
-                        yield Message.Queue, url, deviation
+                for match in DeviantartStashExtractor.pattern.finditer(txt):
+                    url = text.ensure_http_scheme(match.group(0))
+                    deviation["_extractor"] = DeviantartStashExtractor
+                    yield Message.Queue, url, deviation
 
     def deviations(self):
         """Return an iterable containing all relevant Deviation-objects"""
@@ -780,7 +765,7 @@ class DeviantartDeviationExtractor(DeviantartExtractor):
         }),
         # sta.sh URLs from description (#302)
         (("https://www.deviantart.com/uotapo/art/INANAKI-Memo-590297498"), {
-            "options": (("extra", "stash"), ("original", False)),
+            "options": (("extra", 1), ("original", 0)),
             "pattern": DeviantartStashExtractor.pattern,
             "range": "2-",
             "count": 4,