diff --git a/internal/backend/characters.go b/internal/backend/characters.go index 717b777..93e8d6e 100644 --- a/internal/backend/characters.go +++ b/internal/backend/characters.go @@ -6,7 +6,7 @@ import ( "strings" ) -func GetCharacters() []string { +func GetCharacterList() []string { charactersPath := os.Getenv("CHARACTERS_PATH") files, err := os.ReadDir(charactersPath) if err != nil { @@ -23,11 +23,11 @@ func GetCharacters() []string { } func GetCharacter(character string) string { - musicPath := os.Getenv("MUSIC_PATH") - charactersPath := musicPath + "characters/" - return charactersPath + character + charactersPath := os.Getenv("CHARACTERS_PATH") + return charactersPath + "/" + character } func isImage(entry os.DirEntry) bool { - return !entry.IsDir() && (strings.HasSuffix(entry.Name(), ".jpg") || strings.HasSuffix(entry.Name(), ".png")) + return !entry.IsDir() && (strings.HasSuffix(entry.Name(), ".jpg") || strings.HasSuffix(entry.Name(), ".jpeg") || + strings.HasSuffix(entry.Name(), ".png")) } diff --git a/internal/server/indexHandler.go b/internal/server/indexHandler.go index e8964da..0577045 100644 --- a/internal/server/indexHandler.go +++ b/internal/server/indexHandler.go @@ -42,12 +42,12 @@ func (i *IndexHandler) HealthCheck(ctx echo.Context) error { return ctx.JSON(http.StatusOK, db.Health()) } -func (i *IndexHandler) GetCharacters(ctx echo.Context) error { - characters := backend.GetCharacters() +func (i *IndexHandler) GetCharacterList(ctx echo.Context) error { + characters := backend.GetCharacterList() return ctx.JSON(http.StatusOK, characters) } func (i *IndexHandler) GetCharacter(ctx echo.Context) error { - character := ctx.QueryParam("character") + character := ctx.QueryParam("name") return ctx.File(backend.GetCharacter(character)) } diff --git a/internal/server/routes.go b/internal/server/routes.go index def03fb..98ae8be 100644 --- a/internal/server/routes.go +++ b/internal/server/routes.go @@ -64,7 +64,7 @@ func (s *Server) RegisterRoutes() http.Handler { e.GET("/dbtest", index.GetDBTest) e.GET("/health", index.HealthCheck) e.GET("/character", index.GetCharacter) - e.GET("/characters", index.GetCharacters) + e.GET("/characters", index.GetCharacterList) download := NewDownloadHandler() e.GET("/download", download.checkLatest)