New upstream version 1.15.3.upstream/1.15.3

2 files changed, 67 insertions, 4 deletions

diff --git a/data/man/gallery-dl.1 b/data/man/gallery-dl.1
index 9df67f4..a913c47 100644
--- a/data/man/gallery-dl.1
+++ b/data/man/gallery-dl.1
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL" "1" "2020-10-24" "1.15.2" "gallery-dl Manual"
+.TH "GALLERY-DL" "1" "2020-11-13" "1.15.3" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 
diff --git a/data/man/gallery-dl.conf.5 b/data/man/gallery-dl.conf.5
index 8dd3187..05bd92e 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-10-24" "1.15.2" "gallery-dl Manual"
+.TH "GALLERY-DL.CONF" "5" "2020-11-13" "1.15.3" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -217,6 +217,28 @@ Note: In a string with 2 or more characters, \f[I][]^-\\\f[] need to be
 escaped with backslashes, e.g. \f[I]"\\\\[\\\\]"\f[]
 
 
+.SS extractor.*.extension-map
+.IP "Type:" 6
+\f[I]object\f[]
+
+.IP "Default:" 9
+\f[I]null\f[]
+
+.IP "Example:" 4
+.. code:: json
+
+{
+"jpeg": "jpg",
+"jpe" : "jpg",
+"jfif": "jpg",
+"jif" : "jpg",
+"jfi" : "jpg"
+}
+
+.IP "Description:" 4
+A JSON \f[I]object\f[] mapping filename extensions to alternatives.
+
+
 .SS extractor.*.skip
 .IP "Type:" 6
 \f[I]bool\f[] or \f[I]string\f[]
@@ -1530,6 +1552,28 @@ 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[]
+
+.IP "Default:" 9
+\f[I]false\f[]
+
+.IP "Description:" 4
+Download video embeds from external sites.
+
+
+.SS extractor.sankakucomplex.videos
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]true\f[]
+
+.IP "Description:" 4
+Download videos.
+
+
 .SS extractor.smugmug.videos
 .IP "Type:" 6
 \f[I]bool\f[]
@@ -2288,10 +2332,13 @@ Note: \f[I]metadata.extension\f[] is ignored if this option is set.
 
 .SS metadata.content-format
 .IP "Type:" 6
-\f[I]string\f[]
+\f[I]string\f[] or \f[I]list\f[] of \f[I]strings\f[]
 
 .IP "Example:" 4
-"tags:\\n\\n{tags:J\\n}\\n"
+.br
+* "tags:\\n\\n{tags:J\\n}\\n"
+.br
+* ["tags:", "", "{tags:J\\n}"]
 
 .IP "Description:" 4
 Custom format string to build the content of metadata files with.
@@ -2465,6 +2512,22 @@ case the Python interpreter gets shut down unexpectedly
 
 
 .SH MISCELLANEOUS OPTIONS
+.SS extractor.modules
+.IP "Type:" 6
+\f[I]list\f[] of \f[I]strings\f[]
+
+.IP "Default:" 9
+The \f[I]modules\f[] list in
+\f[I]extractor/__init__.py\f[]
+
+.IP "Example:" 4
+["reddit", "danbooru", "mangadex"]
+
+.IP "Description:" 4
+The list of modules to load when searching for a suitable
+extractor class. Useful to reduce startup time and memory usage.
+
+
 .SS cache.file
 .IP "Type:" 6
 \f[I]Path\f[]