From af1d8d17372f7e3fe8146a6b9847e2f6a70d1a2d Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Sat, 7 Jan 2023 17:47:18 +0100 Subject: [PATCH] flavours/cli: clean up json. (add architectures, flatten flavour_info, etc.) --- flavours/cli.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/flavours/cli.py b/flavours/cli.py index b853403..9634954 100644 --- a/flavours/cli.py +++ b/flavours/cli.py @@ -43,8 +43,15 @@ def cmd_flavours(json: bool = False): block = [prefix + line for line in block] results += block else: - f.pkgbuild = f.pkgbuild.name if f.pkgbuild else None d = dict(f) + d["description"] = f.flavour_info.description if (f.flavour_info and f.flavour_info.description) else f.description + if "flavour_info" in d and d["flavour_info"]: + for k in set(d["flavour_info"].keys()) - set(['description']): + d[k] = d["flavour_info"][k] + del d["flavour_info"] + d["pkgbuild"] = f.pkgbuild.path if f.pkgbuild else None + d["package"] = f.pkgbuild.name + d["arches"] = sorted(f.pkgbuild.arches) if f.pkgbuild else None results += [d] print() if json: