diff options
Diffstat (limited to 'gallery_dl/postprocessor')
| -rw-r--r-- | gallery_dl/postprocessor/common.py | 8 | ||||
| -rw-r--r-- | gallery_dl/postprocessor/exec.py | 3 | ||||
| -rw-r--r-- | gallery_dl/postprocessor/metadata.py | 4 | ||||
| -rw-r--r-- | gallery_dl/postprocessor/python.py | 7 |
4 files changed, 15 insertions, 7 deletions
diff --git a/gallery_dl/postprocessor/common.py b/gallery_dl/postprocessor/common.py index 9992c56..82ad388 100644 --- a/gallery_dl/postprocessor/common.py +++ b/gallery_dl/postprocessor/common.py @@ -21,7 +21,7 @@ class PostProcessor(): def __repr__(self): return self.__class__.__name__ - def _init_archive(self, job, options, prefix=None): + def _archive_init(self, job, options, prefix=None): if archive_path := options.get("archive"): extr = job.extractor @@ -54,11 +54,13 @@ class PostProcessor(): else: self.log.debug( "Using %s archive '%s'", self.name, archive_path) - job.register_hooks({"finalize": self._close_archive}) return True self.archive = None return False - def _close_archive(self, _): + def _archive_register(self, job): + job.register_hooks({"finalize": self._archive_close}) + + def _archive_close(self, _): self.archive.close() diff --git a/gallery_dl/postprocessor/exec.py b/gallery_dl/postprocessor/exec.py index 0bfe1a2..ef11bff 100644 --- a/gallery_dl/postprocessor/exec.py +++ b/gallery_dl/postprocessor/exec.py @@ -50,7 +50,8 @@ class ExecPP(PostProcessor): events = events.split(",") job.register_hooks({event: execute for event in events}, options) - self._init_archive(job, options) + if self._archive_init(job, options): + self._archive_register(job) def _prepare_cmd(self, cmd): if isinstance(cmd, str): diff --git a/gallery_dl/postprocessor/metadata.py b/gallery_dl/postprocessor/metadata.py index a6d2b7f..90e6e3d 100644 --- a/gallery_dl/postprocessor/metadata.py +++ b/gallery_dl/postprocessor/metadata.py @@ -110,7 +110,9 @@ class MetadataPP(PostProcessor): events = events.split(",") job.register_hooks({event: self.run for event in events}, options) - self._init_archive(job, options, "_MD_") + if self._archive_init(job, options, "_MD_"): + self._archive_register(job) + self.filter = self._make_filter(options) self.mtime = options.get("mtime") self.omode = options.get("open", omode) diff --git a/gallery_dl/postprocessor/python.py b/gallery_dl/postprocessor/python.py index 66d9343..5011ce8 100644 --- a/gallery_dl/postprocessor/python.py +++ b/gallery_dl/postprocessor/python.py @@ -26,6 +26,9 @@ class PythonPP(PostProcessor): module = util.import_file(module_name) self.function = getattr(module, function_name) + if archive := self._archive_init(job, options): + self.run = self.run_archive + events = options.get("event") if events is None: events = ("file",) @@ -33,8 +36,8 @@ class PythonPP(PostProcessor): events = events.split(",") job.register_hooks({event: self.run for event in events}, options) - if self._init_archive(job, options): - self.run = self.run_archive + if archive: + self._archive_register(job) def run(self, pathfmt): self.function(pathfmt.kwdict) |