From 933f7d8d0048dc7e1766d36d1f572468783c0624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Ricart?= Date: Thu, 27 Feb 2025 11:25:49 +0100 Subject: [PATCH] clean json output --- parsers/debian.py | 13 ++++--------- template/debian.rst.j2 | 5 +++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/parsers/debian.py b/parsers/debian.py index 3b0b59e..1ae1f61 100644 --- a/parsers/debian.py +++ b/parsers/debian.py @@ -13,13 +13,6 @@ def parse_ip(raw_ip): result.append(interface) return result -def parse_os(raw_os): - result = {} - for line in raw_os.splitlines(): - opt, value = line.split("=") - result[opt.lower()] = value - return result - def parse_debian(content): current_section = "" result = {} @@ -30,9 +23,11 @@ def parse_debian(content): else: if current_section: result[current_section] += line + "\n" + for section in result: + if section in ["services","routes"]: + result[section] = loads(result[section]) result["ip"] = parse_ip(result["ip"]) - result["services"] = loads(result["services"]) - result["os"] = parse_os(result["version"]) + result["os"] = result["version"] return result if __name__ == "__main__": diff --git a/template/debian.rst.j2 b/template/debian.rst.j2 index 576e31c..bd5d60b 100644 --- a/template/debian.rst.j2 +++ b/template/debian.rst.j2 @@ -12,6 +12,11 @@ interface adresses {{ "{:<10}".format(interface["ifname"]) }} {% for ip in interface["addr_info"] %} {{ ip["local"] }}/{{ ip["prefixlen"]}}{% endfor %} {% endfor %}========= ============== +routes +###### + +{{ routes }} + services --------