New upstream version 1.26.3.upstream/1.26.3

2 files changed, 89 insertions, 37 deletions

diff --git a/data/man/gallery-dl.1 b/data/man/gallery-dl.1
index 5a9ec79..2789154 100644
--- a/data/man/gallery-dl.1
+++ b/data/man/gallery-dl.1
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL" "1" "2023-11-04" "1.26.2" "gallery-dl Manual"
+.TH "GALLERY-DL" "1" "2023-11-27" "1.26.3" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 
@@ -23,9 +23,6 @@ Print this help message and exit
 .B "\-\-version" 
 Print program version and exit
 .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
@@ -50,6 +47,15 @@ User-Agent request header
 .B "\-\-clear\-cache" \f[I]MODULE\f[]
 Delete cached login sessions, cookies, etc. for MODULE (ALL to delete everything)
 .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 "\-I, \-\-input\-file\-comment" \f[I]FILE\f[]
+Download URLs found in FILE. Comment them out after they were downloaded successfully.
+.TP
+.B "\-x, \-\-input\-file\-delete" \f[I]FILE\f[]
+Download URLs found in FILE. Delete them after they were downloaded successfully.
+.TP
 .B "\-q, \-\-quiet" 
 Activate quiet mode
 .TP
@@ -191,17 +197,11 @@ Python expression controlling which files to download. Files for which the expre
 .B "\-\-chapter\-filter" \f[I]EXPR\f[]
 Like '--filter', but applies to manga chapters and other delegated URLs
 .TP
-.B "\-\-zip" 
-Store downloaded files in a ZIP archive
-.TP
-.B "\-\-ugoira\-conv" 
-Convert Pixiv Ugoira to WebM (requires FFmpeg)
-.TP
-.B "\-\-ugoira\-conv\-lossless" 
-Convert Pixiv Ugoira to WebM in VP9 lossless mode
+.B "\-P, \-\-postprocessor" \f[I]NAME\f[]
+Activate the specified post processor
 .TP
-.B "\-\-ugoira\-conv\-copy" 
-Convert Pixiv Ugoira to MKV without re-encoding any frames
+.B "\-O, \-\-postprocessor\-option" \f[I]KEY=VALUE\f[]
+Additional post processor options
 .TP
 .B "\-\-write\-metadata" 
 Write metadata to separate JSON files
@@ -212,20 +212,23 @@ Write gallery metadata to a info.json file
 .B "\-\-write\-tags" 
 Write image tags to separate text files
 .TP
-.B "\-\-mtime\-from\-date" 
-Set file modification times according to 'date' metadata
+.B "\-\-zip" 
+Store downloaded files in a ZIP archive
+.TP
+.B "\-\-cbz" 
+Store downloaded files in a CBZ archive
+.TP
+.B "\-\-mtime" \f[I]NAME\f[]
+Set file modification times according to metadata selected by NAME. Examples: 'date' or 'status[date]'
+.TP
+.B "\-\-ugoira" \f[I]FORMAT\f[]
+Convert Pixiv Ugoira to FORMAT using FFmpeg. Supported formats are 'webm', 'mp4', 'gif', 'vp8', 'vp9', 'vp9-lossless', 'copy'.
 .TP
 .B "\-\-exec" \f[I]CMD\f[]
 Execute CMD for each downloaded file. Supported replacement fields are {} or {_path}, {_directory}, {_filename}. Example: --exec "convert {} {}.png && rm {}"
 .TP
 .B "\-\-exec\-after" \f[I]CMD\f[]
-Execute CMD after all files were downloaded successfully. Example: --exec-after "cd {_directory} && convert * ../doc.pdf"
-.TP
-.B "\-P, \-\-postprocessor" \f[I]NAME\f[]
-Activate the specified post processor
-.TP
-.B "\-O, \-\-postprocessor\-option" \f[I]OPT\f[]
-Additional '<key>=<value>' post processor options
+Execute CMD after all files were downloaded. Example: --exec-after "cd {_directory} && convert * ../doc.pdf"
 
 .SH EXAMPLES
 .TP
diff --git a/data/man/gallery-dl.conf.5 b/data/man/gallery-dl.conf.5
index 46a8ea6..adf9885 100644
--- a/data/man/gallery-dl.conf.5
+++ b/data/man/gallery-dl.conf.5
@@ -1,4 +1,4 @@
-.TH "GALLERY-DL.CONF" "5" "2023-11-04" "1.26.2" "gallery-dl Manual"
+.TH "GALLERY-DL.CONF" "5" "2023-11-27" "1.26.3" "gallery-dl Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -190,7 +190,7 @@ Use an extractor's current target directory as
 for any spawned child extractors.
 
 
