aboutsummaryrefslogtreecommitdiffstats
path: root/gallery_dl/postprocessor
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@unit193.net>2022-10-17 03:44:10 -0400
committerLibravatarUnit 193 <unit193@unit193.net>2022-10-17 03:44:10 -0400
commit6fa3c3d58670e90b140eeaa759773a3fe749321d (patch)
tree1060614e4c8708f59ac27e1ab9e20d6c3e42e806 /gallery_dl/postprocessor
parent71693e4757b29b478b4ef7c876c24aa7426a58e1 (diff)
parent78e2d1672e4301497f786cd03637de9ddbc717ac (diff)
Update upstream source from tag 'upstream/1.23.3'
Update to upstream version '1.23.3' with Debian dir 9ed24fbe8a8282e29b08d37ad95a98d733c8d145
Diffstat (limited to 'gallery_dl/postprocessor')
-rw-r--r--gallery_dl/postprocessor/metadata.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/gallery_dl/postprocessor/metadata.py b/gallery_dl/postprocessor/metadata.py
index d9baed3..b21e483 100644
--- a/gallery_dl/postprocessor/metadata.py
+++ b/gallery_dl/postprocessor/metadata.py
@@ -19,15 +19,9 @@ class MetadataPP(PostProcessor):
def __init__(self, job, options):
PostProcessor.__init__(self, job)
- mode = options.get("mode", "json")
- if mode == "custom":
- self.write = self._write_custom
- cfmt = options.get("content-format") or options.get("format")
- if isinstance(cfmt, list):
- cfmt = "\n".join(cfmt) + "\n"
- self._content_fmt = formatter.parse(cfmt).format_map
- ext = "txt"
- elif mode == "tags":
+ mode = options.get("mode")
+ cfmt = options.get("content-format") or options.get("format")
+ if mode == "tags":
self.write = self._write_tags
ext = "txt"
elif mode == "modify":
@@ -41,6 +35,12 @@ class MetadataPP(PostProcessor):
self.run = self._run_delete
self.fields = options.get("fields")
ext = None
+ elif mode == "custom" or not mode and cfmt:
+ self.write = self._write_custom
+ if isinstance(cfmt, list):
+ cfmt = "\n".join(cfmt) + "\n"
+ self._content_fmt = formatter.parse(cfmt).format_map
+ ext = "txt"
else:
self.write = self._write_json
self.indent = options.get("indent", 4)