Hook up recursive case

bryphe-coder · bryphe-coder · commit 78406b1391a5 · 2022-02-05T01:39:07.000Z
diff --git a/nextrouter/nextrouter.go b/nextrouter/nextrouter.go
@@ -1,6 +1,7 @@
 package nextrouter
 
 import (
+	"fmt"
 	"io/fs"
 	"net/http"
 
@@ -9,7 +10,7 @@ import (
 
 func serve(fileSystem fs.FS, filePath string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-
+		fmt.Println("Requesting file: " + filePath)
 		bytes, err := fs.ReadFile(fileSystem, filePath)
 
 		if err != nil {
@@ -23,29 +24,29 @@ func serve(fileSystem fs.FS, filePath string) http.HandlerFunc {
 	}
 }
 
-func buildRouter(rtr chi.Router, fileSystem fs.FS, path string) {
+func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {
 	files, err := fs.ReadDir(fileSystem, ".")
 	if err != nil {
 		// TODO(Bryan): Log
 		return
 	}
 
-	rtr.Route("/", func(r chi.Router) {
-		for _, file := range files {
-			name := file.Name()
-
-			if file.IsDir() {
-				sub, err := fs.Sub(fileSystem, name)
-				if err != nil {
-					// TODO(Bryan): Log
-					continue
-				}
-				buildRouter(r, sub, path+"/"+name)
-			} else {
-				rtr.Get("/"+name, serve(fileSystem, name))
+	for _, file := range files {
+		name := file.Name()
+
+		if file.IsDir() {
+			sub, err := fs.Sub(fileSystem, name)
+			if err != nil {
+				// TODO(Bryan): Log
+				continue
 			}
+			rtr.Route("/"+name, func(r chi.Router) {
+				buildRouter(r, sub, name)
+			})
+		} else {
+			rtr.Get("/"+name, serve(fileSystem, name))
 		}
-	})
+	}
 }
 
 // Handler returns an HTTP handler for serving a next-based static site
diff --git a/nextrouter/nextrouter_test.go b/nextrouter/nextrouter_test.go
@@ -26,7 +26,7 @@ func request(server *httptest.Server, path string) (*http.Response, error) {
 	return res, err
 }
 
-func TestConn(t *testing.T) {
+func TestNextRouter(t *testing.T) {
 	t.Parallel()
 
 	t.Run("Serves file at root", func(t *testing.T) {
@@ -50,6 +50,30 @@ func TestConn(t *testing.T) {
 		require.Equal(t, res.StatusCode, 200)
 	})
 
+	t.Run("Serves nested file", func(t *testing.T) {
+		t.Parallel()
+
+		rootFS := memfs.New()
+		err := rootFS.MkdirAll("test/a/b", 0777)
+		require.NoError(t, err)
+
+		rootFS.WriteFile("test/a/b/c.html", []byte("test123"), 0755)
+		require.NoError(t, err)
+
+		router, err := nextrouter.Handler(rootFS)
+		require.NoError(t, err)
+		server := httptest.NewServer(router)
+
+		res, err := request(server, "/test/a/b/c.html")
+		require.NoError(t, err)
+		defer res.Body.Close()
+
+		body, err := io.ReadAll(res.Body)
+		require.NoError(t, err)
+		require.Equal(t, string(body), "test123")
+		require.Equal(t, res.StatusCode, 200)
+	})
+
 	t.Run("404 if file at root is not found", func(t *testing.T) {
 		t.Parallel()
 
