New upstream version 1.17.0.upstream/1.17.0

4 files changed, 118 insertions, 65 deletions

diff --git a/data/completion/_gallery-dl b/data/completion/_gallery-dl
index f134f63..76afd8a 100644
--- a/data/completion/_gallery-dl
+++ b/data/completion/_gallery-dl
@@ -8,16 +8,17 @@ _arguments -C -S \
 {-h,--help}'[Print this help message and exit]' \
 --version'[Print program version and exit]' \
 {-d,--dest}'[Destination directory]':'<dest>':_files \
-{-i,--input-file}'[Download URLs found in FILE ("-" for stdin)]':'<file>':_files \
+{-i,--input-file}'[Download URLs found in FILE ("-" for stdin). More than one --input-file can be specified]':'<file>':_files \
 --cookies'[File to load additional cookies from]':'<file>':_files \
 --proxy'[Use the specified proxy]':'<url>' \
 --clear-cache'[Delete all cached login sessions, cookies, etc.]' \
 {-q,--quiet}'[Activate quiet mode]' \
 {-v,--verbose}'[Print various debugging information]' \
 {-g,--get-urls}'[Print URLs instead of downloading]' \
--G'[==SUPPRESS==]' \
+{-G,--resolve-urls}'[Print URLs instead of downloading; resolve intermediary URLs]' \
 {-j,--dump-json}'[Print JSON information]' \
 {-s,--simulate}'[Simulate data extraction; do not download anything]' \
+{-E,--extractor-info}'[Print extractor defaults and settings]' \
 {-K,--list-keywords}'[Print a list of available keywords and example values for the given URLs]' \
 --list-modules'[Print a list of available extractor modules]' \
 --list-extractors'[Print a list of extractor classes with description, (sub)category and example URL]' \
diff --git a/data/completion/gallery-dl b/data/completion/gallery-dl
index 19cb39f..9a3a63e 100644
--- a/data/completion/gallery-dl
+++ b/data/completion/gallery-dl
@@ -10,7 +10,7 @@ _gallery_dl()
     elif [[ "${prev}" =~ ^(-d|--dest)$ ]]; then
         COMPREPLY=( $(compgen -d -- "${cur}") )
     else
-        COMPREPLY=( $(compgen -W "--help --version --dest --input-file --cookies --proxy --clear-cache --quiet --verbose --get-urls --dump-json --simulate --list-keywords --list-modules --list-extractors --write-log --write-unsupported --write-pages --limit-rate --retries --abort --http-timeout --sleep --filesize-min --filesize-max --no-part --no-skip --no-mtime --no-download --no-check-certificate --config --config-yaml --option --ignore-config --username --password --netrc --download-archive --range --chapter-range --filter --chapter-filter --zip --ugoira-conv --ugoira-conv-lossless --write-metadata --write-tags --mtime-from-date --exec --exec-after" -- "${cur}") )
+        COMPREPLY=( $(compgen -W "--help --version --dest --input-file --cookies --proxy --clear-cache --quiet --verbose --get-urls --resolve-urls --dump-json --simulate --extractor-info --list-keywords --list-modules --list-extractors --write-log --write-unsupported --write-pages --limit-rate --retries --abort --http-timeout --sleep --filesize-min --filesize-max --no-part --no-skip --no-mtime --no-download --no-check-certificate --config --config-yaml --option --ignore-config --username --password --netrc --download-archive --range --chapter-range --filter --chapter-filter --zip --ugoira-conv --ugoira-conv-lossless --write-metadata --write-tags --mtime-from-date --exec --exec-after" -- "${cur}") )
     fi
 }
 
diff --git a/data/man/gallery-dl.1 b/data/man/gallery-dl.1
index 02639b8..c420d9b 100644
--- a/data/man/gallery-dl.1
+++ b/data/man/gallery-dl.1
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL" "1" "2021-02-14" "1.16.5" "gallery-dl Manual"
+.TH "GALLERY-DL" "1" "2021-03-05" "1.17.0" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 
@@ -27,7 +27,7 @@ Print program version and exit
 Destination directory
 .TP
 .B "\-i, \-\-input\-file" \f[I]FILE\f[]
-Download URLs found in FILE ('-' for stdin)
+Download URLs found in FILE ('-' for stdin). More than one --input-file can be specified
 .TP
 .B "\-\-cookies" \f[I]FILE\f[]
 File to load additional cookies from
@@ -47,12 +47,18 @@ Print various debugging information
 .B "\-g, \-\-get\-urls" 
 Print URLs instead of downloading
 .TP
+.B "\-G, \-\-resolve\-urls" 
+Print URLs instead of downloading; resolve intermediary URLs
+.TP
 .B "\-j, \-\-dump\-json" 
 Print JSON information
 .TP
 .B "\-s, \-\-simulate" 
 Simulate data extraction; do not download anything
 .TP
