public rule follows symlinks

http/Makefile

@@ -1,11 +1,40 @@
-all: microlog blog $(shell find src -type f) $(shell find share -type f) $(shell find bin)
+all: microlog blog public out
-	./bin/mkws https://joeac.net
 
-.PHONY: remove_deleted_posts
+.PHONY: prune
-remove_deleted_posts: remove_deleted_microlog_posts remove_deleted_blog_posts
+prune: prune_microlog prune_blog prune_out
 
-.PHONY: remove_deleted_microlog_posts
+.SILENT: prune_out
-remove_deleted_microlog_posts:
+.PHONY: prune_out
+prune_out:
+	for out in $$(find out -type f); do \
+		out_basename="$$(basename "$$out")"; \
+		out_ext="$${out_basename##*\.}"; \
+		rel_path="$$(echo "$${out}" | cut -c5-)"; \
+		if [ -f "public/$${rel_path}" ]; then \
+			continue 2; \
+		fi; \
+		base_rel_path="$${rel_path%%.$${out_ext}}"; \
+		src_path="src/$${base_rel_path}.upp$${out_ext}"; \
+		if [ -f "$$src_path" ]; then \
+  		continue 2; \
+		fi; \
+		for layout in $$(find share/layouts -name "*.layout.upp$${out_ext}"); do \
+			layout="$$(basename "$$layout")"; \
+			layout="$${layout::$${#layout}-15}"; \
+			rel_path="$$(echo "$${out}" | cut -c5-)"; \
+			base_rel_path="$${rel_path%%.$${out_ext}}"; \
+			src_path="src/$${base_rel_path}.$${layout}.upp$${out_ext}"; \
+			if [ -f "$$src_path" ]; then \
+				continue 2; \
+			fi; \
+		done; \
+    echo "No source file found to match $${out}: removing it"; \
+		rm "$$out"; \
+	done
+
+.SILENT: prune_microlog
+.PHONY: prune_microlog
+prune_microlog:
 	for post in $$(find src/microlog -name *.microlog.upphtml); do \
 	  post_basename="$$(basename "$$post")"; \
 		post_src="blogs/microlog/$${post_basename::$${#post_basename}-17}.gmi"; \
@@ -15,8 +44,9 @@ remove_deleted_microlog_posts:
 		fi; \
 	done
 
-.PHONY: remove_deleted_blog_posts
+.SILENT: prune_blog
-remove_deleted_blog_posts:
+.PHONY: prune_blog
+prune_blog:
 	for post in $$(find src/blog -name *.blog.upphtml); do \
 	  post_basename="$$(basename "$$post")"; \
 		post_src="blogs/blog/$${post_basename::$${#post_basename}-13}.gmi"; \
@@ -26,21 +56,49 @@ remove_deleted_blog_posts:
 		fi; \
 	done
 
-out: microlog blog $(shell find src -type f) $(shell find share -type f) $(shell find bin)
+src_files := $(filter-out %.args,$(wildcard src/*.upp*))
-	./bin/mkws https://joeac.net
+src_files += $(filter-out %.args,$(wildcard src/**/*.upp*))
+src_files_ext := $(suffix $(src_files))
+out_files_ext := $(src_files_ext:.upp%=%)
+layout_files := $(wildcard share/layouts/*.layout.upp*)
+layouts := $(notdir $(basename $(basename $(layout_files))))
+out_files := $(addprefix out/,$(src_files:src/%=%))
+remove_layout_from_out_files = out_files := $$(subst $(1).upp,.,$$(out_files))
+$(foreach layout,$(layouts),$(eval $(call remove_layout_from_out_files,.$(layout))))
+$(eval $(call remove_layout_from_out_files,))
+
+define out_rule_for_ext_and_layout =
+out/%.$(1): src/%$(2).upp$(1)
+	./bin/mkws https://joeac.net "$$$$(realpath $$<)"
+endef
+
+$(foreach ext,$(sort $(out_files_ext)),\
+	$(eval $(call out_rule_for_ext_and_layout,$(ext),)))
+$(foreach layout,$(layouts),\
+	$(foreach ext,$(sort $(out_files_ext)),\
+		$(eval $(call out_rule_for_ext_and_layout,$(ext),.$(layout)))))
+
+.PHONY: out
+out: $(out_files)
 
 .PHONY: microlog
-microlog: remove_deleted_microlog_posts $(patsubst blogs/microlog/%.gmi,src/microlog/%.microlog.upphtml,$(wildcard blogs/microlog/*.gmi))
+microlog: $(patsubst blogs/microlog/%.gmi,src/microlog/%.microlog.upphtml,$(wildcard blogs/microlog/*.gmi))
 
 src/microlog/%.microlog.upphtml: blogs/microlog/%.gmi bin/blog bin/gmi2upphtml
 	./bin/blog -i microlog -l microlog -t -p gmi2upphtml -f $*.gmi
 
 .PHONY: blog
-blog: remove_deleted_blog_posts $(patsubst blogs/blog/%.gmi,src/blog/%.blog.upphtml,$(wildcard blogs/blog/*.gmi))
+blog: $(patsubst blogs/blog/%.gmi,src/blog/%.blog.upphtml,$(wildcard blogs/blog/*.gmi))
 
 src/blog/%.blog.upphtml: blogs/blog/%.gmi bin/blog bin/gmi2upphtml bin/cut_longlog_meta
 	./bin/blog -i blog -l blog -p 'cut_longlog_meta | gmi2upphtml' -a extract_longlog_meta -f $*.gmi
 
+.PHONY: public
+public: $(subst public/,out/,$(shell find -L public/ -type f))
+
+out/%: public/%
+	mkdir -p $(dir $@) && cp $< $@
+
 .PHONY: clean
 clean:
 	rm -rf out src/microlog src/blog

http/bin/mkws

@@ -2,7 +2,7 @@
 export PATH="$(dirname $(realpath $0)):$PATH"
 
 usage() {
-	>&2 printf "usage: %s url [path]\\n" "$(basename "$0")"
+	>&2 printf "usage: %s url [pattern]\\n" "$(basename "$0")"
 	exit 1
 }
 
@@ -15,22 +15,14 @@ export LAYOUTS="$(realpath share/layouts)"
 export DEFAULT_LAYOUT="${LAYOUTS}/default.layout.upphtml"
 export OUT="$(realpath out)"
 
-if [ -d "${PUBLIC}" ]
-then
-  echo "Copying from $(basename "${PUBLIC}") into $(basename "${OUT}")"
-  cp -r "${PUBLIC}" "${OUT}"
-else
-  echo "No $(basename "${PUBLIC}") folder found"
-  mkdir -p "${OUT}"
-fi
-
 if ! test -f "${SRC}"/index.upphtml
 then
 	>&2 printf "no index.upphtml file found\\n"
 	exit 1
 fi
 
-for t in $(find -L "${SRC}/" -type f -and -name "*\.upp*" -and -not -name "*\.upp*\.*")
+PATH_PATTERN="${2:-*}"
+for t in $(find -L "${SRC}/" -type f -and -wholename "${PATH_PATTERN}" -and -name "*\.upp*" -and -not -name "*\.upp*\.*")
 do
   basename="$(basename "$t")"
   ext="${basename##*upp}"
@@ -78,6 +70,3 @@ $(cat "${layout}")
 
   echo "Written ${OUT}/${rel_dir}${name}.${ext}"
 done
-
-echo "Making sitemap.xml"
-pp "${SHARE}"/sitemap.uppxml "$1" > "${OUT}"/sitemap.xml