Optimize rendering

src/Dockerfile.pandoc

@@ -6,6 +6,7 @@ ARG pandoc_version
 ARG version
 ARG motto
 
+# TODO try watchman to get inotify working. Currently watchman in alpine edge ..
 RUN apk add \
     make bash curl \
     graphviz inotify-tools rsync \

src/markdeck/Makefile

@@ -1,10 +1,10 @@
 SHELL := /bin/bash
 
-all: .info-all render sync config pandoc
+build: .info-build render sync sass config pandoc
 	@echo "-------- /rerendering ---------"
 	@echo
 
-.info-all:
+.info-build:
 	@echo "-------- rerendering ---------"
 
 
@@ -34,7 +34,7 @@ sync: .info-sync .rsync .fc-list
 
 .rsync: /target .rsync-sync /target/assets/css/slides.scss /target/assets/css/render-pdf.css
 
-.rsync-sync: /markdeck/assets $(wildcard /source/assets) /markdeck/explain.html
+.rsync-sync: /markdeck/assets $(wildcard /source/assets)
 	# FIXME the dynamically generated scss and css files are deleted by rsync.
 	# If there was a way to separate the files coming from rsync and the
 	# dynamically generated files this would be ideal
@@ -143,7 +143,13 @@ pandoc: .info-pandoc /target/index.html
 /target/assets/markdeck/css/%.css /target/assets/css/%.css: $$(subst .css,.scss,$$@)
 	sassc $< $@
 
+wait-for-changes: $(wildcard /source/slide*.md) /source/assets $(wildcard /source/include-before-body) $(wildcard /source/include-after-body)
+	# TODO currently inotify doesn't work on mounted volumes :-/
+	# inotifywait -e modify,create,delete,move,attrib -r $^
+	/markdeck/wait-for-changes
+
+
 clean:
 	rm -rf /target/.??* /target/*
 
-.PHONY: all .info-all render .info-render sync .info-sync .rsync .rsync-sync .fc-list sass .info-sass .sync-custom-themes clean config .info-config pandoc .info-pandoc
+.PHONY: build .info-build render .info-render sync .info-sync .rsync .rsync-sync .fc-list sass .info-sass .sync-custom-themes clean config .info-config pandoc .info-pandoc wait-for-changes

src/markdeck/loop

@@ -51,15 +51,7 @@ export ASCIIART_LIBDIR=/markdeck/lib
 while true; do
     cd /target
 
-    make -f /markdeck/Makefile render
-
-    make -f /markdeck/Makefile sync
-
-    make -f /markdeck/Makefile sass
-
-    make -f /markdeck/Makefile config
-
-    make -f /markdeck/Makefile pandoc || show_errors
+    make -f /markdeck/Makefile build || show_errors
 
     $ONCE && break
 
@@ -71,7 +63,7 @@ while true; do
     sleep .5
     print_usage
 
-    /markdeck/wait-for-changes
+    make -f /markdeck/Makefile wait-for-changes
 
     echo -e "\n\n\n\n\n\n\n\n\n\n"
 done

src/markdeck/wait-for-changes

@@ -2,7 +2,7 @@
 set -e -E -u
 
 SOURCES="/source/slide*.md $(find /source/assets -type d) /source/include-before-body /source/include-after-body"
-TARGET=/target/index.html
+TARGET="$(mktemp)"
 
 last_sources=$(echo $SOURCES)
 no_change=true
@@ -19,6 +19,7 @@ while $no_change; do
             no_change=false
         fi
     done
-    $no_change && sleep 2
+    $no_change && sleep 1
 done
+rm -f "${TARGET}"
 exit 0