From 742c7a78bc08f48ea51e74e5fd455c46b2fa4415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Sun, 5 Nov 2017 10:22:44 -0800 Subject: [PATCH] Debug bar now shows manifest file --- slides/build.sh | 2 +- slides/markmaker.py | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/slides/build.sh b/slides/build.sh index a610c0bc..f6133b6d 100755 --- a/slides/build.sh +++ b/slides/build.sh @@ -2,7 +2,7 @@ case "$1" in once) for YAML in *.yml; do - ./markmaker.py < $YAML > $YAML.html || { + ./markmaker.py $YAML > $YAML.html || { rm $YAML.html break } diff --git a/slides/markmaker.py b/slides/markmaker.py index f8964b6c..e529d198 100755 --- a/slides/markmaker.py +++ b/slides/markmaker.py @@ -7,7 +7,7 @@ import os import re import string import subprocess -import sys +import sys import yaml @@ -58,10 +58,10 @@ def flatten(titles): yield title -def generatefromyaml(manifest): +def generatefromyaml(manifest, filename): manifest = yaml.load(manifest) - markdown, titles = processchapter(manifest["chapters"], "(inline)") + markdown, titles = processchapter(manifest["chapters"], filename) logging.debug("Found {} titles.".format(len(titles))) toc = gentoc(titles) markdown = markdown.replace("@@TOC@@", toc) @@ -163,6 +163,15 @@ def makelink(filename): else: return filename - -sys.stdout.write(generatefromyaml(sys.stdin)) -logging.info("Done") +if len(sys.argv) != 2: + logging.error("This program takes one and only one argument: the YAML file to process.") +else: + filename = sys.argv[1] + if filename == "-": + filename = "" + manifest = sys.stdin + else: + manifest = open(filename) + logging.info("Processing {}...".format(filename)) + sys.stdout.write(generatefromyaml(manifest, filename)) + logging.info("Processed {}.".format(filename))