ari/arimelody-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix silly admin routing nonsense

Browse source
This commit is contained in:
ari melody 2025-11-08 14:13:42 +00:00
parent 09c09b6310
commit a33e6717e0
Signed by: ari
GPG key ID: CF99829C92678188
6 changed files with 57 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

71
admin/music/releasehttp.go
View file

@ -13,41 +13,7 @@ import (
)
func serveReleases(app *model.AppState) http.Handler {
mux := http.NewServeMux()
mux.HandleFunc("/{id}/", func(w http.ResponseWriter, r *http.Request) {
releaseID := r.PathValue("id")
release, err := controller.GetRelease(app.DB, releaseID, true)
if err != nil {
if strings.Contains(err.Error(), "no rows") {
http.NotFound(w, r)
return
}
fmt.Fprintf(os.Stderr, "WARN: Failed to fetch full release data for %s: %s\n", releaseID, err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
mux := http.NewServeMux()
mux.Handle("/{id}/editcredits", serveEditCredits(release))
mux.Handle("/{id}/addcredit", serveAddCredit(app, release))
mux.Handle("/{id}/newcredit", serveNewCredit(app))
mux.Handle("/{id}/editlinks", serveEditLinks(release))
mux.Handle("/{id}/edittracks", serveEditTracks(release))
mux.Handle("/{id}/addtrack", serveAddTrack(app, release))
mux.Handle("/{id}/newtrack", serveNewTrack(app))
mux.ServeHTTP(w, r)
})
mux.HandleFunc("/{id}", func(w http.ResponseWriter, r *http.Request) {
serveRelease(app, r.PathValue("id")).ServeHTTP(w, r)
})
mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
session := r.Context().Value("session").(*model.Session)
type ReleasesData struct {
@ -75,14 +41,10 @@ func serveReleases(app *model.AppState) http.Handler {
return
}
})
return mux
}
func serveRelease(app *model.AppState, releaseID string) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
session := r.Context().Value("session").(*model.Session)
release, err := controller.GetRelease(app.DB, releaseID, true)
if err != nil {
if strings.Contains(err.Error(), "no rows") {
@ -94,6 +56,8 @@ func serveRelease(app *model.AppState, releaseID string) http.Handler {
return
}
session := r.Context().Value("session").(*model.Session)
type ReleaseResponse struct {
core.AdminPageData
Release *model.Release
@ -112,6 +76,35 @@ func serveRelease(app *model.AppState, releaseID string) http.Handler {
})
}
func serveEditRelease(app *model.AppState, releaseID string) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
release, err := controller.GetRelease(app.DB, releaseID, true)
if err != nil {
if strings.Contains(err.Error(), "no rows") {
http.NotFound(w, r)
return
}
fmt.Fprintf(os.Stderr, "WARN: Failed to fetch full release data for %s: %s\n", releaseID, err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
mux := http.NewServeMux()
mux.Handle("/music/releases/{id}/editcredits", serveEditCredits(release))
mux.Handle("/music/releases/{id}/addcredit", serveAddCredit(app, release))
mux.Handle("/music/releases/{id}/newcredit", serveNewCredit(app))
mux.Handle("/music/releases/{id}/editlinks", serveEditLinks(release))
mux.Handle("/music/releases/{id}/edittracks", serveEditTracks(release))
mux.Handle("/music/releases/{id}/addtrack", serveAddTrack(app, release))
mux.Handle("/music/releases/{id}/newtrack", serveNewTrack(app))
mux.ServeHTTP(w, r)
})
}
func serveEditCredits(release *model.Release) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "text/html")