Fix todos

bryphe-coder · bryphe-coder · commit 8bd5804a5807 · 2022-03-09T04:41:28.000Z
diff --git a/site/embed.go b/site/embed.go
@@ -5,6 +5,7 @@ package site
 
 import (
 	"bytes"
+	"context"
 	"embed"
 	"fmt"
 	"io/fs"
@@ -88,7 +89,7 @@ func serveFiles(fileSystem fs.FS, logger slog.Logger) (http.HandlerFunc, error)
 			fileBytes, err := fs.ReadFile(fileSystem, normalizedName)
 
 			if err != nil {
-				// TODO: Log
+				logger.Warn(context.Background(), "Unable to load file", slog.F("fileName", normalizedName))
 				continue
 			}
 
@@ -100,7 +101,7 @@ func serveFiles(fileSystem fs.FS, logger slog.Logger) (http.HandlerFunc, error)
 			continue
 		}
 
-		// TODO: Log that we encountered a directory that we can't serve
+		logger.Warn(context.Background(), "Serving from nested directories is not implemented", slog.F("name", name))
 	}
 
 	if indexBytes == nil {
@@ -122,6 +123,7 @@ func serveFiles(fileSystem fs.FS, logger slog.Logger) (http.HandlerFunc, error)
 			logger.Warn(request.Context(), "Unable to find request file", slog.F("fileName", normalizedFileName))
 			fileBytes = indexBytes
 			isCacheable = false
+			normalizedFileName = "index.html"
 		}
 
 		if isCacheable {
@@ -131,8 +133,7 @@ func serveFiles(fileSystem fs.FS, logger slog.Logger) (http.HandlerFunc, error)
 			writer.Header().Add("Cache-Control", "public, max-age=31536000, immutable")
 		}
 
-		// TODO: Proper name for content:
-		http.ServeContent(writer, request, "", time.Time{}, bytes.NewReader(fileBytes))
+		http.ServeContent(writer, request, normalizedFileName, time.Time{}, bytes.NewReader(fileBytes))
 	}
 
 	return serveFunc, nil

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ package site`
`5`	`5`
`6`	`6`	`import (`
`7`	`7`	`"bytes"`
	`8`	`+ "context"`
`8`	`9`	`"embed"`
`9`	`10`	`"fmt"`
`10`	`11`	`"io/fs"`
`@@ -88,7 +89,7 @@ func serveFiles(fileSystem fs.FS, logger slog.Logger) (http.HandlerFunc, error)`
`88`	`89`	`fileBytes, err := fs.ReadFile(fileSystem, normalizedName)`
`89`	`90`
`90`	`91`	`if err != nil {`
`91`		`- // TODO: Log`
	`92`	`+ logger.Warn(context.Background(), "Unable to load file", slog.F("fileName", normalizedName))`
`92`	`93`	`continue`
`93`	`94`	`}`
`94`	`95`
`@@ -100,7 +101,7 @@ func serveFiles(fileSystem fs.FS, logger slog.Logger) (http.HandlerFunc, error)`
`100`	`101`	`continue`
`101`	`102`	`}`
`102`	`103`
`103`		`- // TODO: Log that we encountered a directory that we can't serve`
	`104`	`+ logger.Warn(context.Background(), "Serving from nested directories is not implemented", slog.F("name", name))`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`if indexBytes == nil {`
`@@ -122,6 +123,7 @@ func serveFiles(fileSystem fs.FS, logger slog.Logger) (http.HandlerFunc, error)`
`122`	`123`	`logger.Warn(request.Context(), "Unable to find request file", slog.F("fileName", normalizedFileName))`
`123`	`124`	`fileBytes = indexBytes`
`124`	`125`	`isCacheable = false`
	`126`	`+ normalizedFileName = "index.html"`
`125`	`127`	`}`
`126`	`128`
`127`	`129`	`if isCacheable {`
`@@ -131,8 +133,7 @@ func serveFiles(fileSystem fs.FS, logger slog.Logger) (http.HandlerFunc, error)`
`131`	`133`	`writer.Header().Add("Cache-Control", "public, max-age=31536000, immutable")`
`132`	`134`	`}`
`133`	`135`
`134`		`- // TODO: Proper name for content:`
`135`		`- http.ServeContent(writer, request, "", time.Time{}, bytes.NewReader(fileBytes))`
	`136`	`+ http.ServeContent(writer, request, normalizedFileName, time.Time{}, bytes.NewReader(fileBytes))`
`136`	`137`	`}`
`137`	`138`
`138`	`139`	`return serveFunc, nil`