+.B "\-E, \-\-extractor\-info" 
+Print extractor defaults and settings
+.TP
 .B "\-K, \-\-list\-keywords" 
 Print a list of available keywords and example values for the given URLs
 .TP
diff --git a/data/man/gallery-dl.conf.5 b/data/man/gallery-dl.conf.5
index 408cb61..c0629bb 100644
--- a/data/man/gallery-dl.conf.5
+++ b/data/man/gallery-dl.conf.5
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL.CONF" "5" "2021-02-14" "1.16.5" "gallery-dl Manual"
+.TH "GALLERY-DL.CONF" "5" "2021-03-05" "1.17.0" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -338,11 +338,13 @@ and optional for
 .br
 * \f[I]idolcomplex\f[]
 .br
+* \f[I]imgbb\f[]
+.br
 * \f[I]inkbunny\f[]
 .br
 * \f[I]instagram\f[]
 .br
-* \f[I]luscious\f[]
+* \f[I]mangoxo\f[]
 .br
 * \f[I]pinterest\f[]
 .br
@@ -451,7 +453,7 @@ otherwise \f[I]http://\f[] is assumed.
 \f[I]string\f[]
 
 .IP "Default:" 9
-\f[I]"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0"\f[]
+\f[I]"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0"\f[]
 
 .IP "Description:" 4
 User-Agent header value to be used for HTTP requests.
@@ -460,6 +462,28 @@ Note: This option has no effect on pixiv extractors,
 as these need specific values to function correctly.
 
 
+.SS extractor.*.browser
+.IP "Type:" 6
+\f[I]string\f[]
+
+.IP "Default:" 9
+\f[I]"firefox"\f[] for \f[I]patreon\f[], \f[I]null\f[] everywhere else
+
+.IP "Example:" 4
+.br
+* "chrome:macos"
+
+.IP "Description:" 4
+Try to emulate a real browser (\f[I]firefox\f[] or \f[I]chrome\f[])
+by using their default HTTP headers and TLS ciphers for HTTP requests.
+
+Optionally, the operating system used in the \f[I]User-Agent\f[] header can be
+specified after a \f[I]:\f[] (\f[I]windows\f[], \f[I]linux\f[], or \f[I]macos\f[]).
+
+Note: \f[I]requests\f[] and \f[I]urllib3\f[] only support HTTP/1.1, while a real
+browser would use HTTP/2.
+
+
 .SS extractor.*.keywords
 .IP "Type:" 6
 \f[I]object\f[]
@@ -839,7 +863,7 @@ See \f[I]Filters\f[] for details.
 \f[I]false\f[]
 
 .IP "Description:" 4
-Download extra Sta.sh resources from
+Download embedded Deviations and Sta.sh resources from
 description texts and journals.
 
 Note: Enabling this option also enables deviantart.metadata_.
@@ -1037,31 +1061,30 @@ If this value is an \f[I]integer\f[], it gets used as the limit maximum
 instead of the value listed on \f[I]https://e-hentai.org/home.php\f[]
 
 
-.SS extractor.exhentai.original
+.SS extractor.exhentai.metadata
 .IP "Type:" 6
 \f[I]bool\f[]
 
 .IP "Default:" 9
-\f[I]true\f[]
+\f[I]false\f[]
 
 .IP "Description:" 4
-Download full-sized original images if available.
+Load extended gallery metadata from the
+\f[I]API\f[].
 
+Adds \f[I]archiver_key\f[], \f[I]posted\f[], and \f[I]torrents\f[].
+Makes \f[I]date\f[] and \f[I]filesize\f[] more precise.
 
-.SS extractor.exhentai.wait-min & .wait-max
+
+.SS extractor.exhentai.original
 .IP "Type:" 6
-\f[I]float\f[]
+\f[I]bool\f[]
 
 .IP "Default:" 9
-\f[I]3.0\f[] and \f[I]6.0\f[]
+\f[I]true\f[]
 
 .IP "Description:" 4
-Minimum and maximum wait time in seconds between each image
-
-ExHentai detects and blocks automated downloaders.
-*gallery-dl* waits a randomly selected number of
-seconds between \f[I]wait-min\f[] and \f[I]wait-max\f[] after
-each image to prevent getting blocked.
+Download full-sized original images if available.
 
 
 .SS extractor.flickr.access-token & .access-token-secret
@@ -1142,20 +1165,6 @@ Possible values are
 You can use \f[I]"all"\f[] instead of listing all values separately.
 
 
