feat: get songs by filename instead of id

Author: MonstraG

main.go

@@ -32,7 +32,7 @@ func mapRoutes(app *setup.App) {
 	app.HandleFunc("POST /songQueue", music.PostHandler)
 	app.HandleFunc("GET /songQueue", music.GetSongQueueHandler)
 	app.HandleFunc("GET /player", music.GetSongPlayerHandler)
-	app.HandleFunc("GET /song/{id}", music.GetSongHandler)
+	app.HandleFunc("GET /song/{path...}", music.GetSongHandler)
 	app.HandleFunc("GET /login", login.GetHandler)
 	app.HandleFunc("POST /login", login.PostHandler)
 

pages/music/music.go

@@ -132,17 +132,7 @@ func GetSongPlayerHandler(w reqRes.MyWriter, r *reqRes.MyRequest) {
 }
 
 func GetSongHandler(w reqRes.MyWriter, r *reqRes.MyRequest) {
-	idString := r.PathValue("id")
-
-	var song models.Song
-	result := r.Db.First(&song, idString)
-	if result.Error != nil {
-		message := fmt.Sprintf("Failed to get song:\n%v\n", result.Error)
-		http.Error(w, message, http.StatusBadRequest)
-		return
-	}
-
-	filename := filepath.Join(r.AppConfig.SongsFolder, song.File)
-
+	pathQueryParam := r.PathValue("path")
+	filename := filepath.Join(r.AppConfig.SongsFolder, pathQueryParam)
 	pages.ServeFile(w, r, filename)
 }

pages/serveFile.go

@@ -6,28 +6,27 @@ import (
 	"encoding/hex"
 	"fmt"
 	"go-server/setup/reqRes"
-	"log"
 	"net/http"
 	"os"
 )
 
 func ServeFile(w reqRes.MyWriter, r *reqRes.MyRequest, filename string) {
 	fileInfo, err := os.Stat(filename)
 	if err != nil {
-		log.Printf("Failed to stat file %s:\n%v\n", filename, err)
-		w.WriteHeader(http.StatusBadRequest)
+		message := fmt.Sprintf("Failed to stat file %s:\n%v\n", filename, err)
+		http.Error(w, message, http.StatusBadRequest)
 		return
 	}
 	if fileInfo.IsDir() {
-		log.Printf("Failed to stat file: %s, it's a directory", filename)
-		w.WriteHeader(http.StatusBadRequest)
+		message := fmt.Sprintf("Failed to stat file: %s, it's a directory", filename)
+		http.Error(w, message, http.StatusBadRequest)
 		return
 	}
 
 	file, err := os.ReadFile(filename)
 	if err != nil {
-		log.Printf("Failed to read file %s:\n%v\n", filename, err)
-		w.WriteHeader(http.StatusInternalServerError)
+		message := fmt.Sprintf("Failed to read file %s:\n%v\n", filename, err)
+		http.Error(w, message, http.StatusInternalServerError)
 		return
 	}
 

setup/middleware.go

@@ -38,7 +38,8 @@ func CreateJwtAuthMiddleware(app App) Middleware {
 	return func(next HandlerFn) HandlerFn {
 		return func(w reqRes.MyWriter, r *reqRes.MyRequest) {
 			if r.URL.Path == "/login" ||
-				strings.HasPrefix(r.URL.Path, "/public") {
+				strings.HasPrefix(r.URL.Path, "/public") ||
+				strings.HasPrefix(r.URL.Path, "/song") {
 				next(w, r)
 				return
 			}