commit b9de0a740a8a4a0c10be051e1f948c6eba7d9c4c
from: Omar Polo <op@omarpolo.com>
date: Wed Sep 14 09:58:33 2022 UTC

improve gemtext -> html conversion

commit - fc1cb9ea0716bf54463829dfca90b942ad5c8bf9
commit + b9de0a740a8a4a0c10be051e1f948c6eba7d9c4c
blob - 7507ff23526f5708d749d5b7341b5e50181f38ab
blob + bb28819a1da4f114ba787a5fd935bc7b068ff1c3
--- galileo.h
+++ galileo.h
@@ -65,8 +65,12 @@ struct client {
 	struct tls		*clt_ctx;
 	struct bufferevent	*clt_bev;
 	int			 clt_headersdone;
+
+#define TR_ENABLED	0x1
+#define TR_PRE		0x2
+#define TR_LIST		0x4
+#define TR_NAV		0x8
 	int			 clt_translate;
-	int			 clt_inpre;
 
 	char			 clt_buf[1024];
 	size_t			 clt_buflen;
blob - 021cf57a2d86ca0c43e68ab95612bcc1f96d59d4
blob + df38bfa2eeb278cf959185a4c4e410f221b51084
--- proxy.c
+++ proxy.c
@@ -206,20 +206,82 @@ static int
 gemtext_translate_line(struct client *clt, char *line)
 {
 	/* preformatted line / closing */
-	if (clt->clt_inpre) {
+	if (clt->clt_translate & TR_PRE) {
 		if (!strncmp(line, "```", 3)) {
-			clt->clt_inpre = 0;
+			clt->clt_translate &= ~TR_PRE;
 			return (clt_puts(clt, "</pre>"));
 		}
 
 		if (htmlescape(clt, line) == -1)
 			return (-1);
 		return (clt_putc(clt, '\n'));
+	}
+
+	/* bullet */
+	if (!strncmp(line, "* ", 2)) {
+		if (clt->clt_translate & TR_NAV) {
+			if (clt_puts(clt, "</ul></nav>") == -1)
+				return (-1);
+			clt->clt_translate &= ~TR_NAV;
+		}
+
+		if (!(clt->clt_translate & TR_LIST)) {
+			if (clt_puts(clt, "<ul>") == -1)
+				return (-1);
+			clt->clt_translate |= TR_LIST;
+		}
+
+		if (clt_puts(clt, "<li>") == -1 ||
+		    htmlescape(clt, line + 2) == -1 ||
+		    clt_puts(clt, "</li>") == -1)
+			return (-1);
+		return (0);
+	}
+
+	if (clt->clt_translate & TR_LIST) {
+		if (clt_puts(clt, "</ul>") == -1)
+			return (-1);
+		clt->clt_translate &= ~TR_LIST;
+	}
+
+	/* link -- TODO: relativify from SCRIPT_NAME */
+	if (!strncmp(line, "=>", 2)) {
+		char *label;
+
+		if (!(clt->clt_translate & TR_NAV)) {
+			if (clt_puts(clt, "<nav><ul>") == -1)
+				return (-1);
+			clt->clt_translate |= TR_NAV;
+		}
+
+		line += 2;
+		line += strspn(line, " \t");
+
+		label = line + strcspn(line, " \t");
+		if (*label == '\0')
+			label = line;
+		else
+			*label++ = '\0';
+
+		if (clt_puts(clt, "<li><a href='") == -1 ||
+		    printurl(clt, line) == -1 ||
+		    clt_puts(clt, "'>") == -1 ||
+		    htmlescape(clt, label) == -1 ||
+		    clt_puts(clt, "</a></li>") == -1)
+			return (-1);
+
+		return (0);
 	}
 
+	if (clt->clt_translate & TR_NAV) {
+		if (clt_puts(clt, "</ul></nav>") == -1)
+			return (-1);
+		clt->clt_translate &= ~TR_NAV;
+	}
+
 	/* pre opening */
 	if (!strncmp(line, "```", 3)) {
-		clt->clt_inpre = 1;
+		clt->clt_translate |= TR_PRE;
 		return (clt_puts(clt, "<pre>"));
 	}
 
@@ -255,42 +317,12 @@ gemtext_translate_line(struct client *clt, char *line)
 		return (0);
 	}
 
-	/* bullet -- XXX: group */
-	if (!strncmp(line, "* ", 2)) {
-		if (clt_puts(clt, "<ul><li>") == -1 ||
-		    htmlescape(clt, line + 2) == -1 ||
-		    clt_puts(clt, "</li></ul>") == -1)
-			return (-1);
-		return (0);
-	}
-
-	/* link -- XXX: group -- XXX: relativify from SCRIPT_NAME */
-	if (!strncmp(line, "=>", 2)) {
-		char *label;
-
-		line += 2;
-		line += strspn(line, " \t");
-
-		label = line + strcspn(line, " \t");
-		if (*label == '\0')
-			label = line;
-		else
-			*label++ = '\0';
-
-		if (clt_puts(clt, "<p><a href='") == -1 ||
-		    printurl(clt, line) == -1 ||
-		    clt_puts(clt, "'>") == -1 ||
-		    htmlescape(clt, label) == -1 ||
-		    clt_puts(clt, "</a></p>") == -1)
-			return (-1);
-		return (0);
-	}
-
 	/* paragraph */
 	if (clt_puts(clt, "<p>") == -1 ||
 	    htmlescape(clt, line) == -1 ||
 	    clt_puts(clt, "</p>") == -1)
 		return (-1);
+
 	return (0);
 }
 
@@ -304,7 +336,7 @@ proxy_translate_gemtext(struct client *clt)
 	int			 r;
 
 	for (;;) {
-		line = evbuffer_readln(src, &len, EVBUFFER_EOL_ANY);
+		line = evbuffer_readln(src, &len, EVBUFFER_EOL_CRLF);
 		if (line == NULL)
 			return;
 
@@ -553,7 +585,7 @@ proxy_read(struct bufferevent *bev, void *d)
 
 	if (!strncmp(&hdr[3], "text/gemini", 11)) {
 		ctype = "text/html; charset=utf8";
-		clt->clt_translate = 1;
+		clt->clt_translate = TR_ENABLED;
 	} else
 		ctype = &hdr[3];