github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[pp:python] restore archive functionality

Browse Source 
fixes regression introduced in 09f0ba8e9c
This commit is contained in:
Mike Fährmann
2025-09-26 21:55:37 +02:00
parent 9c4d20e926
commit eee78f8148
5 changed files with 67 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gallery_dl/postprocessor/common.py
View File

@@ -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()

3
gallery_dl/postprocessor/exec.py
View File

@@ -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):

4
gallery_dl/postprocessor/metadata.py
View File

@@ -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)

7
gallery_dl/postprocessor/python.py
View File

@@ -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)