diff --git a/docs/configuration.rst b/docs/configuration.rst index 5d3ecaee..c606c6c0 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -395,6 +395,17 @@ Description Try to follow external URLs of embedded players. =========== ===== +extractor.deviantart.extra +-------------------------- +=========== ===== +Type ``bool`` +Default ``false`` +Description Download extra Sta.sh resources from description texts. + + Note: Enabling this option also enables deviantart.metadata_. +=========== ===== + + extractor.deviantart.flat ------------------------- =========== ===== @@ -487,17 +498,6 @@ Description The ``refresh_token`` value you get from linking your =========== ===== -extractor.deviantart.stash --------------------------- -=========== ===== -Type ``bool`` -Default ``false`` -Description Extract Sta.sh resources from description texts. - - Note: Enabling this option also enables deviantart.metadata_. -=========== ===== - - extractor.deviantart.wait-min ----------------------------- =========== ===== diff --git a/docs/gallery-dl.conf b/docs/gallery-dl.conf index d55c9c0a..c792e9e3 100644 --- a/docs/gallery-dl.conf +++ b/docs/gallery-dl.conf @@ -22,13 +22,13 @@ "deviantart": { "refresh-token": null, + "extra": false, "flat": true, "folders": false, "journals": "html", "mature": true, "metadata": false, "original": true, - "stash": false, "wait-min": 0 }, "exhentai": diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index b2efa196..b8b193db 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -38,12 +38,12 @@ class DeviantartExtractor(Extractor): self.api = DeviantartAPI(self) self.offset = 0 self.flat = self.config("flat", True) - self.stash = self.config("stash", False) + self.extra = self.config("extra", False) self.original = self.config("original", True) self.user = match.group(1) or match.group(2) self.group = False - if self.stash: + if self.extra: self.api.metadata = True self.commit_journal = { @@ -99,7 +99,7 @@ class DeviantartExtractor(Extractor): journal = self.api.deviation_content(deviation["deviationid"]) yield self.commit_journal(deviation, journal) - if self.stash: + if self.extra: for match in DeviantartStashExtractor.pattern.finditer( deviation.get("description", "")): deviation["_extractor"] = DeviantartStashExtractor @@ -374,7 +374,7 @@ class DeviantartDeviationExtractor(DeviantartExtractor): # external URLs from description (#302) (("https://www.deviantart.com/uotapo/art/" "INANAKI-Memorial-Humane7-590297498"), { - "options": (("stash", 1), ("original", 0)), + "options": (("extra", 1), ("original", 0)), "pattern": r"https?://sta\.sh/\w+$", "range": "2-", "count": 4, diff --git a/test/test_results.py b/test/test_results.py index a107efc1..8fd91170 100644 --- a/test/test_results.py +++ b/test/test_results.py @@ -26,9 +26,10 @@ TRAVIS_SKIP = { # temporary issues, etc. BROKEN = { - "fallenangels", "mangapark", + "mangoxo", "ngomik", + "photobucket", }