From b496be0f5d8a747b77a20af4e10042ce83d33c80 Mon Sep 17 00:00:00 2001 From: Unrud Date: Sun, 24 Apr 2022 19:14:26 +0200 Subject: [PATCH] Refactor --- documentation-generator/filter.py | 18 ++++++++++-------- documentation-generator/postprocessor.py | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/documentation-generator/filter.py b/documentation-generator/filter.py index b5e0d97d..9767549f 100755 --- a/documentation-generator/filter.py +++ b/documentation-generator/filter.py @@ -13,19 +13,21 @@ TITLE = "Documentation" def main(): data = json.load(sys.stdin) - level1_headings = [ + # Check and remove level 1 header + level1_header = [ (i, content) for i, (level, _, content) in ((i, b["c"]) for i, b in enumerate(data["blocks"]) if b["t"] == "Header") if level == 1] - if (len(level1_headings) != 1 - or level1_headings[0][1] != [{"t": "Str", "c": TITLE}]): - print(("ERROR: Document must contain single level 1 heading " - "with content %r") % TITLE, file=sys.stderr) - exit(1) - for i, _ in reversed(level1_headings): + if (len(level1_header) != 1 + or level1_header[0][1] != [{"t": "Str", "c": TITLE}]): + print("ERROR: Document must contain single level 1 heading %r" % TITLE, + file=sys.stderr) + sys.exit(1) + for i, _ in reversed(level1_header): del data["blocks"][i] - data["meta"]["title"] = {"t": "MetaInlines", "c": level1_headings[0][1]} + # Use level 1 heading as title + data["meta"]["title"] = {"t": "MetaInlines", "c": level1_header[0][1]} json.dump(data, sys.stdout) diff --git a/documentation-generator/postprocessor.py b/documentation-generator/postprocessor.py index b72722f4..5dd99b43 100755 --- a/documentation-generator/postprocessor.py +++ b/documentation-generator/postprocessor.py @@ -61,7 +61,7 @@ def main(): checks_failed = True if checks_failed: - exit(1) + sys.exit(1) sys.stdout.buffer.write(soup.encode(formatter="html5") + b"\n")