-.SS extractor.*.parent-metadata
+.SS extractor.*.metadata-parent
 .IP "Type:" 6
 .br
 * \f[I]bool\f[]
@@ -784,9 +784,6 @@ Default value used for missing or undefined keyword names in
 .IP "Type:" 6
 \f[I]string\f[]
 
-.IP "Default:" 9
-\f[I]null\f[]
-
 .IP "Description:" 4
 Insert a file's download URL into its metadata dictionary as the given name.
 
@@ -801,9 +798,6 @@ with a \f[I]metadata\f[] post processor, etc.
 .IP "Type:" 6
 \f[I]string\f[]
 
-.IP "Default:" 9
-\f[I]null\f[]
-
 .IP "Description:" 4
 Insert a reference to the current
 \f[I]PathFormat\f[]
@@ -813,12 +807,19 @@ For example, setting this option to \f[I]"gdl_path"\f[] would make it possible
 to access the current file's filename as \f[I]"{gdl_path.filename}"\f[].
 
 
-.SS extractor.*.http-metadata
+.SS extractor.*.extractor-metadata
 .IP "Type:" 6
 \f[I]string\f[]
 
-.IP "Default:" 9
-\f[I]null\f[]
+.IP "Description:" 4
+Insert a reference to the current
+\f[I]Extractor\f[]
+object into metadata dictionaries as the given name.
+
+
+.SS extractor.*.http-metadata
+.IP "Type:" 6
+\f[I]string\f[]
 
 .IP "Description:" 4
 Insert an \f[I]object\f[] containing a file's HTTP headers and
@@ -834,9 +835,6 @@ and its parsed form as \f[I]"{gdl_http[date]}"\f[].
 .IP "Type:" 6
 \f[I]string\f[]
 
-.IP "Default:" 9
-\f[I]null\f[]
-
 .IP "Description:" 4
 Insert an \f[I]object\f[] containing gallery-dl's version info into
 metadata dictionaries as the given name.
@@ -1307,6 +1305,20 @@ This value must be divisble by 16 and gets rounded down otherwise.
 The maximum possible value appears to be \f[I]1920\f[].
 
 
+.SS extractor.behance.modules
+.IP "Type:" 6
+\f[I]list\f[] of \f[I]strings\f[]
+
+.IP "Default:" 9
+\f[I]["image", "video", "mediacollection", "embed"]\f[]
+
+.IP "Description:" 4
+Selects which gallery modules to download from.
+
+Supported module types are
+\f[I]image\f[], \f[I]video\f[], \f[I]mediacollection\f[], \f[I]embed\f[], \f[I]text\f[].
+
+
 .SS extractor.blogger.videos
 .IP "Type:" 6
 \f[I]bool\f[]
@@ -1807,6 +1819,24 @@ Note: This will remove any Favorite Notes when applied
 to already favorited galleries.
 
 
+.SS extractor.exhentai.gp
+.IP "Type:" 6
+\f[I]string\f[]
+
+.IP "Default:" 9
+\f[I]"resized"\f[]
+
+.IP "Description:" 4
+Selects how to handle "you do not have enough GP" errors.
+
+.br
+* "resized": Continue downloading \f[I]non-original\f[] images.
+.br
+* "stop": Stop the current extractor run.
+.br
+* "wait": Wait for user input before retrying the current image.
+
+
 .SS extractor.exhentai.limits
 .IP "Type:" 6
 \f[I]integer\f[]
@@ -2944,6 +2974,14 @@ Include pins from board sections.
 Download from video pins.
 
 
+.SS extractor.pixeldrain.api-key
+.IP "Type:" 6
+\f[I]string\f[]
+
+.IP "Description:" 4
+Your account's \f[I]API key\f[]
+
+
 .SS extractor.pixiv.include
 .IP "Type:" 6
 .br
@@ -3603,6 +3641,17 @@ to access 18+ content without \f[I]API Key\f[].
 See \f[I]Filters\f[] for details.
 
 
+.SS extractor.twitter.ads
+.IP "Type:" 6
+\f[I]bool\f[]
+
+.IP "Default:" 9
+\f[I]false\f[]
+
+.IP "Description:" 4
+Fetch media from promoted Tweets.
+
+
 .SS extractor.twitter.cards
 .IP "Type:" 6
 .br