smaller textual changes

- swapped doc for deviantart.mature and .original
- updated gallery-dl.conf
- "transferred" -> "delegated"
pull/54/head
Mike Fährmann 7 years ago
parent 68a0a7579c
commit 2ef3c35c98
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88

@ -287,29 +287,29 @@ Description Select the directory structure created by the Gallery- and
=========== ===== =========== =====
extractor.deviantart.original extractor.deviantart.mature
----------------------------- ---------------------------
=========== ===== =========== =====
Type ``bool`` Type ``bool``
Default ``true`` Default ``true``
Description Request full-sized original images if available. Description Enable mature content.
Some of DeviantArt's images require an additional API call to get This option simply sets the |mature_content|_ parameter for API
their actual original version, which is being hosted on calls to either ``"true"`` or ``"false"`` and does not do any other
Amazon Web Services (AWS) servers. form of content filtering.
=========== ===== =========== =====
extractor.deviantart.mature extractor.deviantart.original
--------------------------- -----------------------------
=========== ===== =========== =====
Type ``bool`` Type ``bool``
Default ``true`` Default ``true``
Description Enable mature content. Description Request full-sized original images if available.
This option simply sets the |mature_content|_ parameter for API Some of DeviantArt's images require an additional API call to get
calls to either ``"true"`` or ``"false"`` and does not do any other their actual original version, which is being hosted on
form of content filtering. Amazon Web Services (AWS) servers.
=========== ===== =========== =====

@ -80,7 +80,8 @@
"deviantart": "deviantart":
{ {
"flat": true, "flat": true,
"mature": true "mature": true,
"original": true
}, },
"gfycat": "gfycat":
{ {

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2015, 2016 Mike Fährmann # Copyright 2015-2017 Mike Fährmann
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as # it under the terms of the GNU General Public License version 2 as

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2014-2016 Mike Fährmann # Copyright 2014-2017 Mike Fährmann
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as # it under the terms of the GNU General Public License version 2 as

@ -190,7 +190,7 @@ class KeywordJob(Job):
def handle_queue(self, url, keywords): def handle_queue(self, url, keywords):
if not keywords: if not keywords:
self.extractor.log.info( self.extractor.log.info(
"This extractor transfers work to other extractors " "This extractor delegates work to other extractors "
"and does not provide any keywords on its own. Try " "and does not provide any keywords on its own. Try "
"'gallery-dl -K \"%s\"' instead.", url) "'gallery-dl -K \"%s\"' instead.", url)
else: else:

@ -201,7 +201,7 @@ def build_parser():
"--chapter-range", "--chapter-range",
metavar="RANGE", dest="chapter_range", metavar="RANGE", dest="chapter_range",
help=("Same as '--range' except for chapters " help=("Same as '--range' except for chapters "
"and other transferred URLs"), "and other delegated URLs"),
) )
selection.add_argument( selection.add_argument(
"--filter", "--filter",
@ -216,7 +216,7 @@ def build_parser():
"--chapter-filter", "--chapter-filter",
metavar="EXPR", dest="chapter_filter", metavar="EXPR", dest="chapter_filter",
help=("Same as '--filter' except for chapters " help=("Same as '--filter' except for chapters "
"and other transferred URLs"), "and other delegated URLs"),
) )
selection.add_argument( selection.add_argument(
"--images", dest="depr_images", "--images", dest="depr_images",

Loading…
Cancel
Save