4 files changed, 82 insertions, 29 deletions
diff --git a/data/completion/_gallery-dl b/data/completion/_gallery-dl
index 22a5f25..2ac93f7 100644
--- a/data/completion/_gallery-dl
+++ b/data/completion/_gallery-dl
@@ -7,8 +7,10 @@ local rc=1
 _arguments -C -S \
 {-h,--help}'[Print this help message and exit]' \
 --version'[Print program version and exit]' \
-{-d,--dest}'[Destination directory]':'<dest>':_files \
+--dest'[==SUPPRESS==]':'<dest>':_files \
 {-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,--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>' \
@@ -28,7 +30,9 @@ _arguments -C -S \
 {-r,--limit-rate}'[Maximum download rate (e.g. 500k or 2.5M)]':'<rate>' \
 {-R,--retries}'[Maximum number of retries for failed HTTP requests or -1 for infinite retries (default: 4)]':'<n>' \
 --http-timeout'[Timeout for HTTP connections (default: 30.0)]':'<seconds>' \
---sleep'[Number of seconds to sleep before each download]':'<seconds>' \
+--sleep'[Number of seconds to wait before each download. This can be either a constant value or a range (e.g. 2.7 or 2.0-3.5)]':'<seconds>' \
+--sleep-request'[Number of seconds to wait between HTTP requests during data extraction]':'<seconds>' \
+--sleep-extractor'[Number of seconds to wait before starting data extraction for an input URL]':'<seconds>' \
 --filesize-min'[Do not download files smaller than SIZE (e.g. 500k or 2.5M)]':'<size>' \
 --filesize-max'[Do not download files larger than SIZE (e.g. 500k or 2.5M)]':'<size>' \
 --no-part'[Do not use .part files]' \
@@ -54,7 +58,8 @@ _arguments -C -S \
 --ugoira-conv'[Convert Pixiv Ugoira to WebM (requires FFmpeg)]' \
 --ugoira-conv-lossless'[Convert Pixiv Ugoira to WebM in VP9 lossless mode]' \
 --write-metadata'[Write metadata to separate JSON files]' \
---write-infojson'[Write gallery metadata to a info.json file]' \
+--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]' \
 --exec'[Execute CMD for each downloaded file. Example: --exec "convert {} {}.png && rm {}"]':'<cmd>' \
diff --git a/data/completion/gallery-dl b/data/completion/gallery-dl
index c2ef896..4085bb9 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}" =~ ^(-d|--dest)$ ]]; then
+    elif [[ "${prev}" =~ ^(--dest)$ ]]; then
         COMPREPLY=( $(compgen -d -- "${cur}") )
     else
-        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 --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 --abort --terminate --range --chapter-range --filter --chapter-filter --zip --ugoira-conv --ugoira-conv-lossless --write-metadata --write-infojson --write-tags --mtime-from-date --exec --exec-after --postprocessor" -- "${cur}") )
+        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}") )
     fi
 }
 
diff --git a/data/man/gallery-dl.1 b/data/man/gallery-dl.1
index e7741ef..a7f51a7 100644
--- a/data/man/gallery-dl.1
+++ b/data/man/gallery-dl.1
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL" "1" "2021-11-27" "1.19.3" "gallery-dl Manual"
+.TH "GALLERY-DL" "1" "2021-12-29" "1.20.0" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 
@@ -23,12 +23,15 @@ Print this help message and exit
 .B "\-\-version" 
 Print program version and exit
 .TP
-.B "\-d, \-\-dest" \f[I]DEST\f[]
-Destination directory
-.TP
 .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 "\-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