-.SS extractor.gelbooru.api
-.IP "Type:" 6
-\f[I]bool\f[]
-
-.IP "Default:" 9
-\f[I]true\f[]
-
-.IP "Description:" 4
-Enable use of Gelbooru's API.
-
-Set this value to false if the API has been disabled to switch
-to manual information extraction.
-
-
 .SS extractor.gfycat.format
 .IP "Type:" 6
 \f[I]string\f[]
@@ -1192,6 +1201,17 @@ Possible values are
 You can use \f[I]"all"\f[] instead of listing all values separately.
 
 
+.SS extractor.hentainexus.original
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]true\f[]
+
+.IP "Description:" 4
+Download original files instead of WebP versions.
+
+
 .SS extractor.hitomi.metadata
 .IP "Type:" 6
 \f[I]bool\f[]
@@ -1285,6 +1305,17 @@ If the selected format is not available,
 the first in the list gets chosen (usually mp3).
 
 
+.SS extractor.mangadex.api-server
+.IP "Type:" 6
+\f[I]string\f[]
+
+.IP "Default:" 9
+\f[I]"https://api.mangadex.org"\f[]
+
+.IP "Description:" 4
+The server to use for API requests.
+
+
 .SS extractor.newgrounds.flash
 .IP "Type:" 6
 \f[I]bool\f[]
@@ -1444,6 +1475,17 @@ Download user avatars.
 Also download related artworks.
 
 
+.SS extractor.pixiv.translated-tags
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]false\f[]
+
+.IP "Description:" 4
+Provide translated ´tags`.
+
+
 .SS extractor.pixiv.ugoira
 .IP "Type:" 6
 \f[I]bool\f[]
@@ -1472,18 +1514,6 @@ to watchable videos. (Example__)
 Also search Plurk comments for URLs.
 
 
-.SS extractor.reactor.wait-min & .wait-max
-.IP "Type:" 6
-\f[I]float\f[]
-
-.IP "Default:" 9
-\f[I]3.0\f[] and \f[I]6.0\f[]
-
-.IP "Description:" 4
-Minimum and maximum wait time in seconds between HTTP requests
-during the extraction process.
-
-
 .SS extractor.readcomiconline.captcha
 .IP "Type:" 6
 \f[I]string\f[]
@@ -1755,6 +1785,18 @@ You can use \f[I]"all"\f[] instead of listing all types separately.
 Fetch media from \f[I]Cards\f[].
 
 
+.SS extractor.twitter.conversations
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]false\f[]
+
+.IP "Description:" 4
+Fetch media from all Tweets and replies in a \f[I]conversation
+<https://help.twitter.com/en/using-twitter/twitter-conversations>\f[].
+
+
 .SS extractor.twitter.quoted
 .IP "Type:" 6
 \f[I]bool\f[]
@@ -2064,6 +2106,17 @@ Check the file headers of \f[I]jpg\f[], \f[I]png\f[], and \f[I]gif\f[] files
 and adjust their filename extensions if they do not match.
 
 
+.SS downloader.http.headers
+.IP "Type:" 6
+\f[I]object\f[]
+
+.IP "Example:" 4
+{"Accept": "image/webp,*/*", "Referer": "https://example.org/"}
+
+.IP "Description:" 4
+Additional HTTP headers to send when downloading files,
+
+
 .SS downloader.ytdl.format
 .IP "Type:" 6
 \f[I]string\f[]
@@ -2103,6 +2156,17 @@ Note: Set \f[I]quiet\f[] and \f[I]no_warnings\f[] in
 \f[I]downloader.ytdl.raw-options\f[] to \f[I]true\f[] to suppress all output.
 
 
+.SS downloader.ytdl.module
+.IP "Type:" 6
+\f[I]string\f[]
+
+.IP "Default:" 9
+\f[I]"youtube_dl"\f[]
+
+.IP "Description:" 4
+Name of the youtube-dl Python module to import.
+
+
 .SS downloader.ytdl.outtmpl
 .IP "Type:" 6
 \f[I]string\f[]
@@ -2687,24 +2751,6 @@ Set this option to \f[I]null\f[] or an invalid path to disable
 this cache.
 
 
-.SS ciphers
-.IP "Type:" 6
-\f[I]bool\f[] or \f[I]string\f[]
-
-.IP "Default:" 9
-\f[I]true\f[]
-
-.IP "Description:" 4
-.br
-* \f[I]true\f[]: Update urllib3's default cipher list
-.br
-* \f[I]false\f[]: Leave the default cipher list as is
-.br
-* Any \f[I]string\f[]: Replace urllib3's default ciphers with these
-(See \f[I]SSLContext.set_ciphers()\f[]
-for details)
-
-
 .SS pyopenssl
 .IP "Type:" 6
 \f[I]bool\f[]