lots of post-DB cleanup
This commit is contained in:
parent
965d6f5c3e
commit
c9d950d2b2
23 changed files with 412 additions and 550 deletions
|
@ -12,7 +12,26 @@ import (
|
|||
"arimelody.me/arimelody.me/templates"
|
||||
)
|
||||
|
||||
// HTTP HANDLERS
|
||||
type (
|
||||
Track struct {
|
||||
Title string `json:"title"`
|
||||
Description string `json:"description"`
|
||||
Lyrics string `json:"lyrics"`
|
||||
}
|
||||
|
||||
Credit struct {
|
||||
*model.Artist
|
||||
Role string `json:"role"`
|
||||
Primary bool `json:"primary"`
|
||||
}
|
||||
|
||||
Release struct {
|
||||
model.Release
|
||||
Tracks []Track `json:"tracks"`
|
||||
Credits []Credit `json:"credits"`
|
||||
Links map[string]string `json:"links"`
|
||||
}
|
||||
)
|
||||
|
||||
func ServeRelease(release model.Release) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
|
@ -23,22 +42,65 @@ func ServeRelease(release model.Release) http.Handler {
|
|||
return
|
||||
}
|
||||
|
||||
fullRelease := &model.FullRelease{
|
||||
Release: &release,
|
||||
response := Release{
|
||||
Release: release,
|
||||
Tracks: []Track{},
|
||||
Credits: []Credit{},
|
||||
Links: make(map[string]string),
|
||||
}
|
||||
|
||||
if authorised || release.IsReleased() {
|
||||
fullerRelease, err := db.GetFullRelease(global.DB, &release)
|
||||
// get credits
|
||||
credits, err := db.GetReleaseCredits(global.DB, release.ID)
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: Failed to pull full release data for %s: %s\n", release.ID, err)
|
||||
fmt.Printf("FATAL: Failed to serve release %s: Credits: %s\n", release.ID, err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
fullRelease = fullerRelease
|
||||
for _, credit := range credits {
|
||||
artist, err := db.GetArtist(global.DB, credit.Artist.ID)
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: Failed to serve release %s: Artists: %s\n", release.ID, err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
response.Credits = append(response.Credits, Credit{
|
||||
Artist: artist,
|
||||
Role: credit.Role,
|
||||
Primary: credit.Primary,
|
||||
})
|
||||
}
|
||||
|
||||
// get tracks
|
||||
tracks, err := db.GetReleaseTracks(global.DB, release.ID)
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: Failed to serve release %s: Tracks: %s\n", release.ID, err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
for _, track := range tracks {
|
||||
response.Tracks = append(response.Tracks, Track{
|
||||
Title: track.Title,
|
||||
Description: track.Description,
|
||||
Lyrics: track.Lyrics,
|
||||
})
|
||||
}
|
||||
|
||||
// get links
|
||||
links, err := db.GetReleaseLinks(global.DB, release.ID)
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: Failed to serve release %s: Links: %s\n", release.ID, err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
for _, link := range links {
|
||||
response.Links[link.Name] = link.URL
|
||||
}
|
||||
}
|
||||
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
err := json.NewEncoder(w).Encode(fullRelease)
|
||||
err := json.NewEncoder(w).Encode(response)
|
||||
if err != nil {
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
return
|
||||
|
@ -60,7 +122,7 @@ func ServeGateway(release model.Release) http.Handler {
|
|||
}
|
||||
|
||||
if authorised || release.IsReleased() {
|
||||
fullerRelease, err := db.GetFullRelease(global.DB, &release)
|
||||
fullerRelease, err := db.GetFullRelease(global.DB, release.ID)
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: Failed to pull full release data for %s: %s\n", release.ID, err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue