diff --git a/internal/backend/music.go b/internal/backend/music.go index 7840fac..c950e65 100644 --- a/internal/backend/music.go +++ b/internal/backend/music.go @@ -140,7 +140,7 @@ func GetRandomSongClassic() string { if err != nil { repo.RemoveBrokenSong(db.Ctx, song.Path) - log.Printf("Song not found, song '%s' deleted from game '%s' FileName: %v\n", song.SongName, gameData.GameName, song.FileName) + log.Printf("Song not found, song '%s' deleted from game '%s' FileName: %s\n", song.SongName, gameData.GameName, *song.FileName) continue } @@ -149,7 +149,7 @@ func GetRandomSongClassic() string { if err != nil || (song.FileName != nil && gameData.Path+*song.FileName != song.Path) { //File not found repo.RemoveBrokenSong(db.Ctx, song.Path) - log.Printf("Song not found, song '%s' deleted from game '%s' FileName: %v\n", song.SongName, gameData.GameName, song.FileName) + log.Printf("Song not found, song '%s' deleted from game '%s' FileName: %s\n", song.SongName, gameData.GameName, *song.FileName) } else { songFound = true } diff --git a/internal/server/musicHandler.go b/internal/server/musicHandler.go index 57493f3..f62b287 100644 --- a/internal/server/musicHandler.go +++ b/internal/server/musicHandler.go @@ -5,6 +5,7 @@ import ( "music-server/internal/backend" "net/http" "os" + "strconv" "github.com/labstack/echo/v4" ) @@ -155,21 +156,17 @@ func (m *MusicHandler) GetAllGamesRandom(ctx echo.Context) error { return ctx.JSON(http.StatusOK, gameList) } -type played struct { - Song int -} - func (m *MusicHandler) PutPlayed(ctx echo.Context) error { if backend.Syncing { log.Println("Syncing is in progress") return ctx.JSON(http.StatusLocked, "Syncing is in progress") } - var played played - err := ctx.Bind(&played) + song, err := strconv.Atoi(ctx.QueryParam("song")) if err != nil { return ctx.JSON(http.StatusBadRequest, err) } - backend.SetPlayed(played.Song) + log.Println("song", song) + backend.SetPlayed(song) return ctx.NoContent(http.StatusOK) } diff --git a/internal/server/routes.go b/internal/server/routes.go index cd2e9cd..def03fb 100644 --- a/internal/server/routes.go +++ b/internal/server/routes.go @@ -77,6 +77,7 @@ func (s *Server) RegisterRoutes() http.Handler { syncGroup.GET("", sync.SyncGamesNewOnlyChanges) syncGroup.GET("/progress", sync.SyncProgress) syncGroup.GET("/new", sync.SyncGamesNewOnlyChanges) + syncGroup.GET("/full", sync.SyncGamesNewFull) syncGroup.GET("/new/full", sync.SyncGamesNewFull) syncGroup.GET("/quick", sync.SyncGamesNewOnlyChanges) syncGroup.GET("/reset", sync.ResetGames)