From 55265d4f444ab0c9c8768cd9260de3711332cd59 Mon Sep 17 00:00:00 2001
From: mika <mika@aleida.org>
Date: Thu, 17 Sep 2026 20:37:10 +0200
Subject: [PATCH] atom feed support

---
 .gitignore          |  2 +-
 Makefile            | 32 +++++++++++++++++--------
 atom.xml            | 20 ----------------
 feed.atom           | 20 ++++++++++++++++
 kethel2/aggregate.c | 58 +++++++++++++++++++++++++++++----------------
 kethel2/mkpage.c    | 24 +++++++++++++------
 thoughts/data.tsv   |  4 ++--
 thoughts/feed.html  | 12 ++++++++++
 8 files changed, 111 insertions(+), 61 deletions(-)
 delete mode 100644 atom.xml
 create mode 100644 feed.atom
 create mode 100644 thoughts/feed.html

diff --git a/.gitignore b/.gitignore
index 477d3484cddaf42254fd221ac12fbf43c0f17763..4d80dda1baf62feb1ea2f12dfb295e898418ac7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,5 @@
 /aggregate
 
 /out/**/*
-/tmp/**/*
+/obj/**/*
 /publish
diff --git a/Makefile b/Makefile
index 0113b20c0c5927aef3027a6816df334204f9967a..89f6d7773a10a652eeee20f6a6af82538d1f3f1f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,38 +11,50 @@ serve: all darkhttpd
 	./darkhttpd out
 
 darkhttpd:
+	@mkdir -p out obj
 	curl $(DEVSERVER) > darkhttpd.c
 	$(CC) -O2 darkhttpd.c -o darkhttpd
 
 mkpage: kethel2/mkpage.c include/stdhead.html include/stdnav.html include/stdfooter.html
-	mkdir -p ./tmp
-	$(CC) $(CFLAGS) -c kethel2/mkpage.c -o tmp/mkpage.o
-	$(CC) $(CFLAGS) tmp/mkpage.o -o mkpage
+	@mkdir -p out obj
+	$(CC) $(CFLAGS) -c kethel2/mkpage.c -o obj/mkpage.o
+	$(CC) $(CFLAGS) obj/mkpage.o -o mkpage
 
 aggregate: kethel2/aggregate.c
-	$(CC) $(CFLAGS) -c kethel2/aggregate.c -o tmp/aggregate.o
-	$(CC) $(CFLAGS) tmp/aggregate.o -o aggregate
+	@mkdir -p out obj
+	$(CC) $(CFLAGS) -c kethel2/aggregate.c -o obj/aggregate.o
+	$(CC) $(CFLAGS) obj/aggregate.o -o aggregate
 
 # TODO: manage statics in a better way than `cp -r`
 #static:
 #	cp -r static out/static
 
 # list of all pages
-pages: out/index.html out/colophon.html out/thoughts.html out/blog/index.html out/blog/helloworld.html static
+pages: out/index.html out/colophon.html out/thoughts.html out/blog/index.html out/blog/helloworld.html out/feed.atom
 
 out/index.html: index.html mkpage
+	@mkdir -p out
 	./mkpage index.html out/index.html
 
 out/colophon.html: colophon.html mkpage
+	@mkdir -p out
 	./mkpage colophon.html out/colophon.html
 
 out/thoughts.html: thoughts/data.tsv thoughts/item.html thoughts/index.html aggregate mkpage
-	./aggregate thoughts/data.tsv thoughts/item.html thoughts/index.html tmp/thoughts.o.html
-	./mkpage tmp/thoughts.o.html out/thoughts.html
+	@mkdir -p out obj
+	./aggregate thoughts/data.tsv thoughts/item.html thoughts/index.html obj/thoughts.o.html
+	./mkpage obj/thoughts.o.html out/thoughts.html
 
 out/blog/index.html: blog/data.tsv blog/index.html blog/item.html aggregate mkpage
-	./aggregate blog/data.tsv blog/item.html blog/index.html tmp/blogroll.o.html
-	./mkpage tmp/blogroll.o.html out/blog/index.html
+	@mkdir -p out obj
+	./aggregate blog/data.tsv blog/item.html blog/index.html obj/blogroll.o.html
+	./mkpage obj/blogroll.o.html out/blog/index.html
 
 out/blog/helloworld.html: blog/helloworld.html mkpage
+	@mkdir -p out
 	./mkpage blog/helloworld.html out/blog/helloworld.html
