feat: add journal as submodule

makefile

@@ -15,9 +15,6 @@ BLOG_BUILD_DIR	= $(BLOG_BASE_DIR)out/html/
 BLOG_OUT_DIR	= $(OUT_DIR)/blog
 BLOG_INDEX		= $(BLOG_BUILD_DIR)/index.html
 
-GARDEN_BASE_DIR 	= $(SRC_DIR)/garden/
-GARDEN_BUILD_DIR 	= $(GARDEN_BASE_DIR)html
-
 PAGES 			= $(shell find $(ROOT_DIR) -wholename "$(ROOT_DIR)*.html")
 STYLES			= $(shell find $(ROOT_DIR) -wholename "$(ROOT_DIR)*.css")
 IMAGES			= $(shell find $(IMG_DIR) -wholename "$(IMG_DIR)/*.png")
@@ -29,8 +26,7 @@ HTML_TARGETS 	= $(PAGES:$(ROOT_DIR)/%.html=$(OUT_DIR)/%.html)
 CSS_TARGETS 	= $(STYLES:$(ROOT_DIR)/%.css=$(OUT_DIR)/%.css)
 PNG_TARGETS		= $(IMG_DIR)/%.png=$(OUT_DIR)/%.png
 
-all: html blog garden | $(OUT_DIR)
+all: html blog | $(OUT_DIR)
-	cp -r src/garden/html $(OUT_DIR)/garden
 
 html: $(HTML_TARGETS) $(CSS_TARGETS) | $(OUT_DIR)
 	cp $(IMG_DIR)/*.png $(OUT_DIR)/
@@ -66,12 +62,8 @@ blog: $(HTML_INCLUDES) $(CSS_TARGETS)
 		cp $(CSS_TARGETS) `dirname $$page` ; \
 	done
 
-garden:
-	make --directory $(GARDEN_BASE_DIR) html
-
 clean:
-	make --directory $(GARDEN_BASE_DIR) clean
 	make --directory $(BLOG_BASE_DIR) clean
 	rm -rf $(OUT_DIR)
 
-.PHONY: blog garden
+.PHONY: blog

src/garden/Makefile

@@ -1,18 +1,6 @@
-html: feed.py Makefile
-	mkdir html
-	cp feed.py Makefile html
-	cp *.md html
-
-clean-html:
-	[[ -d html ]] && rm -r html
-
-.PHONY: clean-html
-
 feed:
 	python feed.py `pwd`
 
 rss: feed
 
-clean: clean-html
+.PHONY: feed
-
-.PHONY: feed clean

src/garden/feed.py

@@ -5,20 +5,21 @@ import pathlib
 import sys
 import re
 import glob
-import os
 
 def print_usage():
     print("\nusage: python feed.py ROOT\n")
     print("\n")
     print("\t\ROOT\tbase folder")
 
-# check args for at most one file paths
+def validate():
-if len(sys.argv) > 2:
+    # check args for at least one file path
-    print_usage()
+    if len(sys.argv) < 2:
-    sys.exit(1)
+        print_usage()
+        sys.exit(1)
 
-base_folder = sys.argv[1] if len(sys.argv) == 2 else os.getcwd()
+validate()
-print(base_folder)
+
+base_folder = sys.argv[1]
 
 def get_paths() -> [str]:
     return [x for x in glob.glob(f"{base_folder}/*.md")]
@@ -30,20 +31,14 @@ def get_text(path):
 #def to_html(md : str) -> str:
 #    return markdown.markdown(md, extensions=["fenced_code"])
 
-def get_title(md):
-    m = re.compile(r"^# (.+)\n").match(md)
-    if m is not None:
-        return m.groups(1)[0]
-
-    # truncated first line of file for auto-title
-    return md.splitlines()[0][0:30]
-
 def get_entry(path):
     return get_title(get_text(path))
 
+def get_title(md):
+    return re.compile(r"^# (.+)\n").match(md).group(1)
+
 def get_entries() -> [str]:
-    entries = [get_entry(p) for p in get_paths()]
+    return "\n\n".join([get_entry(p) for p in get_paths()])
-    return "\n\n".join(entries)
 
 def get_header() -> str:
     return """<?xml version="1.0" encoding="utf-8" ?>

src/garden/journal

@@ -1 +1 @@
-Subproject commit 6249b069e3c6f5a740141db60d7aac41ad50c11f
+Subproject commit e391e5eaf7137eda3765dab7b2f5cdc17f97afa0