New upstream version 1.25.0.upstream/1.25.0

3 files changed, 18 insertions, 10 deletions

diff --git a/data/completion/_gallery-dl b/data/completion/_gallery-dl
index 06e8556..a82db8a 100644
--- a/data/completion/_gallery-dl
+++ b/data/completion/_gallery-dl
@@ -8,9 +8,10 @@ _arguments -C -S \
 {-h,--help}'[Print this help message and exit]' \
 --version'[Print program version and exit]' \
 {-i,--input-file}'[Download URLs found in FILE ("-" for stdin). More than one --input-file can be specified]':'<file>':_files \
+{-f,--filename}'[Filename format string for downloaded files ("/O" for "original" filenames)]':'<format>' \
 {-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>' \
+{-X,--extractors}'[Load external extractors from PATH]':'<path>' \
 --proxy'[Use the specified proxy]':'<url>' \
 --source-address'[Client-side IP address to bind to]':'<ip>' \
 --user-agent'[User-Agent request header]':'<ua>' \
@@ -45,10 +46,13 @@ _arguments -C -S \
 --no-download'[Do not download any files]' \
 --no-postprocessors'[Do not run any post processors]' \
 --no-check-certificate'[Disable HTTPS certificate validation]' \
+{-o,--option}'[Additional options. Example: -o browser=firefox]':'<key=value>' \
 {-c,--config}'[Additional configuration files]':'<file>':_files \
---config-yaml'[==SUPPRESS==]':'<file>':_files \
-{-o,--option}'[Additional "<key>=<value>" option values]':'<opt>' \
---ignore-config'[Do not read default configuration files]' \
+--config-yaml'[Additional configuration files in YAML format]':'<file>':_files \
+--config-toml'[Additional configuration files in TOML format]':'<file>':_files \
+--config-create'[Create a basic configuration file]' \
+--config-ignore'[Do not read default configuration files]' \
+--ignore-config'[==SUPPRESS==]' \
 {-u,--username}'[Username to login with]':'<user>' \
 {-p,--password}'[Password belonging to the given username]':'<pass>' \
 --netrc'[Enable .netrc authentication data]' \
diff --git a/data/completion/gallery-dl b/data/completion/gallery-dl
index 203c87d..1750af8 100644
--- a/data/completion/gallery-dl
+++ b/data/completion/gallery-dl
@@ -5,12 +5,12 @@ _gallery_dl()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-    if [[ "${prev}" =~ ^(-i|--input-file|--cookies|--write-log|--write-unsupported|-c|--config|--config-yaml|--download-archive)$ ]]; then
+    if [[ "${prev}" =~ ^(-i|--input-file|--cookies|--write-log|--write-unsupported|-c|--config|--config-yaml|--config-toml|--download-archive)$ ]]; then
         COMPREPLY=( $(compgen -f -- "${cur}") )
     elif [[ "${prev}" =~ ^()$ ]]; then
         COMPREPLY=( $(compgen -d -- "${cur}") )
     else
-        COMPREPLY=( $(compgen -W "--help --version --input-file --destination --directory --filename --proxy --source-address --user-agent --clear-cache --cookies --cookies-from-browser --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 --chunk-size --no-part --no-skip --no-mtime --no-download --no-postprocessors --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 --ugoira-conv-copy --write-metadata --write-info-json --write-infojson --write-tags --mtime-from-date --exec --exec-after --postprocessor --postprocessor-option" -- "${cur}") )
+        COMPREPLY=( $(compgen -W "--help --version --input-file --filename --destination --directory --extractors --proxy --source-address --user-agent --clear-cache --cookies --cookies-from-browser --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 --chunk-size --no-part --no-skip --no-mtime --no-download --no-postprocessors --no-check-certificate --option --config --config-yaml --config-toml --config-create --config-ignore --ignore-config --username --password --netrc --download-archive --abort --terminate --range --chapter-range --filter --chapter-filter --zip --ugoira-conv --ugoira-conv-lossless --ugoira-conv-copy --write-metadata --write-info-json --write-infojson --write-tags --mtime-from-date --exec --exec-after --postprocessor --postprocessor-option" -- "${cur}") )
     fi
 }
 
diff --git a/data/completion/gallery-dl.fish b/data/completion/gallery-dl.fish
index e2a7e6d..d764543 100644
--- a/data/completion/gallery-dl.fish
+++ b/data/completion/gallery-dl.fish
@@ -2,9 +2,10 @@ complete -c gallery-dl -x
 complete -c gallery-dl -s 'h' -l 'help' -d 'Print this help message and exit'
 complete -c gallery-dl -l 'version' -d 'Print program version and exit'
 complete -c gallery-dl -r -F -s 'i' -l 'input-file' -d 'Download URLs found in FILE ("-" for stdin). More than one --input-file can be specified'
+complete -c gallery-dl -x -s 'f' -l 'filename' -d 'Filename format string for downloaded files ("/O" for "original" filenames)'
 complete -c gallery-dl -x -a '(__fish_complete_directories)' -s 'd' -l 'destination' -d 'Target location for file downloads'
 complete -c gallery-dl -x -a '(__fish_complete_directories)' -s 'D' -l 'directory' -d 'Exact location for file downloads'
-complete -c gallery-dl -x -s 'f' -l 'filename' -d 'Filename format string for downloaded files ("/O" for "original" filenames)'
+complete -c gallery-dl -x -a '(__fish_complete_directories)' -s 'X' -l 'extractors' -d 'Load external extractors from PATH'
 complete -c gallery-dl -x -l 'proxy' -d 'Use the specified proxy'
 complete -c gallery-dl -x -l 'source-address' -d 'Client-side IP address to bind to'
 complete -c gallery-dl -x -l 'user-agent' -d 'User-Agent request header'
@@ -39,10 +40,13 @@ complete -c gallery-dl -l 'no-mtime' -d 'Do not set file modification times acco
 complete -c gallery-dl -l 'no-download' -d 'Do not download any files'
 complete -c gallery-dl -l 'no-postprocessors' -d 'Do not run any post processors'
 complete -c gallery-dl -l 'no-check-certificate' -d 'Disable HTTPS certificate validation'
+complete -c gallery-dl -x -s 'o' -l 'option' -d 'Additional options. Example: -o browser=firefox'
 complete -c gallery-dl -r -F -s 'c' -l 'config' -d 'Additional configuration files'
-complete -c gallery-dl -r -F -l 'config-yaml' -d '==SUPPRESS=='
-complete -c gallery-dl -x -s 'o' -l 'option' -d 'Additional "<key>=<value>" option values'
-complete -c gallery-dl -l 'ignore-config' -d 'Do not read default configuration files'
+complete -c gallery-dl -r -F -l 'config-yaml' -d 'Additional configuration files in YAML format'
+complete -c gallery-dl -r -F -l 'config-toml' -d 'Additional configuration files in TOML format'
+complete -c gallery-dl -l 'config-create' -d 'Create a basic configuration file'
+complete -c gallery-dl -l 'config-ignore' -d 'Do not read default configuration files'
+complete -c gallery-dl -l 'ignore-config' -d '==SUPPRESS=='
 complete -c gallery-dl -x -s 'u' -l 'username' -d 'Username to login with'
 complete -c gallery-dl -x -s 'p' -l 'password' -d 'Password belonging to the given username'
 complete -c gallery-dl -l 'netrc' -d 'Enable .netrc authentication data'