New upstream version 1.20.1.upstream/1.20.1

4 files changed, 25 insertions, 10 deletions

diff --git a/data/completion/_gallery-dl b/data/completion/_gallery-dl
index 2ac93f7..6b3ac6d 100644
--- a/data/completion/_gallery-dl
+++ b/data/completion/_gallery-dl
@@ -7,10 +7,10 @@ local rc=1
 _arguments -C -S \
 {-h,--help}'[Print this help message and exit]' \
 --version'[Print program version and exit]' \
---dest'[==SUPPRESS==]':'<dest>':_files \
 {-i,--input-file}'[Download URLs found in FILE ("-" for stdin). More than one --input-file can be specified]':'<file>':_files \
+{-d,--destination}'[Target location for file downloads]':'<path>' \
+{-D,--directory}'[Exact location for file downloads]':'<path>' \
 {-f,--filename}'[Filename format string for downloaded files ("/O" for "original" filenames)]':'<format>' \
-{-d,--directory}'[Target location for file downloads]':'<path>' \
 --cookies'[File to load additional cookies from]':'<file>':_files \
 --proxy'[Use the specified proxy]':'<url>' \
 --clear-cache'[Delete cached login sessions, cookies, etc. for MODULE (ALL to delete everything)]':'<module>' \
diff --git a/data/completion/gallery-dl b/data/completion/gallery-dl
index 4085bb9..ac64645 100644
--- a/data/completion/gallery-dl
+++ b/data/completion/gallery-dl
@@ -7,10 +7,10 @@ _gallery_dl()
 
     if [[ "${prev}" =~ ^(-i|--input-file|--cookies|--write-log|--write-unsupported|-c|--config|--config-yaml|--download-archive)$ ]]; then
         COMPREPLY=( $(compgen -f -- "${cur}") )
-    elif [[ "${prev}" =~ ^(--dest)$ ]]; then
+    elif [[ "${prev}" =~ ^()$ ]]; then
         COMPREPLY=( $(compgen -d -- "${cur}") )
     else
-        COMPREPLY=( $(compgen -W "--help --version --dest --input-file --filename --directory --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 --http-timeout --sleep --sleep-request --sleep-extractor --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 --abort --terminate --range --chapter-range --filter --chapter-filter --zip --ugoira-conv --ugoira-conv-lossless --write-metadata --write-info-json --write-infojson --write-tags --mtime-from-date --exec --exec-after --postprocessor" -- "${cur}") )
+        COMPREPLY=( $(compgen -W "--help --version --input-file --destination --directory --filename --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 --http-timeout --sleep --sleep-request --sleep-extractor --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 --abort --terminate --range --chapter-range --filter --chapter-filter --zip --ugoira-conv --ugoira-conv-lossless --write-metadata --write-info-json --write-infojson --write-tags --mtime-from-date --exec --exec-after --postprocessor" -- "${cur}") )
     fi
 }
 
diff --git a/data/man/gallery-dl.1 b/data/man/gallery-dl.1
index a7f51a7..992d0a6 100644
--- a/data/man/gallery-dl.1
+++ b/data/man/gallery-dl.1
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL" "1" "2021-12-29" "1.20.0" "gallery-dl Manual"
+.TH "GALLERY-DL" "1" "2022-01-08" "1.20.1" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 
@@ -26,12 +26,15 @@ Print program version and exit
 .B "\-i, \-\-input\-file" \f[I]FILE\f[]
 Download URLs found in FILE ('-' for stdin). More than one --input-file can be specified
 .TP
+.B "\-d, \-\-destination" \f[I]PATH\f[]
+Target location for file downloads
+.TP
+.B "\-D, \-\-directory" \f[I]PATH\f[]
+Exact location for file downloads
+.TP
 .B "\-f, \-\-filename" \f[I]FORMAT\f[]
 Filename format string for downloaded files ('/O' for "original" filenames)
 .TP
-.B "\-d, \-\-directory" \f[I]PATH\f[]
-Target location for file downloads
-.TP
 .B "\-\-cookies" \f[I]FILE\f[]
 File to load additional cookies from
 .TP
diff --git a/data/man/gallery-dl.conf.5 b/data/man/gallery-dl.conf.5
index a574625..a62575b 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-12-29" "1.20.0" "gallery-dl Manual"
+.TH "GALLERY-DL.CONF" "5" "2022-01-08" "1.20.1" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -649,11 +649,23 @@ config options.
 .IP "Default:" 9
 \f[I]["oauth", "recursive", "test"]\f[] + current extractor category
 
+.IP "Example:" 4
+["imgur", "gfycat:user", "*:image"]
+
 .IP "Description:" 4
-A list of extractor categories to ignore (or allow)
+A list of extractor identifiers to ignore (or allow)
 when spawning child extractors for unknown URLs,
 e.g. from \f[I]reddit\f[] or \f[I]plurk\f[].
 
+Each identifier can be
+
+.br
+* A category or basecategory name (\f[I]"imgur"\f[], \f[I]"mastodon"\f[])
+.br
+* | A (base)category-subcategory pair, where both names are separated by a colon (\f[I]"gfycat:user"\f[]).
+Both names can be a * or left empty, matching all possible names (\f[I]"*:image"\f[], \f[I]":user"\f[]).
+.br
+
 Note: Any \f[I]blacklist\f[] setting will automatically include
 \f[I]"oauth"\f[], \f[I]"recursive"\f[], and \f[I]"test"\f[].