@@ -87,7 +90,13 @@ Maximum number of retries for failed HTTP requests or -1 for infinite retries (d
 Timeout for HTTP connections (default: 30.0)
 .TP
 .B "\-\-sleep" \f[I]SECONDS\f[]
-Number of seconds to sleep before each download
+Number of seconds to wait before each download. This can be either a constant value or a range (e.g. 2.7 or 2.0-3.5)
+.TP
+.B "\-\-sleep\-request" \f[I]SECONDS\f[]
+Number of seconds to wait between HTTP requests during data extraction
+.TP
+.B "\-\-sleep\-extractor" \f[I]SECONDS\f[]
+Number of seconds to wait before starting data extraction for an input URL
 .TP
 .B "\-\-filesize\-min" \f[I]SIZE\f[]
 Do not download files smaller than SIZE (e.g. 500k or 2.5M)
@@ -161,7 +170,7 @@ Convert Pixiv Ugoira to WebM in VP9 lossless mode
 .B "\-\-write\-metadata" 
 Write metadata to separate JSON files
 .TP
-.B "\-\-write\-infojson" 
+.B "\-\-write\-info\-json" 
 Write gallery metadata to a info.json file
 .TP
 .B "\-\-write\-tags" 
diff --git a/data/man/gallery-dl.conf.5 b/data/man/gallery-dl.conf.5
index 09d2820..a574625 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-11-27" "1.19.3" "gallery-dl Manual"
+.TH "GALLERY-DL.CONF" "5" "2021-12-29" "1.20.0" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -1235,18 +1235,6 @@ or whenever your \f[I]cache file\f[] is deleted or cleared.
 Minimum wait time in seconds before API requests.
 
 
-.SS extractor.exhentai.limits
-.IP "Type:" 6
-\f[I]integer\f[]
-
-.IP "Default:" 9
-\f[I]null\f[]
-
-.IP "Description:" 4
-Sets a custom image download limit and
-stops extraction when it gets exceeded.
-
-
 .SS extractor.exhentai.domain
 .IP "Type:" 6
 \f[I]string\f[]
@@ -1264,6 +1252,18 @@ depending on the input URL
 * \f[I]"exhentai.org"\f[]: Use \f[I]exhentai.org\f[] for all URLs
 
 
+.SS extractor.exhentai.limits
+.IP "Type:" 6
+\f[I]integer\f[]
+
+.IP "Default:" 9
+\f[I]null\f[]
+
+.IP "Description:" 4
+Sets a custom image download limit and
+stops extraction when it gets exceeded.
+
+
 .SS extractor.exhentai.metadata
 .IP "Type:" 6
 \f[I]bool\f[]
@@ -1290,6 +1290,20 @@ Makes \f[I]date\f[] and \f[I]filesize\f[] more precise.
 Download full-sized original images if available.
 
 
+.SS extractor.exhentai.source
+.IP "Type:" 6
+\f[I]string\f[]
+
+.IP "Default:" 9
+\f[I]"gallery"\f[]
+
+.IP "Description:" 4
+Selects an alternative source to download files from.
+
+.br
+* \f[I]"hitomi"\f[]:  Download the corresponding gallery from \f[I]hitomi.la\f[]
+
+
 .SS extractor.fanbox.embeds
 .IP "Type:" 6
 \f[I]bool\f[] or \f[I]string\f[]
@@ -1399,6 +1413,18 @@ Possible values are
 You can use \f[I]"all"\f[] instead of listing all values separately.
 
 
+.SS extractor.generic.enabled
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]false\f[]
+
+.IP "Description:" 4
+Match **all** URLs not otherwise supported by gallery-dl,
+even ones without a \f[I]generic:\f[] prefix.
+
+
 .SS extractor.gfycat.format
 .IP "Type:" 6
 .br
@@ -1446,7 +1472,7 @@ You can use \f[I]"all"\f[] instead of listing all values separately.
 \f[I]bool\f[]
 
 .IP "Default:" 9
-\f[I]true\f[]
+\f[I]false\f[]
 
 .IP "Description:" 4
 Try to extract
@@ -1545,7 +1571,7 @@ Extract a user's direct messages as \f[I]dms\f[] metadata.
 \f[I]list\f[] of \f[I]strings\f[]
 
 .IP "Default:" 9
-\f[I]["file", "attachments", "inline"]\f[]
+\f[I]["attachments", "file", "inline"]\f[]
 
 .IP "Description:" 4
 Determines the type and order of files to be downloaded.
@@ -2287,7 +2313,7 @@ Fetch media from all Tweets and replies in a \f[I]conversation
 \f[I]list\f[] of \f[I]strings\f[]
 
 .IP "Default:" 9
-\f[I]["orig", "large", "medium", "small"]\f[]
+\f[I]["orig", "4096x4096", "large", "medium", "small"]\f[]
 
 .IP "Description:" 4
 The image version to download.
@@ -2566,11 +2592,14 @@ Note: Set \f[I]quiet\f[] and \f[I]no_warnings\f[] in
 \f[I]string\f[]
 
 .IP "Default:" 9
-\f[I]"youtube_dl"\f[]
+\f[I]null\f[]
 
 .IP "Description:" 4
 Name of the youtube-dl Python module to import.
 
+Setting this to \f[I]null\f[] will try to import \f[I]"yt_dlp"\f[]
+followed by \f[I]"youtube_dl"\f[] as fallback.
+
 
 .SS extractor.ytdl.raw-options
 .IP "Type:" 6
@@ -2885,11 +2914,14 @@ Note: Set \f[I]quiet\f[] and \f[I]no_warnings\f[] in
 \f[I]string\f[]
 
 .IP "Default:" 9
-\f[I]"youtube_dl"\f[]
+\f[I]null\f[]
 
 .IP "Description:" 4
 Name of the youtube-dl Python module to import.
 
+Setting this to \f[I]null\f[] will first try to import \f[I]"yt_dlp"\f[]
+and use \f[I]"youtube_dl"\f[] as fallback.
+
 
 .SS downloader.ytdl.outtmpl
 .IP "Type:" 6
@@ -3736,12 +3768,16 @@ A \f[I]Date\f[] value represents a specific point in time.
 * \f[I]float\f[]
 .br
 * \f[I]list\f[] with 2 \f[I]floats\f[]
+.br
+* \f[I]string\f[]
 
 .IP "Example:" 4
 .br
 * 2.85
 .br
 * [1.5, 3.0]
+.br
+* "2.85", "1.5-3.0"
 
 .IP "Description:" 4
 A \f[I]Duration\f[] represents a span of time in seconds.
@@ -3752,6 +3788,9 @@ A \f[I]Duration\f[] represents a span of time in seconds.
 * If given as a \f[I]list\f[] with 2 floating-point numbers \f[I]a\f[] & \f[I]b\f[] ,
 it will be randomly chosen with uniform distribution such that \f[I]a <= N <=b\f[].
 (see \f[I]random.uniform()\f[])
+.br
+* If given as a \f[I]string\f[], it can either represent a single \f[I]float\f[]
+value (\f[I]"2.85"\f[]) or a range  (\f[I]"1.5-3.0"\f[]).
 
 
 .SS Path