routes.go

@@ -3,9 +3,6 @@ package main
 import (
 	"log"
 	"net/http"
-	"os"
-	"path"
-	"path/filepath"
 	"text/template"
 
 	"github.com/google/uuid"
@@ -24,8 +21,9 @@ func init() {
 	app.router.GET("/", app.Index)
 	app.router.GET("/play/:playlist", app.Play)
 	app.router.GET("/reset", app.Reset)
-	app.router.GET("/public/*js", app.ServeFiles)
+
-	app.router.GET("/css/*css", app.ServeFiles)
+	app.router.ServeFiles("/js/*filepath", http.Dir("public"))
+	app.router.ServeFiles("/css/*filepath", http.Dir("css"))
 
 	app.router.HandlerFunc("GET", "/ws", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		log.Printf("WS connection from %v\n", r.RemoteAddr)
@@ -51,28 +49,6 @@ type IndexData struct {
 	Ambiance  []string
 }
 
-func (app App) ServeFiles(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-	filePath := filepath.Join(".", r.URL.Path)
-
-	file, err := os.Open(filePath)
-	if err != nil {
-		log.Println(err)
-		http.Error(w, "no such file", http.StatusNotFound)
-		return
-	}
-	defer file.Close()
-
-	fileStat, err := os.Stat(filePath)
-	if err != nil {
-		log.Println(err)
-		http.Error(w, "unable to get file stat", http.StatusInternalServerError)
-	}
-
-	_, filename := path.Split(filePath)
-	t := fileStat.ModTime()
-	http.ServeContent(w, r, filename, t, file)
-}
-
 func (app App) Index(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 	playlists, err := app.GetPlaylists()
 	if err != nil {

tmpl/index.tmpl

@@ -74,6 +74,6 @@
 				</div>
 			</div>
 		</div>
-		<script src="/public/script.js"></script>
+		<script src="/js/script.js"></script>
 	</body>
 </html>