+
+out/feed.atom: thoughts/data.tsv
+	@mkdir -p out obj
+	./aggregate thoughts/data.tsv thoughts/feed.html NONE obj/thoughts.o.atom
+	./mkpage feed.atom out/feed.atom
diff --git a/atom.xml b/atom.xml
deleted file mode 100644
index 63ecc67723651a35baf0d58d547fa95100a1b143..0000000000000000000000000000000000000000
--- a/atom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3c.org/2005/Atom">
-
-	<title>mikadev.nl</title>
-	<link href="https://www.m1kadev.nl/" />
-	<updated>
-<!-- RDATE -->
-	</updated>
-	<author>
-		<name>mika</name>
-		<uri>https://m1kadev.nl/me.html</uri>
-	</author>
-	<id>tag:february.m1kadev.nl,2026/www/feed#atom</id>
-	<generator>
-		mkpage.c
-	</generator>
-
-<!-- PUT -->
-
-</feed>
diff --git a/feed.atom b/feed.atom
new file mode 100644
index 0000000000000000000000000000000000000000..9c19fe027e86d45fb810bbcd89b1bfae3761dfe9
--- /dev/null
+++ b/feed.atom
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <title type="text">m1kaposting</title>
+    <subtitle type="text">
+        the greatest &lt;entry&gt; items of a generation
+    </subtitle>
+	<link rel="alternate" type="text/html" hreflang="en" href="https://www.m1kadev.nl/" />
+	<link rel="self" type="application/atom+xml" href="https://www.m1kadev.nl/feed.atom" />
+	<rights>Mika 2026, CC-BY-4.0</rights>
+	<author>
+		<name>mika</name>
+		<uri>https://m1kadev.nl/me.html</uri>
+	</author>
+	<id>tag:february.m1kadev.nl,2026:feed</id>
+	<generator uri="https://src.m1kadev.nl/~mika/kethel2/tree/main/item/kethel2" version="2">
+	    Kethel 2
+	</generator>
+<!--STAMP -->
+<!--LOAD obj/thoughts.o.atom -->
+</feed>
diff --git a/kethel2/aggregate.c b/kethel2/aggregate.c
index b8ca2dec8d83838924c46c1f2a5c4f767ccc6b1a..dda915eb899149edba2c9d3e6309a6e2ceac6830 100644
--- a/kethel2/aggregate.c
+++ b/kethel2/aggregate.c
@@ -1,3 +1,4 @@
+#include <_stdio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,10 +32,9 @@ int strfind(const char* haystack, char needle) {
 	return i;
 }
 
