diff options
Diffstat (limited to 'gallery_dl/postprocessor')
| -rw-r--r-- | gallery_dl/postprocessor/mtime.py | 11 | ||||
| -rw-r--r-- | gallery_dl/postprocessor/ugoira.py | 2 | ||||
| -rw-r--r-- | gallery_dl/postprocessor/zip.py | 31 |
3 files changed, 29 insertions, 15 deletions
diff --git a/gallery_dl/postprocessor/mtime.py b/gallery_dl/postprocessor/mtime.py index 3f8d90a..ea61b7b 100644 --- a/gallery_dl/postprocessor/mtime.py +++ b/gallery_dl/postprocessor/mtime.py @@ -9,7 +9,7 @@ """Use metadata as file modification time""" from .common import PostProcessor -from .. import text, util +from .. import text, util, formatter from datetime import datetime @@ -17,7 +17,12 @@ class MtimePP(PostProcessor): def __init__(self, job, options): PostProcessor.__init__(self, job) - self.key = options.get("key", "date") + value = options.get("value") + if value: + self._get = formatter.parse(value, None, util.identity).format_map + else: + key = options.get("key", "date") + self._get = lambda kwdict: kwdict.get(key) events = options.get("event") if events is None: @@ -27,7 +32,7 @@ class MtimePP(PostProcessor): job.register_hooks({event: self.run for event in events}, options) def run(self, pathfmt): - mtime = pathfmt.kwdict.get(self.key) + mtime = self._get(pathfmt.kwdict) pathfmt.kwdict["_mtime"] = ( util.datetime_to_timestamp(mtime) if isinstance(mtime, datetime) else diff --git a/gallery_dl/postprocessor/ugoira.py b/gallery_dl/postprocessor/ugoira.py index 0b4c259..98c8246 100644 --- a/gallery_dl/postprocessor/ugoira.py +++ b/gallery_dl/postprocessor/ugoira.py @@ -35,7 +35,7 @@ class UgoiraPP(PostProcessor): self.output = options.get("ffmpeg-output", True) self.delete = not options.get("keep-files", False) self.repeat = options.get("repeat-last-frame", True) - self.mtime = options.get("mtime") + self.mtime = options.get("mtime", True) ffmpeg = options.get("ffmpeg-location") self.ffmpeg = util.expand_path(ffmpeg) if ffmpeg else "ffmpeg" diff --git a/gallery_dl/postprocessor/zip.py b/gallery_dl/postprocessor/zip.py index 1c4bd03..ff97add 100644 --- a/gallery_dl/postprocessor/zip.py +++ b/gallery_dl/postprocessor/zip.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2018-2021 Mike Fährmann +# Copyright 2018-2022 Mike Fährmann # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -11,6 +11,7 @@ from .common import PostProcessor from .. import util import zipfile +import os class ZipPP(PostProcessor): @@ -34,30 +35,38 @@ class ZipPP(PostProcessor): algorithm = "store" self.zfile = None - self.path = job.pathfmt.realdirectory - self.args = (self.path[:-1] + ext, "a", + self.path = job.pathfmt.realdirectory[:-1] + self.args = (self.path + ext, "a", self.COMPRESSION_ALGORITHMS[algorithm], True) job.register_hooks({ - "file": - self.write_safe if options.get("mode") == "safe" else self.write, + "file": (self.write_safe if options.get("mode") == "safe" else + self.write_fast), }, options) job.hooks["finalize"].append(self.finalize) - def write(self, pathfmt, zfile=None): + def open(self): + try: + return zipfile.ZipFile(*self.args) + except FileNotFoundError: + os.makedirs(os.path.dirname(self.path)) + return zipfile.ZipFile(*self.args) + + def write(self, pathfmt, zfile): # 'NameToInfo' is not officially documented, but it's available # for all supported Python versions and using it directly is a lot # faster than calling getinfo() - if zfile is None: - if self.zfile is None: - self.zfile = zipfile.ZipFile(*self.args) - zfile = self.zfile if pathfmt.filename not in zfile.NameToInfo: zfile.write(pathfmt.temppath, pathfmt.filename) pathfmt.delete = self.delete + def write_fast(self, pathfmt): + if self.zfile is None: + self.zfile = self.open() + self.write(pathfmt, self.zfile) + def write_safe(self, pathfmt): - with zipfile.ZipFile(*self.args) as zfile: + with self.open() as zfile: self.write(pathfmt, zfile) def finalize(self, pathfmt, status): |