replaces prune_blog script with http/Makefile rules

http/Makefile

@@ -5,8 +5,7 @@ include config.mk
 # VARIABLES #
 #############
 
-src_files := $(filter-out %.args,$(wildcard src/*.upp*))
+src_files := $(filter-out %.args,$(wildcard src/*.upp*)) $(filter-out %.args,$(wildcard src/**/*.upp*))
-src_files += $(filter-out %.args,$(wildcard src/**/*.upp*))
 src_files_ext := $(suffix $(src_files))
 out_deps_ext := $(src_files_ext:.upp%=%)
 
@@ -14,10 +13,12 @@ component_files := $(shell find -L share/components -type f)
 layout_files := $(wildcard share/layouts/*.layout.upp*)
 layouts := $(notdir $(basename $(basename $(layout_files))))
 
-out_deps := $(addprefix out/,$(src_files:src/%=%))
+remove_all_layouts = $(call remove_layouts,$(layouts),$(1))
-remove_layout_from_out_deps = out_deps := $$(subst $(1).upp,.,$$(out_deps))
+remove_layouts = $(let first rest,$(1),$(call remove_layout,$(first),$(if $(rest),$(call remove_layouts,$(rest),$(2)),$(2))))
-$(foreach layout,$(layouts),$(eval $(call remove_layout_from_out_deps,.$(layout))))
+remove_layout = $(subst .$(1).upp,.,$(2))
-$(eval $(call remove_layout_from_out_deps,))
+out_deps := $(subst .upp,.,$(call remove_all_layouts,$(addprefix out/,$(src_files:src/%=%))))
+out_deps_without_src := $(filter-out $(out_deps),$(shell find -L out -type f))
+out_deps += $(out_deps_without_src)
 
 blogs := $(subst blogs/,,$(wildcard blogs/*))
 
@@ -32,6 +33,7 @@ blog_src = $(patsubst \
 	blogs/$(blog)/%.$(BLOG_EXT_$(blog)),\
 	src/$(blog)/%$(if $(BLOG_LAYOUT_$(blog)),.$(BLOG_LAYOUT_$(blog))).upphtml,\
 	$(shell find -L "blogs/$(blog)" -type f -and -name *.$(BLOG_EXT_$(blog))))
+blog_src_without_post_src = $(filter-out $(blog_src),$(shell find -L "src/$(blog)" -type f -and -name *.$(BLOG_LAYOUT_$(blog)).upphtml))
 default_layout_file = $(if \
 	$(shell [ -f "share/layouts/default.layout.$(ext)" ] && echo 1),\
 	share/layouts/default.layout.$(ext))
@@ -49,7 +51,7 @@ endef
 
 define blog_rule =
 .PHONY: $(blog)
-$(blog): $(blog_src)
+$(blog): $(blog_src_without_post_src) $(blog_src)
 endef
 
 define blog_post_rule =
@@ -61,10 +63,30 @@ $(blog_post_target): $(blog_post_src) $(let ext,html,$(layout_file) $(component_
 		-f $$*.$(BLOG_EXT_$(blog))
 endef
 
-define prune_blog_rule =
+define prune_blog_src_file_rule =
-.PHONY: prune_$(blog)
+$(let rel_basename,$(patsubst src/$(blog)/%.$(BLOG_LAYOUT_$(blog)).upphtml,%,$(file)),
-prune_$(blog):
+blogs/$(blog)/$(rel_basename).$(BLOG_EXT_$(blog)):
-	./bin/prune_blog $(blog) *$(if $(BLOG_LAYOUT_$(blog)),.$(BLOG_LAYOUT_$(blog))).upphtml
+	rm $(file)
+)
+endef
+
+define prune_blog_out_file_rule =
+$(let rel_basename,$(patsubst src/$(blog)/%.$(BLOG_LAYOUT_$(blog)).upphtml,%,$(file)),
+$(file):
+	rm out/$(rel_basename).html
+)
+endef
+
+define prune_out_file_rule =
+$(let orig_ext,$(patsubst .%,%,$(suffix $(file))),
+$(let ext,$(patsubst upp%,%,$(orig_ext)),
+$(let rel_basename,$(patsubst out/%.$(orig_ext),%,$(file)),
+$(let src_file,src/$(rel_basename).upp$(ext),
+$(let src_files_with_layouts,$(foreach layout,$(layouts),src/$(rel_basename).$(layout).upp$(ext)),
+$(let public_file,public/$(rel_basename).$(orig_ext),
+$(src_file) $(src_files_with_layouts) $(public_file):
+	rm $(file)
+))))))
 endef
 
 
@@ -72,7 +94,8 @@ endef
 # RULES #
 #########
 
-all: bin/pp prune $(blogs) public out vendor
+all: bin/pp $(blogs) public out vendor
+	$(MAKE) out # if blog posts have been pruned, outfiles must be re-calculated
 
 bin/pp:
 	cd pp && $(MAKE) && cp pp ../bin/pp
@@ -105,14 +128,8 @@ public: $(subst public/,out/,$(shell find -L public/ -type f))
 out/%: public/%
 	mkdir -p $(dir $@) && cp $< $@
 
-.PHONY: prune
+$(foreach file,$(out_deps_without_src),$(eval $(prune_out_file_rule)))
-prune: $(addprefix prune_,$(blogs)) prune_out
+$(foreach blog,$(blogs),$(foreach file,$(blog_src_without_post_src),$(eval $(prune_blog_src_file_rule))))
-
-.PHONY: prune_out
-prune_out:
-	./bin/prune_out
-
-$(foreach blog,$(blogs),$(eval $(prune_blog_rule)))
 
 vendor: composer.json composer.lock
 	composer install

http/bin/prune_blog

@@ -1,45 +0,0 @@
-#!/bin/sh -e
-
-BLOG="$1"
-BLOG_POST_PATTERN="${2:-*}"
-
-SRC="$(realpath src)"
-BLOGS="$(realpath blogs)"
-LAYOUTS="$(realpath share/layouts)"
-BLOG_DIR_IN_SRC="${SRC}/${BLOG}"
-BLOG_EXT=gmi
-
-for post in $(find "$BLOG_DIR_IN_SRC" -type f -and -name "$BLOG_POST_PATTERN")
-do
-  last_segment="${post##*\.}"
-  if [ "$last_segment" = "args" ]
-  then
-    continue
-  fi
-
-  post_rel_path="$(echo "$post" | cut -c${#BLOG_DIR_IN_SRC}- | cut -c3-)"
-  post_basename_len=$(( ${#post_rel_path} - ( ${#last_segment} + 1 ) ))
-  post_basename="$(echo "${post_rel_path}" | cut -c1-${post_basename_len})"
-	post_src="${BLOGS}/${BLOG}/${post_basename}.${BLOG_EXT}"
-	if [ -f "$post_src" ]
-	then
-    continue
-	fi
-
-  penultimate_segment_len=$(( ${#post} - ( ${#last_segment} + 1 ) ))
-  penultimate_segment="$(echo "${post}" | cut -c1-${penultimate_segment_len})"
-  penultimate_segment="${penultimate_segment##*\.}"
-  post_basename_len=$(( ${#post_rel_path} - ( ${#last_segment} + ${#penultimate_segment} + 2 ) ))
-  post_basename="$(echo "${post_rel_path}" | cut -c1-${post_basename_len})"
-  if [ -f "${LAYOUTS}/${penultimate_segment}.layout.${last_segment}" ]
-  then
-  	post_src="${BLOGS}/${BLOG}/${post_basename}.${BLOG_EXT}"
-   	if [ -f "$post_src" ]
-   	then
-        continue
-   	fi
-  fi
-
-  echo "No source file found to match post ${post} in blog ${BLOG}: removing ${post}"
-	rm -f "$post" "${post}.args"
-done

http/bin/prune_out

@@ -1,32 +0,0 @@
-#!/bin/sh -e
-
-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
-	fi
-
-	base_rel_path="${rel_path%%.${out_ext}}"
-	src_path="src/${base_rel_path}.upp${out_ext}"
-	if [ -f "$src_path" ]; then
-		continue
-	fi
-
-	for layout in $(find share/layouts -name "*.layout.upp${out_ext}"); do
-		layout="$(basename "$layout")"
-		layout="$(echo ${layout} | cut -c1-$(( ${#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