-void write_item_data(char* restrict row, const char* restrict template, FILE* out) {
+void write_item_data(char* restrict row, const char* restrict template, FILE* out, const char* restrict pref) {
     char prettyDate[64];
 	char* tok = strtok(row, "\t");
-	const char* pref = "item-";
 	char* label = malloc(strlen(pref) + strlen(tok) + 2);
 	sprintf(label, "%s%s", pref, tok);
 	char* data[8];
@@ -44,7 +44,6 @@ void write_item_data(char* restrict row, const char* restrict template, FILE* ou
 	struct tm bdate;
 	strptime(date, "%Y-%m-%dT%H:%M:%S%z", &bdate);
 	strftime(prettyDate, 64, "%H:%M", &bdate);
-	//fprintf(stderr, "%s\n", prettyDate);
 
 	tok = strtok(NULL, "\t");
 	while (tok != NULL) {
@@ -62,14 +61,16 @@ void write_item_data(char* restrict row, const char* restrict template, FILE* ou
 
 	const char magic[] = "<!-- ANCHOR";
 	if (strncmp(templateLine, magic, sizeof(magic) - 1) != 0) {
-		fprintf(stderr, "ERR: Invalid template provided!\n");
+		fprintf(stderr, "WARN: Indescriminate template provided!\n");
 		fprintf(stderr, "<template>:%i: %s\n", 1, templateLine);
-		return;
+		nextLine = -1;
+	} else {
+    	char* tagName = (templateLine + sizeof(magic));
+    	tagName[strfind(tagName, ' ')] = '\0';
+    	fprintf(out, "<%s id=\"%s\">\n", tagName, data[0]);
+    	fflush(out);
 	}
-	char* tagName = (templateLine + sizeof(magic));
-	tagName[strfind(tagName, ' ')] = '\0';
-	fprintf(out, "<%s id=\"%s\">\n", tagName, data[0]);
-	fflush(out);
+
 	int needlePos = strfind(template + nextLine, '\n');
 	while (needlePos != 0) {
 		if (bufSize <= needlePos) {
@@ -86,9 +87,13 @@ void write_item_data(char* restrict row, const char* restrict template, FILE* ou
 		    int offset = strlen("<!-- LINK ");
 			unsigned char idx = templateLine[offset] - 0x30;
 			fprintf(out, "<a href=\"%s\">", data[idx]);
-		} else if (strncmp(templateLine, "<!-- DATE", strlen("<!-- DATE") - 1) == 0){
+		} else if (strncmp(templateLine, "<!-- DATE", strlen("<!-- DATE") - 1) == 0) {
 			fputs(prettyDate, out);
-	    } else {
+	    } else if (strncmp(templateLine, "<!-- ATOM", strlen("<!-- ATOM") - 1) == 0) {
+		    fprintf(out, "<link rel=\"alternate\" type=\"text/html\" href=\"https://m1kadev.nl/%s#%s\" />", pref, data[0]);
+    	    fprintf(out, "<id>tag:february.m1kadev.nl,2026:feed/%s</id>", data[0]);
+            fprintf(out, "<updated>%s</updated>", date);
+		} else {
 			fputs(templateLine, out);
 		}
 		nextLine += needlePos;
@@ -114,17 +119,22 @@ int main(int argc, char* argv[]) {
 
 	FILE* data = fopen(argv[1], "r");
 	char* itemTemplate = read_to_string(argv[2]);
-	FILE* index = fopen(argv[3], "r");
 	FILE* output = fopen(argv[4], "w");
+	FILE* index = NULL;
+
 	char buf[512];
-	while (fgets(buf, sizeof(buf), index) != NULL) {
-		if (strncmp(buf, "<!-- PUT", 7) == 0) {
-			break;
-		} else {
-			fputs(buf, output);
-		}
+	if (strncmp(argv[3], "NONE", strlen("NONE")) != 0) {
+    	FILE* index = fopen(argv[3], "r");
+    	while (fgets(buf, sizeof(buf), index) != NULL) {
+    		if (strncmp(buf, "<!-- PUT", 7) == 0) {
+    			break;
+    		} else {
+    			fputs(buf, output);
+    		}
+    	}
 	}
 
+
 	if (fgets(buf, sizeof(buf), data) == NULL) {
 		fprintf(stderr, "could not read tsv header, bailing");
 		fclose(data);
@@ -132,18 +142,24 @@ int main(int argc, char* argv[]) {
 		return -1;
 	}
 
+	const char* pCname = strtok(buf, "\t");
+	char* cname = malloc(strlen(pCname) + 1);
+	strcpy(cname, pCname);
+
 	while (fgets(buf, sizeof(buf), data) != NULL) {
-		write_item_data(buf, itemTemplate, output);
+		write_item_data(buf, itemTemplate, output, cname);
 	}
 
-	while (fgets(buf, sizeof(buf), index) != NULL) {
+	while (index != NULL && fgets(buf, sizeof(buf), index) != NULL) {
 		fputs(buf, output);
 	}
 
 	fclose(data);
-	fclose(index);
+	if (index != NULL)
+	    fclose(index);
 	fclose(output);
 	free(itemTemplate);
+	free(cname);
 
 	return 0;
 }
diff --git a/kethel2/mkpage.c b/kethel2/mkpage.c
index 8ca5a7e81315fb37301004a41e25e2068690dbe5..06300bb6efa33cd51582d6d63d7aa4c36d3a865e 100644
--- a/kethel2/mkpage.c
+++ b/kethel2/mkpage.c
@@ -2,10 +2,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 int main(int argc, char* argv[]) {
     if (argc <= 2) {
         fprintf(stderr, "Usage: ./mkpage <input> <output>\n");
+        return -1;
     }
     FILE* input  = fopen(argv[1], "rb");
     if (input == NULL) {
@@ -51,16 +53,24 @@ int main(int argc, char* argv[]) {
                 fseek(load, 0, SEEK_SET);
                 char* readBuf = malloc(file_size);
                 size_t bytesRead = fread(readBuf, file_size, 1, load);
-		if (bytesRead <= 0) {
-			fputs("Failed to read from LOADed file\n", stderr);
-			fclose(load);
-			fclose(input);
-			fclose(output);
-			return -1;
-		}
+                if (bytesRead <= 0) {
+                    fputs("Failed to read from LOADed file\n", stderr);
+     			    fclose(load);
+     			    fclose(input);
+     			    fclose(output);
+     			    return -1;
+      		    }
                 fputs(readBuf, output);
                 free(readBuf);
                 fclose(load);
+            } else if (strncmp(commandPtr, "STAMP", 4) == 0) {
+                time_t pTime;
+                time(&pTime);
+                struct tm* date;
+                date = gmtime(&pTime);
+                char strTime[64];
+                strftime(strTime, sizeof(strTime), "%Y-%m-%dT%H:%M:%SZ", date);
+                fprintf(output, "<updated>%s</updated>", strTime);
             }
         } else {
             fputs(buf, output);
diff --git a/thoughts/data.tsv b/thoughts/data.tsv
index 32788398458d5a914989c57091e1d35f7e6a53b4..7b956ed51e1dfa3b842dc6ddfc81856996794651 100644
--- a/thoughts/data.tsv
+++ b/thoughts/data.tsv
@@ -1,2 +1,2 @@
-rowid	bdate	BODY	AUTHOR
-0	2026-09-15T16:31:15+02:00	we always call it the 'fridge',, Howevere, why do we not call outside the 'warmdge' ?	mika
+thought	bdate	BODY	AUTHOR
+0	2026-09-15T18:31:15+02:00	we always call it the 'fridge',, Howevere, why do we not call outside the 'warmdge' ?	mika
diff --git a/thoughts/feed.html b/thoughts/feed.html
new file mode 100644
index 0000000000000000000000000000000000000000..15ba4c02e8c0001fd87d684417881c0361963d9e
--- /dev/null
+++ b/thoughts/feed.html
@@ -0,0 +1,12 @@
+<entry>
+    <title type="text">new thought!</title>
+    <author>
+        <name>m1ka</name>
+        <uri>https://www.m1kadev.nl/</uri>
+    </author>
+    <summary>
+<!-- PUT 1 -->
+    </summary>
+<!-- ATOMT -->
+
+</entry>