Refactor to use http.ServeContent

bryphe-coder · bryphe-coder · commit ff75695cfc62 · 2022-02-05T02:28:49.000Z
diff --git a/nextrouter/nextrouter.go b/nextrouter/nextrouter.go
@@ -1,11 +1,13 @@
 package nextrouter
 
 import (
+	"bytes"
 	"fmt"
 	"io/fs"
 	"net/http"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/go-chi/chi/v5"
 )
@@ -39,7 +41,6 @@ func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {
 			})
 		} else {
 			serveFile(rtr, fileSystem, name)
-
 		}
 	}
 }
@@ -52,19 +53,14 @@ func serveFile(router chi.Router, fileSystem fs.FS, fileName string) {
 		return
 	}
 
-	bytes, err := fs.ReadFile(fileSystem, fileName)
+	data, err := fs.ReadFile(fileSystem, fileName)
 	if err != nil {
 		// TODO(Bryan): Log here
 		return
 	}
 
 	handler := func(w http.ResponseWriter, r *http.Request) {
-		_, err = w.Write(bytes)
-
-		if err != nil {
-			// TODO(BRYAN): Log here
-			http.Error(w, http.StatusText(500), 500)
-		}
+		http.ServeContent(w, r, fileName, time.Time{}, bytes.NewReader(data))
 	}
 
 	fileNameWithoutExtension := removeFileExtension(fileName)
diff --git a/nextrouter/nextrouter_test.go b/nextrouter/nextrouter_test.go
@@ -3,7 +3,6 @@ package nextrouter_test
 import (
 	"context"
 	"io"
-	"io/fs"
 	"net/http"
 	"net/http/httptest"
 	"testing"

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,13 @@`
`1`	`1`	`package nextrouter`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "bytes"`
`4`	`5`	`"fmt"`
`5`	`6`	`"io/fs"`
`6`	`7`	`"net/http"`
`7`	`8`	`"path/filepath"`
`8`	`9`	`"strings"`
	`10`	`+ "time"`
`9`	`11`
`10`	`12`	`"github.com/go-chi/chi/v5"`
`11`	`13`	`)`
`@@ -39,7 +41,6 @@ func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {`
`39`	`41`	`})`
`40`	`42`	`} else {`
`41`	`43`	`serveFile(rtr, fileSystem, name)`
`42`		`-`
`43`	`44`	`}`
`44`	`45`	`}`
`45`	`46`	`}`
`@@ -52,19 +53,14 @@ func serveFile(router chi.Router, fileSystem fs.FS, fileName string) {`
`52`	`53`	`return`
`53`	`54`	`}`
`54`	`55`
`55`		`- bytes, err := fs.ReadFile(fileSystem, fileName)`
	`56`	`+ data, err := fs.ReadFile(fileSystem, fileName)`
`56`	`57`	`if err != nil {`
`57`	`58`	`// TODO(Bryan): Log here`
`58`	`59`	`return`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`handler := func(w http.ResponseWriter, r *http.Request) {`
`62`		`- _, err = w.Write(bytes)`
`63`		`-`
`64`		`- if err != nil {`
`65`		`- // TODO(BRYAN): Log here`
`66`		`- http.Error(w, http.StatusText(500), 500)`
`67`		`- }`
	`63`	`+ http.ServeContent(w, r, fileName, time.Time{}, bytes.NewReader(data))`
`68`	`64`	`}`
`69`	`65`
`70`	`66`	`fileNameWithoutExtension := removeFileExtension(fileName)`