3 files changed, 30 insertions, 20 deletions
diff --git a/data/completion/_gallery-dl b/data/completion/_gallery-dl
index c1425bb..f3b17a2 100644
--- a/data/completion/_gallery-dl
+++ b/data/completion/_gallery-dl
@@ -7,7 +7,6 @@ local rc=1
 _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>' \
@@ -16,6 +15,9 @@ _arguments -C -S \
 --source-address'[Client-side IP address to bind to]':'<ip>' \
 --user-agent'[User-Agent request header]':'<ua>' \
 --clear-cache'[Delete cached login sessions, cookies, etc. for MODULE (ALL to delete everything)]':'<module>' \
+{-i,--input-file}'[Download URLs found in FILE ("-" for stdin). More than one --input-file can be specified]':'<file>':_files \
+{-I,--input-file-comment}'[Download URLs found in FILE. Comment them out after they were downloaded successfully.]':'<file>':_files \
+{-x,--input-file-delete}'[Download URLs found in FILE. Delete them after they were downloaded successfully.]':'<file>':_files \
 {-q,--quiet}'[Activate quiet mode]' \
 {-v,--verbose}'[Print various debugging information]' \
 {-g,--get-urls}'[Print URLs instead of downloading]' \
@@ -64,18 +66,21 @@ _arguments -C -S \
 --chapter-range'[Like "--range", but applies to manga chapters and other delegated URLs]':'<range>' \
 --filter'[Python expression controlling which files to download. Files for which the expression evaluates to False are ignored. Available keys are the filename-specific ones listed by "-K". Example: --filter "image_width >= 1000 and rating in ("s", "q")"]':'<expr>' \
 --chapter-filter'[Like "--filter", but applies to manga chapters and other delegated URLs]':'<expr>' \
---zip'[Store downloaded files in a ZIP archive]' \
---ugoira-conv'[Convert Pixiv Ugoira to WebM (requires FFmpeg)]' \
---ugoira-conv-lossless'[Convert Pixiv Ugoira to WebM in VP9 lossless mode]' \
---ugoira-conv-copy'[Convert Pixiv Ugoira to MKV without re-encoding any frames]' \
+{-P,--postprocessor}'[Activate the specified post processor]':'<name>' \
+{-O,--postprocessor-option}'[Additional post processor options]':'<key=value>' \
 --write-metadata'[Write metadata to separate JSON files]' \
 --write-info-json'[Write gallery metadata to a info.json file]' \
 --write-infojson'[==SUPPRESS==]' \
 --write-tags'[Write image tags to separate text files]' \
---mtime-from-date'[Set file modification times according to "date" metadata]' \
+--zip'[Store downloaded files in a ZIP archive]' \
+--cbz'[Store downloaded files in a CBZ archive]' \
+--mtime'[Set file modification times according to metadata selected by NAME. Examples: "date" or "status[date]"]':'<name>' \
+--mtime-from-date'[==SUPPRESS==]' \
+--ugoira'[Convert Pixiv Ugoira to FORMAT using FFmpeg. Supported formats are "webm", "mp4", "gif", "vp8", "vp9", "vp9-lossless", "copy".]':'<format>' \
+--ugoira-conv'[==SUPPRESS==]' \
+--ugoira-conv-lossless'[==SUPPRESS==]' \
+--ugoira-conv-copy'[==SUPPRESS==]' \
 --exec'[Execute CMD for each downloaded file. Supported replacement fields are {} or {_path}, {_directory}, {_filename}. Example: --exec "convert {} {}.png && rm {}"]':'<cmd>' \
---exec-after'[Execute CMD after all files were downloaded successfully. Example: --exec-after "cd {_directory} && convert * ../doc.pdf"]':'<cmd>' \
-{-P,--postprocessor}'[Activate the specified post processor]':'<name>' \
-{-O,--postprocessor-option}'[Additional "<key>=<value>" post processor options]':'<opt>' && rc=0
+--exec-after'[Execute CMD after all files were downloaded. Example: --exec-after "cd {_directory} && convert * ../doc.pdf"]':'<cmd>' && rc=0
 
 return rc
diff --git a/data/completion/gallery-dl b/data/completion/gallery-dl
index 02fc847..e5bc6c1 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|--write-log|--write-unsupported|-c|--config|--config-yaml|--config-toml|-C|--cookies|--cookies-export|--download-archive)$ ]]; then
+    if [[ "${prev}" =~ ^(-i|--input-file|-I|--input-file-comment|-x|--input-file-delete|--write-log|--write-unsupported|-c|--config|--config-yaml|--config-toml|-C|--cookies|--cookies-export|--download-archive)$ ]]; then
         COMPREPLY=( $(compgen -f -- "${cur}") )
     elif [[ "${prev}" =~ ^()$ ]]; then
         COMPREPLY=( $(compgen -d -- "${cur}") )
     else
