Refactor to handle different file-serving cases

bryphe-coder · bryphe-coder · commit 50c72ba7b84e · 2022-02-05T02:17:28.000Z
diff --git a/nextrouter/nextrouter.go b/nextrouter/nextrouter.go
@@ -8,10 +8,11 @@ import (
 	"github.com/go-chi/chi/v5"
 )
 
-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)
+func serveFile(router chi.Router, fileSystem fs.FS, fileName string) {
+
+	handler := func(w http.ResponseWriter, r *http.Request) {
+		fmt.Println("Requesting file: " + fileName)
+		bytes, err := fs.ReadFile(fileSystem, fileName)
 
 		if err != nil {
 			http.Error(w, http.StatusText(404), 404)
@@ -22,6 +23,8 @@ func serve(fileSystem fs.FS, filePath string) http.HandlerFunc {
 			http.Error(w, http.StatusText(404), 404)
 		}
 	}
+
+	router.Get("/"+fileName, handler)
 }
 
 func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {
@@ -31,6 +34,7 @@ func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {
 		return
 	}
 
+	fmt.Println("Recursing: " + name)
 	for _, file := range files {
 		name := file.Name()
 
@@ -44,7 +48,8 @@ func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {
 				buildRouter(r, sub, name)
 			})
 		} else {
-			rtr.Get("/"+name, serve(fileSystem, name))
+			serveFile(rtr, fileSystem, name)
+
 		}
 	}
 }
diff --git a/nextrouter/nextrouter_test.go b/nextrouter/nextrouter_test.go
@@ -68,6 +68,10 @@ func TestNextRouter(t *testing.T) {
 		require.NoError(t, err)
 		defer res.Body.Close()
 
+		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")

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,11 @@ import (`
`8`	`8`	`"github.com/go-chi/chi/v5"`
`9`	`9`	`)`
`10`	`10`
`11`		`-func serve(fileSystem fs.FS, filePath string) http.HandlerFunc {`
`12`		`- return func(w http.ResponseWriter, r *http.Request) {`
`13`		`- fmt.Println("Requesting file: " + filePath)`
`14`		`- bytes, err := fs.ReadFile(fileSystem, filePath)`
	`11`	`+func serveFile(router chi.Router, fileSystem fs.FS, fileName string) {`
	`12`	`+`
	`13`	`+ handler := func(w http.ResponseWriter, r *http.Request) {`
	`14`	`+ fmt.Println("Requesting file: " + fileName)`
	`15`	`+ bytes, err := fs.ReadFile(fileSystem, fileName)`
`15`	`16`
`16`	`17`	`if err != nil {`
`17`	`18`	`http.Error(w, http.StatusText(404), 404)`
`@@ -22,6 +23,8 @@ func serve(fileSystem fs.FS, filePath string) http.HandlerFunc {`
`22`	`23`	`http.Error(w, http.StatusText(404), 404)`
`23`	`24`	`}`
`24`	`25`	`}`
	`26`	`+`
	`27`	`+ router.Get("/"+fileName, handler)`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {`
`@@ -31,6 +34,7 @@ func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {`
`31`	`34`	`return`
`32`	`35`	`}`
`33`	`36`
	`37`	`+ fmt.Println("Recursing: " + name)`
`34`	`38`	`for _, file := range files {`
`35`	`39`	`name := file.Name()`
`36`	`40`
`@@ -44,7 +48,8 @@ func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {`
`44`	`48`	`buildRouter(r, sub, name)`
`45`	`49`	`})`
`46`	`50`	`} else {`
`47`		`- rtr.Get("/"+name, serve(fileSystem, name))`
	`51`	`+ serveFile(rtr, fileSystem, name)`
	`52`	`+`
`48`	`53`	`}`
`49`	`54`	`}`
`50`	`55`	`}`