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

[tests/results] defer formatter creation

Browse Source
This commit is contained in:
Mike Fährmann
2026-01-07 19:18:13 +01:00
parent 1c56d961fa
commit d491ed8ed8
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/test_results.py
View File

@@ -413,6 +413,7 @@ class ResultJob(job.DownloadJob):
self.queue = False self.queue = False
self.content = content self.content = content
self.format = format
self.url_list = [] self.url_list = []
self.url_hash = hashlib.sha1() self.url_hash = hashlib.sha1()
self.kwdict_list = [] self.kwdict_list = []
@@ -427,18 +428,6 @@ class ResultJob(job.DownloadJob):
else: else:
self._update_content = lambda url, kwdict: None self._update_content = lambda url, kwdict: None
if format:
self.format_directory = TestFormatter(
"".join(self.extractor.directory_fmt)).format_map
self.format_filename = TestFormatter(
self.extractor.filename_fmt).format_map
self.format_archive = TestFormatter(
self.extractor.archive_fmt).format_map
else:
self.format_directory = \
self.format_filename = \
self.format_archive = lambda kwdict: ""
def run(self): def run(self):
self._init() self._init()
self.dispatch(self.extractor) self.dispatch(self.extractor)
@@ -451,6 +440,20 @@ class ResultJob(job.DownloadJob):
self.format_filename(kwdict) self.format_filename(kwdict)
def handle_directory(self, kwdict): def handle_directory(self, kwdict):
if self.format is not None:
if self.format:
self.format_directory = TestFormatter(
"".join(self.extractor.directory_fmt)).format_map
self.format_filename = TestFormatter(
self.extractor.filename_fmt).format_map
self.format_archive = TestFormatter(
self.extractor.archive_fmt).format_map
else:
self.format_directory = \
self.format_filename = \
self.format_archive = lambda kwdict: ""
self.format = None
self._update_kwdict(kwdict, False) self._update_kwdict(kwdict, False)
self.format_directory(kwdict) self.format_directory(kwdict)