-        COMPREPLY=( $(compgen -W "--help --version --input-file --filename --destination --directory --extractors --proxy --source-address --user-agent --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 --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 --cookies --cookies-export --cookies-from-browser --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 --filename --destination --directory --extractors --proxy --source-address --user-agent --clear-cache --input-file --input-file-comment --input-file-delete --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 --cookies --cookies-export --cookies-from-browser --download-archive --abort --terminate --range --chapter-range --filter --chapter-filter --postprocessor --postprocessor-option --write-metadata --write-info-json --write-infojson --write-tags --zip --cbz --mtime --mtime-from-date --ugoira --ugoira-conv --ugoira-conv-lossless --ugoira-conv-copy --exec --exec-after" -- "${cur}") )
     fi
 }
 
diff --git a/data/completion/gallery-dl.fish b/data/completion/gallery-dl.fish
index 593ab89..5cb60d4 100644
--- a/data/completion/gallery-dl.fish
+++ b/data/completion/gallery-dl.fish
@@ -1,7 +1,6 @@
 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'
@@ -10,6 +9,9 @@ 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'
 complete -c gallery-dl -x -l 'clear-cache' -d 'Delete cached login sessions, cookies, etc. for MODULE (ALL to delete everything)'
+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 -r -F -s 'I' -l 'input-file-comment' -d 'Download URLs found in FILE. Comment them out after they were downloaded successfully.'
+complete -c gallery-dl -r -F -s 'x' -l 'input-file-delete' -d 'Download URLs found in FILE. Delete them after they were downloaded successfully.'
 complete -c gallery-dl -s 'q' -l 'quiet' -d 'Activate quiet mode'
 complete -c gallery-dl -s 'v' -l 'verbose' -d 'Print various debugging information'
 complete -c gallery-dl -s 'g' -l 'get-urls' -d 'Print URLs instead of downloading'
@@ -58,16 +60,19 @@ complete -c gallery-dl -x -l 'range' -d 'Index range(s) specifying which files t
 complete -c gallery-dl -x -l 'chapter-range' -d 'Like "--range", but applies to manga chapters and other delegated URLs'
 complete -c gallery-dl -x -l 'filter' -d 'Python expression controlling which files to download. Files for which the expression evaluates to False are ignored. Available keys are the filename-specific ones listed by "-K". Example: --filter "image_width >= 1000 and rating in ("s", "q")"'
 complete -c gallery-dl -x -l 'chapter-filter' -d 'Like "--filter", but applies to manga chapters and other delegated URLs'
-complete -c gallery-dl -l 'zip' -d 'Store downloaded files in a ZIP archive'
-complete -c gallery-dl -l 'ugoira-conv' -d 'Convert Pixiv Ugoira to WebM (requires FFmpeg)'
-complete -c gallery-dl -l 'ugoira-conv-lossless' -d 'Convert Pixiv Ugoira to WebM in VP9 lossless mode'
-complete -c gallery-dl -l 'ugoira-conv-copy' -d 'Convert Pixiv Ugoira to MKV without re-encoding any frames'
+complete -c gallery-dl -x -s 'P' -l 'postprocessor' -d 'Activate the specified post processor'
+complete -c gallery-dl -x -s 'O' -l 'postprocessor-option' -d 'Additional post processor options'
 complete -c gallery-dl -l 'write-metadata' -d 'Write metadata to separate JSON files'
 complete -c gallery-dl -l 'write-info-json' -d 'Write gallery metadata to a info.json file'
 complete -c gallery-dl -l 'write-infojson' -d '==SUPPRESS=='
 complete -c gallery-dl -l 'write-tags' -d 'Write image tags to separate text files'
-complete -c gallery-dl -l 'mtime-from-date' -d 'Set file modification times according to "date" metadata'
+complete -c gallery-dl -l 'zip' -d 'Store downloaded files in a ZIP archive'
+complete -c gallery-dl -l 'cbz' -d 'Store downloaded files in a CBZ archive'
+complete -c gallery-dl -x -l 'mtime' -d 'Set file modification times according to metadata selected by NAME. Examples: "date" or "status[date]"'
+complete -c gallery-dl -l 'mtime-from-date' -d '==SUPPRESS=='
+complete -c gallery-dl -x -l 'ugoira' -d 'Convert Pixiv Ugoira to FORMAT using FFmpeg. Supported formats are "webm", "mp4", "gif", "vp8", "vp9", "vp9-lossless", "copy".'
+complete -c gallery-dl -l 'ugoira-conv' -d '==SUPPRESS=='
+complete -c gallery-dl -l 'ugoira-conv-lossless' -d '==SUPPRESS=='
+complete -c gallery-dl -l 'ugoira-conv-copy' -d '==SUPPRESS=='
 complete -c gallery-dl -x -l 'exec' -d 'Execute CMD for each downloaded file. Supported replacement fields are {} or {_path}, {_directory}, {_filename}. Example: --exec "convert {} {}.png && rm {}"'
-complete -c gallery-dl -x -l 'exec-after' -d 'Execute CMD after all files were downloaded successfully. Example: --exec-after "cd {_directory} && convert * ../doc.pdf"'
-complete -c gallery-dl -x -s 'P' -l 'postprocessor' -d 'Activate the specified post processor'
-complete -c gallery-dl -x -s 'O' -l 'postprocessor-option' -d 'Additional "<key>=<value>" post processor options'
+complete -c gallery-dl -x -l 'exec-after' -d 'Execute CMD after all files were downloaded. Example: --exec-after "cd {_directory} && convert * ../doc.pdf"'