From f037429fa4225cea857e0f19bba0301f37b1d78d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 28 Oct 2022 12:04:58 +0200 Subject: [PATCH] attempt to improve '-K' output for lists - use [N] instead if [] to indicate a Number needs to be placed there - enumerate list items --- gallery_dl/job.py | 13 ++++++++----- test/test_job.py | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gallery_dl/job.py b/gallery_dl/job.py index 2f48ffd5..0cf419f4 100644 --- a/gallery_dl/job.py +++ b/gallery_dl/job.py @@ -605,12 +605,15 @@ class KeywordJob(Job): self.print_kwdict(value, key + "[", markers) elif isinstance(value, list): - if value and isinstance(value[0], dict): - self.print_kwdict(value[0], key + "[][", markers) + if not value: + pass + elif isinstance(value[0], dict): + self.print_kwdict(value[0], key + "[N][", markers) else: - write(key + "[]\n") - for val in value: - write(" - " + str(val) + "\n") + fmt = (" {:>%s} {}\n" % len(str(len(value)))).format + write(key + "[N]\n") + for idx, val in enumerate(value, 0): + write(fmt(idx, val)) else: # string or number diff --git a/test/test_job.py b/test/test_job.py index fec6997a..1bd9ccc4 100644 --- a/test/test_job.py +++ b/test/test_job.py @@ -87,10 +87,10 @@ num 1 subcategory test_subcategory -tags[] - - foo - - bar - - テスト +tags[N] + 0 foo + 1 bar + 2 テスト user[id] 123 user[name]