turns out rewriting all of your database code takes a while

This commit is contained in:
ari melody 2024-09-01 04:43:32 +01:00
parent 1998a36d6d
commit 965d6f5c3e
30 changed files with 947 additions and 1036 deletions

View file

@ -1,10 +1,13 @@
package view
import (
"fmt"
"net/http"
"arimelody.me/arimelody.me/global"
music "arimelody.me/arimelody.me/music/controller"
"arimelody.me/arimelody.me/music/model"
"arimelody.me/arimelody.me/templates"
)
// HTTP HANDLER METHODS
@ -17,7 +20,15 @@ func Handler() http.Handler {
ServeCatalog().ServeHTTP(w, r)
return
}
ServeGateway().ServeHTTP(w, r)
var release model.Release
err := global.DB.Get(&release, "SELECT * FROM musicrelease WHERE id=$1", r.URL.Path[1:])
if err != nil {
http.NotFound(w, r)
return
}
ServeGateway(release).ServeHTTP(w, r)
}))
return mux
@ -25,71 +36,30 @@ func Handler() http.Handler {
func ServeCatalog() http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
releases := []model.Release{}
for _, r := range global.Releases {
if r.Visible {
release := *r
if !release.IsReleased() {
release.ReleaseType = model.Upcoming
}
releases = append(releases, release)
}
}
global.ServeTemplate("music.html", releases).ServeHTTP(w, r)
})
}
/*
func ServeArtwork() http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path == "/" {
http.NotFound(w, r)
return
}
if !strings.HasSuffix(r.URL.Path, ".png") {
http.NotFound(w, r)
return
}
releaseID := r.URL.Path[1:len(r.URL.Path) - 4]
var release = GetRelease(releaseID)
if release == nil {
http.NotFound(w, r)
return
}
// only allow authorised users to view unreleased releases
authorised := r.Context().Value("role") != nil && r.Context().Value("role") == "admin"
if !release.IsReleased() && !authorised {
admin.MustAuthorise(ServeArtwork()).ServeHTTP(w, r)
return
}
fp := filepath.Join("data", "music-artwork", releaseID + ".png")
info, err := os.Stat(fp)
if err != nil {
if os.IsNotExist(err) {
http.NotFound(w, r)
return
}
}
length := info.Size()
file, err := os.Open(fp)
dbReleases, err := music.GetAllReleases(global.DB)
if err != nil {
fmt.Printf("FATAL: Failed to pull releases for catalog: %s\n", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
defer file.Close()
releases := []*model.FullRelease{}
for _, dbRelease := range dbReleases {
if !dbRelease.Visible { continue }
if !dbRelease.IsReleased() {
dbRelease.ReleaseType = model.Upcoming
}
release, err := music.GetFullRelease(global.DB, dbRelease)
if err != nil {
fmt.Printf("FATAL: Failed to pull full release for %s: %s\n", dbRelease.ID, err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
releases = append(releases, release)
}
var bytes = make([]byte, length)
file.Read(bytes)
w.Header().Add("Content-Type", "image/png")
w.WriteHeader(http.StatusOK)
w.Write(bytes)
err = templates.Pages["music"].Execute(w, releases)
if err != nil {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
}
})
}
*/