[>] Serve results

nipafx · nipafx · commit 2d3564ddbe06 · 2024-06-08T11:58:03.000+02:00
diff --git a/README.md b/README.md
@@ -4,35 +4,14 @@ A repository for my live-coding talk [Modern Java in Action](https://nipafx.dev/
 
 ## Next
 
-This is where string templates used to come in.
-Since [they're out](https://bugs.openjdk.org/browse/JDK-8329948) in JDK 23, there's nothing to do here except boring string formatting and method calls:
-* change output in `GitHubCrawl::main` to:
+Simple server:
+* `ResultServer::launchWebServer`:
 	```java
-	System.out.printf("""
-
-			---
-
-			%s
-			%s
-
-
-			""", Statistician.evaluate(rootPage), Pretty.pageList(rootPage));
-	```
-* parse to HTML in `ResultServer::serve`:
-	```java
-	var html = Jsoup.parse("""...""");
-	```
-  and update call to `Files.writeString` on next line
-* add info in `ResultServer::pageHtml`:
-	```java
-	return join(RAW."""
-			<div class="page level-%d">
-				<a href="%s">%s</a>
-				%s
-  			</div>
-			""".formatted(
-					level,
-					page.url().toString(),
-					Pretty.pageName(page),
-					reference ? "<span class=\"ref\"></span>" : "");
+	System.out.println("Visit localhost:8080");
+	SimpleFileServer
+			.createFileServer(
+					new InetSocketAddress(8080),
+					serverDir.toAbsolutePath(),
+					OutputLevel.INFO)
+			.start();
 	```
diff --git a/src/main/java/dev/nipafx/demo/modern/GitHubCrawl.java b/src/main/java/dev/nipafx/demo/modern/GitHubCrawl.java
@@ -26,9 +26,16 @@ public static void main(String[] args) throws Exception {
 		var factory = new PageTreeFactory(client);
 		var rootPage = factory.createPage(config.seedUrl(), config.depth());
 
-		// TODO: improve formatting
-		System.out.println(Statistician.evaluate(rootPage));
-		System.out.println(Pretty.pageList(rootPage));
+		System.out.printf("""
+				
+				---
+				
+				%s
+				
+				%s
+				
+				
+				""", Statistician.evaluate(rootPage), Pretty.pageList(rootPage));
 
 		ResultServer.serve(rootPage, Path.of("serve"));
 	}
diff --git a/src/main/java/dev/nipafx/demo/modern/operations/ResultServer.java b/src/main/java/dev/nipafx/demo/modern/operations/ResultServer.java
@@ -1,9 +1,13 @@
 package dev.nipafx.demo.modern.operations;
 
+import com.sun.net.httpserver.SimpleFileServer;
+import com.sun.net.httpserver.SimpleFileServer.OutputLevel;
 import dev.nipafx.demo.modern.page.GitHubPage;
 import dev.nipafx.demo.modern.page.Page;
+import org.jsoup.Jsoup;
 
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashSet;
@@ -17,8 +21,7 @@ public static void serve(Page rootPage, Path serverDir) throws IOException {
 		if (!Files.exists(serverDir))
 			Files.createDirectory(serverDir);
 
-		// TODO: parse to HTML document
-		var html = """
+		var html = Jsoup.parse("""
 				<!DOCTYPE html>
 				<html lang="en">
 					<head>
@@ -32,8 +35,15 @@ public static void serve(Page rootPage, Path serverDir) throws IOException {
 						</div>
 					</body>
 				</html>
-				""".formatted(Pretty.pageName(rootPage), pageTreeHtml(rootPage));
-		Files.writeString(serverDir.resolve("index.html"), html);
+				""".formatted(Pretty.pageName(rootPage), pageTreeHtml(rootPage)));
+		Files.writeString(serverDir.resolve("index.html"), html.html());
+
+		launchWebServer(serverDir);
+	}
+
+	private static void launchWebServer(Path serverDir) {
+		System.out.println("Visit localhost:8080");
+		// TODO: launch web server
 	}
 
 	private static String pageTreeHtml(Page rootPage) {
@@ -62,12 +72,16 @@ private static String appendPageTreeHtml(Set<Page> printedPages, Page page, int
 	}
 
 	private static String pageHtml(Page page, boolean reference, int level) {
-		// TODO: add page info
 		return """
-				<div class="page level-0">
-					<a href=""></a>
+				<div class="page level-%d">
+					<a href="%s">%s</a>
+					%s
 				</div>
-				""";
+				""".formatted(
+						level,
+						page.url().toString(),
+						Pretty.pageName(page),
+						reference ? "<span class=\"ref\"></span>" : "");
 	}
 
 }
