New upstream version 1.16.0.upstream/1.16.0

2 files changed, 59 insertions, 30 deletions

diff --git a/data/man/gallery-dl.1 b/data/man/gallery-dl.1
index 114502a..af6eaf3 100644
--- a/data/man/gallery-dl.1
+++ b/data/man/gallery-dl.1
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL" "1" "2020-11-27" "1.15.4" "gallery-dl Manual"
+.TH "GALLERY-DL" "1" "2020-12-12" "1.16.0" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 
diff --git a/data/man/gallery-dl.conf.5 b/data/man/gallery-dl.conf.5
index 34ac377..8c291fb 100644
--- a/data/man/gallery-dl.conf.5
+++ b/data/man/gallery-dl.conf.5
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL.CONF" "5" "2020-11-27" "1.15.4" "gallery-dl Manual"
+.TH "GALLERY-DL.CONF" "5" "2020-12-12" "1.16.0" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -222,9 +222,6 @@ escaped with backslashes, e.g. \f[I]"\\\\[\\\\]"\f[]
 \f[I]object\f[]
 
 .IP "Default:" 9
-\f[I]null\f[]
-
-.IP "Example:" 4
 .. code:: json
 
 {
@@ -236,7 +233,7 @@ escaped with backslashes, e.g. \f[I]"\\\\[\\\\]"\f[]
 }
 
 .IP "Description:" 4
-A JSON \f[I]object\f[] mapping filename extensions to alternatives.
+A JSON \f[I]object\f[] mapping filename extensions to their replacements.
 
 
 .SS extractor.*.skip
@@ -349,8 +346,6 @@ and optional for
 .br
 * \f[I]pinterest\f[]
 .br
-* \f[I]sankaku\f[]
-.br
 * \f[I]subscribestar\f[]
 .br
 * \f[I]tsumino\f[]
@@ -1537,21 +1532,6 @@ and \f[I]"gif"\f[] (in that order) will be tried instead, until an
 available format is found.
 
 
-.SS extractor.sankaku.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 each image
-
-Sankaku Channel responds with \f[I]429 Too Many Requests\f[] if it
-receives too many HTTP requests in a certain amount of time.
-Waiting a few seconds between each request tries to prevent that.
-
-
 .SS extractor.sankakucomplex.embeds
 .IP "Type:" 6
 \f[I]bool\f[]
@@ -2243,7 +2223,7 @@ The command to run.
 * If this is a \f[I]string\f[], it will be executed using the system's
 shell, e.g. \f[I]/bin/sh\f[]. Any \f[I]{}\f[] will be replaced
 with the full path of a file or target directory, depending on
-\f[I]exec.final\f[]
+\f[I]exec.event\f[]
 
 .br
 * If this is a \f[I]list\f[], the first element specifies the program
@@ -2253,17 +2233,17 @@ the files' metadata as well as \f[I]{_path}\f[], \f[I]{_directory}\f[],
 and \f[I]{_filename}\f[].
 
 
-.SS exec.final
+.SS exec.event
 .IP "Type:" 6
-\f[I]bool\f[]
+\f[I]string\f[]
 
 .IP "Default:" 9
-\f[I]false\f[]
+\f[I]"after"\f[]
 
 .IP "Description:" 4
-Controls whether to execute \f[I]exec.command\f[] for each
-downloaded file or only once after all files
-have been downloaded successfully.
+The event for which \f[I]exec.command\f[] is run.
+
+See \f[I]metadata.event\f[] for a list of available events.
 
 
 .SS metadata.mode
@@ -2286,6 +2266,24 @@ Select how to write metadata.
 to a file's metadata dictionary
 
 
+.SS metadata.filename
+.IP "Type:" 6
+\f[I]string\f[]
+
+.IP "Default:" 9
+\f[I]null\f[]
+
+.IP "Example:" 4
+"{id}.data.json"
+
+.IP "Description:" 4
+A \f[I]format string\f[] to build the filenames for metadata files with.
+(see \f[I]extractor.filename\f[])
+
+If this option is set, \f[I]metadata.extension\f[] and
+\f[I]metadata.extension-format\f[] will be ignored.
+
+
 .SS metadata.directory
 .IP "Type:" 6
 \f[I]string\f[]
@@ -2330,6 +2328,37 @@ files with, which will replace the original filename extensions.
 Note: \f[I]metadata.extension\f[] is ignored if this option is set.
 
 
+.SS metadata.event
+.IP "Type:" 6
+\f[I]string\f[]
+
+.IP "Default:" 9
+\f[I]"file"\f[]
+
+.IP "Description:" 4
+The event for which metadata gets written to a file.
+
+The available events are:
+
+\f[I]init\f[]
+After post procesor initialization
+and before the first file download
+\f[I]finalize\f[]
+On extractor shutdown, e.g. after all files were downloaded
+\f[I]prepare\f[]
+Before a file download
+\f[I]file\f[]
+When completing a file download,
+but before it gets moved to its target location
+\f[I]after\f[]
+After a file got moved to its target location
+\f[I]skip\f[]
+When skipping a file download
+\f[I]post\f[]
+When starting to download all files of a post,
+e.g. a Tweet on Twitter or a post on Patreon.
+
+
 .SS metadata.content-format
 .IP "Type:" 6
 \f[I]string\f[] or \f[I]list\f[] of \f[I]strings\f[]