add releases page; fix HUGE static file perf regression

admin/accounthttp.go

@@ -18,12 +18,12 @@ import (
 func accountHandler(app *model.AppState) http.Handler {
     mux := http.NewServeMux()
 
-    mux.Handle("/totp-setup", totpSetupHandler(app))
+    mux.Handle("/account/totp-setup", totpSetupHandler(app))
-    mux.Handle("/totp-confirm", totpConfirmHandler(app))
+    mux.Handle("/account/totp-confirm", totpConfirmHandler(app))
-    mux.Handle("/totp-delete/", http.StripPrefix("/totp-delete", totpDeleteHandler(app)))
+    mux.Handle("/account/totp-delete/", http.StripPrefix("/totp-delete", totpDeleteHandler(app)))
 
-    mux.Handle("/password", changePasswordHandler(app))
+    mux.Handle("/account/password", changePasswordHandler(app))
-    mux.Handle("/delete", deleteAccountHandler(app))
+    mux.Handle("/account/delete", deleteAccountHandler(app))
 
     return mux
 }

admin/artisthttp.go

@@ -10,9 +10,9 @@ import (
 	"arimelody-web/model"
 )
 
-func serveArtist(app *model.AppState) http.Handler {
+func serveArtists(app *model.AppState) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        slices := strings.Split(r.URL.Path[1:], "/")
+        slices := strings.Split(strings.TrimPrefix(r.URL.Path, "/artists")[1:], "/")
         id := slices[0]
         artist, err := controller.GetArtist(app.DB, id)
         if err != nil {

admin/http.go

@@ -47,15 +47,16 @@ func Handler(app *model.AppState) http.Handler {
     mux.Handle("/register", registerAccountHandler(app))
 
     mux.Handle("/account", requireAccount(accountIndexHandler(app)))
-    mux.Handle("/account/", requireAccount(http.StripPrefix("/account", accountHandler(app))))
+    mux.Handle("/account/", requireAccount(accountHandler(app)))
 
     mux.Handle("/logs", requireAccount(logsHandler(app)))
 
-    mux.Handle("/release/", requireAccount(http.StripPrefix("/release", serveRelease(app))))
+    mux.Handle("/releases", requireAccount(serveReleases(app)))
-    mux.Handle("/artist/", requireAccount(http.StripPrefix("/artist", serveArtist(app))))
+    mux.Handle("/releases/", requireAccount(serveReleases(app)))
-    mux.Handle("/track/", requireAccount(http.StripPrefix("/track", serveTrack(app))))
+    mux.Handle("/artists/", requireAccount(serveArtists(app)))
+    mux.Handle("/tracks/", requireAccount(serveTracks(app)))
 
-    mux.Handle("/static/", http.StripPrefix("/static", staticHandler()))
+    mux.Handle("/static/", staticHandler())
 
     mux.Handle("/", requireAccount(AdminIndexHandler(app)))
 
@@ -470,7 +471,8 @@ var staticFS embed.FS
 
 func staticHandler() http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        file, err := staticFS.ReadFile(filepath.Join("static", filepath.Clean(r.URL.Path)))
+        uri := strings.TrimPrefix(r.URL.Path, "/static")
+        file, err := staticFS.ReadFile(filepath.Join("static", filepath.Clean(uri)))
         if err != nil {
             http.NotFound(w, r)
             return

admin/releasehttp.go

@@ -3,6 +3,7 @@ package admin
 import (
 	"fmt"
 	"net/http"
+	"os"
 	"strings"
 
 	"arimelody-web/admin/templates"
@@ -10,11 +11,52 @@ import (
 	"arimelody-web/model"
 )
 
-func serveRelease(app *model.AppState) http.Handler {
+func serveReleases(app *model.AppState) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        slices := strings.Split(r.URL.Path[1:], "/")
+        slices := strings.Split(strings.TrimPrefix(r.URL.Path, "/releases")[1:], "/")
         releaseID := slices[0]
 
+        var action string = ""
+        if len(slices) > 1 {
+            action = slices[1]
+        }
+
+        if len(releaseID) > 0 {
+            serveRelease(app, releaseID, action).ServeHTTP(w, r)
+            return
+        }
+
+        session := r.Context().Value("session").(*model.Session)
+
+        type ReleasesData struct {
+            adminPageData
+            Releases    []*model.Release
+        }
+
+        releases, err := controller.GetAllReleases(app.DB, false, 0, true)
+        if err != nil {
+            fmt.Fprintf(os.Stderr, "WARN: Failed to pull releases: %s\n", err)
+            http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+            return
+        }
+
+        err = templates.ReleasesTemplate.Execute(w, ReleasesData{
+            adminPageData: adminPageData{
+                Path: r.URL.Path,
+                Session: session,
+            },
+            Releases: releases,
+        })
+        if err != nil {
+            fmt.Fprintf(os.Stderr, "WARN: Failed to render releases page: %s\n", err)
+            http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+            return
+        }
+    })
+}
+
+func serveRelease(app *model.AppState, releaseID string, action 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)
@@ -28,8 +70,8 @@ func serveRelease(app *model.AppState) http.Handler {
             return
         }
 
-        if len(slices) > 1 {
+        if len(action) > 0 {
-            switch slices[1] {
+            switch action {
             case "editcredits":
                 serveEditCredits(release).ServeHTTP(w, r)
                 return

admin/static/index.js

@@ -14,7 +14,7 @@ newReleaseBtn.addEventListener("click", event => {
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({id})
     }).then(res => {
-        if (res.ok) location = "/admin/release/" + id;
+        if (res.ok) location = "/admin/releases/" + id;
         else {
             res.text().then(err => {
                 alert("Request failed: " + err);
@@ -39,7 +39,7 @@ newArtistBtn.addEventListener("click", event => {
     }).then(res => {
         res.text().then(text => {
             if (res.ok) {
-                location = "/admin/artist/" + id;
+                location = "/admin/artists/" + id;
             } else {
                 alert("Request failed: " + text);
                 console.error(text);
@@ -63,7 +63,7 @@ newTrackBtn.addEventListener("click", event => {
     }).then(res => {
         res.text().then(text => {
             if (res.ok) {
-                location = "/admin/track/" + text;
+                location = "/admin/tracks/" + text;
             } else {
                 alert("Request failed: " + text);
                 console.error(text);

admin/templates/html/artists.html

@@ -0,0 +1,30 @@
+{{define "head"}}
+<title>Artists - ari melody 💫</title>
+<link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
+<link rel="stylesheet" href="/admin/static/index.css">
+{{end}}
+
+{{define "content"}}
+<main>
+    <h1>Artists</h1>
+
+    <div class="card-header">
+        <h2><a href="/admin/artists/">Artists</a></h2>
+        <a class="button new" id="create-artist">Create New</a>
+    </div>
+    {{if .Artists}}
+    <div class="artists-group">
+        {{range $Artist := .Artists}}
+        <div class="artist">
+            <img src="{{$Artist.GetAvatar}}" alt="" width="64" loading="lazy" class="artist-avatar">
+            <a href="/admin/artists/{{$Artist.ID}}" class="artist-name">{{$Artist.Name}}</a>
+        </div>       
+        {{end}}
+    </div>
+    {{else}}
+    <p>There are no artists.</p>
+    {{end}}
+</main>
+
+<script type="module" src="/admin/static/admin.js"></script>
+{{end}}

admin/templates/html/components/credits/addcredit.html

@@ -7,7 +7,7 @@
         {{range $Artist := .Artists}}
         <li class="new-artist"
             data-id="{{$Artist.ID}}"
-            hx-get="/admin/release/{{$.ReleaseID}}/newcredit/{{$Artist.ID}}"
+            hx-get="/admin/releases/{{$.ReleaseID}}/newcredit/{{$Artist.ID}}"
             hx-target="#editcredits ul"
             hx-swap="beforeend"
         >

admin/templates/html/components/credits/editcredits.html

@@ -3,8 +3,8 @@
         <h2>Editing: Credits</h2>
         <a id="add-credit"
            class="button new"
-           href="/admin/release/{{.ID}}/addcredit"
+           href="/admin/releases/{{.ID}}/addcredit"
-           hx-get="/admin/release/{{.ID}}/addcredit"
+           hx-get="/admin/releases/{{.ID}}/addcredit"
            hx-target="body"
            hx-swap="beforeend"
         >Add</a>

admin/templates/html/components/release/release-list-item.html

@@ -5,7 +5,7 @@
     </div>
     <div class="release-info">
         <h3 class="release-title">
-            <a href="/admin/release/{{.ID}}">{{.Title}}</a>
+            <a href="/admin/releases/{{.ID}}">{{.Title}}</a>
             <small>
                 <span title="{{.PrintReleaseDate}}">{{.ReleaseDate.Year}}</span>
                 {{if not .Visible}}(hidden){{end}}
@@ -13,9 +13,9 @@
         </h3>
         <p class="release-artists">{{.PrintArtists true true}}</p>
         <p class="release-type-single">{{.ReleaseType}}
-        (<a href="/admin/release/{{.ID}}#tracks">{{len .Tracks}} track{{if not (eq (len .Tracks) 1)}}s{{end}}</a>)</p>
+        (<a href="/admin/releases/{{.ID}}#tracks">{{len .Tracks}} track{{if not (eq (len .Tracks) 1)}}s{{end}}</a>)</p>
         <div class="release-actions">
-            <a href="/admin/release/{{.ID}}">Edit</a>
+            <a href="/admin/releases/{{.ID}}">Edit</a>
             <a href="/music/{{.ID}}" target="_blank">Gateway <img class="icon" src="/img/external-link.svg"/></a>
         </div>
     </div>

admin/templates/html/components/tracks/addtrack.html

@@ -8,7 +8,7 @@
         </li>
         <li class="new-track"
             data-id="{{$Track.ID}}"
-            hx-get="/admin/release/{{$.ReleaseID}}/newtrack/{{$Track.ID}}"
+            hx-get="/admin/releases/{{$.ReleaseID}}/newtrack/{{$Track.ID}}"
             hx-target="#edittracks ul"
             hx-swap="beforeend"
         >

admin/templates/html/components/tracks/edittracks.html

@@ -3,8 +3,8 @@
         <h2>Editing: Tracks</h2>
         <a id="add-track"
            class="button new"
-           href="/admin/release/{{.Release.ID}}/addtrack"
+           href="/admin/releases/{{.Release.ID}}/addtrack"
-           hx-get="/admin/release/{{.Release.ID}}/addtrack"
+           hx-get="/admin/releases/{{.Release.ID}}/addtrack"
            hx-target="body"
            hx-swap="beforeend"
         >Add</a>

admin/templates/html/edit-artist.html

@@ -38,7 +38,7 @@
         <div class="credit">
             <img src="{{.Release.Artwork}}" alt="" width="64" loading="lazy" class="release-artwork">
             <div class="credit-info">
-                <h3 class="credit-name"><a href="/admin/release/{{.Release.ID}}">{{.Release.Title}}</a></h3>
+                <h3 class="credit-name"><a href="/admin/releases/{{.Release.ID}}">{{.Release.Title}}</a></h3>
                 <p class="credit-artists">{{.Release.PrintArtists true true}}</p>
                 <p class="artist-role">
                 Role: {{.Role}}

admin/templates/html/edit-release.html

@@ -101,8 +101,8 @@
         <div class="card-header">
             <h2>Credits <small>({{len .Release.Credits}} total)</small></h2>
             <a class="button edit"
-               href="/admin/release/{{.Release.ID}}/editcredits"
+               href="/admin/releases/{{.Release.ID}}/editcredits"
-               hx-get="/admin/release/{{.Release.ID}}/editcredits"
+               hx-get="/admin/releases/{{.Release.ID}}/editcredits"
                hx-target="body"
                hx-swap="beforeend"
                >Edit</a>
@@ -111,7 +111,7 @@
         <div class="credit">
             <img src="{{.Artist.GetAvatar}}" alt="" width="64" loading="lazy" class="artist-avatar">
             <div class="credit-info">
-                <p class="artist-name"><a href="/admin/artist/{{.Artist.ID}}">{{.Artist.Name}}</a></p>
+                <p class="artist-name"><a href="/admin/artists/{{.Artist.ID}}">{{.Artist.Name}}</a></p>
                 <p class="artist-role">
                 {{.Role}}
                 {{if .Primary}}
@@ -130,8 +130,8 @@
         <div class="card-header">
             <h2>Links ({{len .Release.Links}})</h2>
             <a class="button edit"
-               href="/admin/release/{{.Release.ID}}/editlinks"
+               href="/admin/releases/{{.Release.ID}}/editlinks"
-               hx-get="/admin/release/{{.Release.ID}}/editlinks"
+               hx-get="/admin/releases/{{.Release.ID}}/editlinks"
                hx-target="body"
                hx-swap="beforeend"
                >Edit</a>
@@ -147,8 +147,8 @@
         <div class="card-header" id="tracks">
             <h2>Tracklist ({{len .Release.Tracks}})</h2>
             <a class="button edit"
-               href="/admin/release/{{.Release.ID}}/edittracks"
+               href="/admin/releases/{{.Release.ID}}/edittracks"
-               hx-get="/admin/release/{{.Release.ID}}/edittracks"
+               hx-get="/admin/releases/{{.Release.ID}}/edittracks"
                hx-target="body"
                hx-swap="beforeend"
                >Edit</a>
@@ -157,7 +157,7 @@
         <div class="track" data-id="{{$track.ID}}">
             <h2 class="track-title">
                 <span class="track-number">{{.Add $i 1}}</span>
-                <a href="/admin/track/{{$track.ID}}">{{$track.Title}}</a>
+                <a href="/admin/tracks/{{$track.ID}}">{{$track.Title}}</a>
             </h2>
 
             <h3>Description</h3>

admin/templates/html/index.html

@@ -32,7 +32,7 @@
                 {{range $Artist := .Artists}}
                 <div class="artist">
                     <img src="{{$Artist.GetAvatar}}" alt="" width="64" loading="lazy" class="artist-avatar">
-                    <a href="/admin/artist/{{$Artist.ID}}" class="artist-name">{{$Artist.Name}}</a>
+                    <a href="/admin/artists/{{$Artist.ID}}" class="artist-name">{{$Artist.Name}}</a>
                 </div>       
                 {{end}}
             </div>
@@ -51,7 +51,7 @@
             {{range $Track := .Tracks}}
             <div class="track">
                 <h2 class="track-title">
-                    <a href="/admin/track/{{$Track.ID}}">{{$Track.Title}}</a>
+                    <a href="/admin/tracks/{{$Track.ID}}">{{$Track.Title}}</a>
                 </h2>
                 {{if $Track.Description}}
                 <p class="track-description">{{$Track.GetDescriptionHTML}}</p>

admin/templates/html/layout.html

@@ -28,14 +28,14 @@
                 </div>
                 <hr>
                 <p class="section-label">music</p>
-                <div class="nav-item{{if eq .Path "/releases"}} active{{end}}">
+                <div class="nav-item{{if hasPrefix .Path "/releases"}} active{{end}}">
-                    <a href="/admin/releases">releases</a>
+                    <a href="/admin/releases/">releases</a>
                 </div>
-                <div class="nav-item{{if eq .Path "/artists"}} active{{end}}">
+                <div class="nav-item{{if hasPrefix .Path "/artists"}} active{{end}}">
-                    <a href="/admin/artists">artists</a>
+                    <a href="/admin/artists/">artists</a>
                 </div>
-                <div class="nav-item{{if eq .Path "/tracks"}} active{{end}}">
+                <div class="nav-item{{if hasPrefix .Path "/tracks"}} active{{end}}">
-                    <a href="/admin/tracks">tracks</a>
+                    <a href="/admin/tracks/">tracks</a>
                 </div>
                 {{end}}
 

admin/templates/html/releases.html

@@ -0,0 +1,22 @@
+{{define "head"}}
+<title>Releases - ari melody 💫</title>
+<link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
+<link rel="stylesheet" href="/admin/static/index.css">
+{{end}}
+
+{{define "content"}}
+<main>
+    <div class="card-header">
+        <h1><a href="/admin/releases/">Releases</a></h1>
+        <a class="button new" id="create-release">Create New</a>
+    </div>
+    {{range .Releases}}
+    {{block "release" .}}{{end}}
+    {{end}}
+    {{if not .Releases}}
+    <p>There are no releases.</p>
+    {{end}}
+</main>
+
+<script type="module" src="/admin/static/admin.js"></script>
+{{end}}

admin/templates/html/tracks.html

@@ -0,0 +1,40 @@
+{{define "head"}}
+<title>Releases - ari melody 💫</title>
+<link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
+<link rel="stylesheet" href="/admin/static/index.css">
+{{end}}
+
+{{define "content"}}
+<main>
+    <h1>Releases</h1>
+
+    <div class="card-header">
+        <h2><a href="/admin/tracks/">Tracks</a></h2>
+        <a class="button new" id="create-track">Create New</a>
+    </div>
+    <p><em>"Orphaned" tracks that have not yet been bound to a release.</em></p>
+    <br>
+    {{range $Track := .Tracks}}
+    <div class="track">
+        <h2 class="track-title">
+            <a href="/admin/tracks/{{$Track.ID}}">{{$Track.Title}}</a>
+        </h2>
+        {{if $Track.Description}}
+        <p class="track-description">{{$Track.GetDescriptionHTML}}</p>
+        {{else}}
+        <p class="track-description empty">No description provided.</p>
+        {{end}}
+        {{if $Track.Lyrics}}
+        <p class="track-lyrics">{{$Track.GetLyricsHTML}}</p>
+        {{else}}
+        <p class="track-lyrics empty">There are no lyrics.</p>
+        {{end}}
+    </div>       
+    {{end}}
+    {{if not .Artists}}
+    <p>There are no artists.</p>
+    {{end}}
+</main>
+
+<script type="module" src="/admin/static/admin.js"></script>
+{{end}}

admin/templates/templates.go

@@ -2,11 +2,11 @@ package templates
 
 import (
 	"arimelody-web/log"
+	_ "embed"
 	"fmt"
 	"html/template"
 	"strings"
 	"time"
-    _ "embed"
 )
 
 //go:embed "html/layout.html"
@@ -35,10 +35,18 @@ var logsHTML string
 
 //go:embed "html/edit-account.html"
 var editAccountHTML string
-//go:embed "html/edit-artist.html"
+
-var editArtistHTML string
+//go:embed "html/releases.html"
+var releasesHTML string
+//go:embed "html/artists.html"
+var artistsHTML string
+//go:embed "html/tracks.html"
+var tracksHTML string
+
 //go:embed "html/edit-release.html"
 var editReleaseHTML string
+//go:embed "html/edit-artist.html"
+var editArtistHTML string
 //go:embed "html/edit-track.html"
 var editTrackHTML string
 
@@ -62,9 +70,18 @@ var componentAddTrackHTML string
 //go:embed "html/components/tracks/edittracks.html"
 var componentEditTracksHTML string
 
-var BaseTemplate = template.Must(template.New("base").Parse(
+var BaseTemplate = template.Must(
-    strings.Join([]string{ layoutHTML, prideflagHTML }, "\n"),
+    template.New("base").Funcs(
-))
+        template.FuncMap{
+            "hasPrefix": func(s string, prefix string) bool {
+                fmt.Printf("does \"%s\" start with \"%s\"?\n", s, prefix)
+                return strings.HasPrefix(s, prefix)
+            },
+        },
+    ).Parse(strings.Join([]string{
+        layoutHTML,
+        prideflagHTML,
+    }, "\n")))
 
 var IndexTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(
     strings.Join([]string{
@@ -108,6 +125,15 @@ var LogsTemplate = template.Must(template.Must(BaseTemplate.Clone()).Funcs(templ
     },
 }).Parse(logsHTML))
 
+var ReleasesTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(
+    strings.Join([]string{
+        releasesHTML,
+        componentReleaseListItemHTML,
+    }, "\n"),
+))
+var ArtistsTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(artistsHTML))
+var TracksTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(tracksHTML))
+
 var EditReleaseTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(editReleaseHTML))
 var EditArtistTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(editArtistHTML))
 var EditTrackTemplate = template.Must(template.Must(BaseTemplate.Clone()).Parse(

admin/trackhttp.go

@@ -10,9 +10,9 @@ import (
 	"arimelody-web/model"
 )
 
-func serveTrack(app *model.AppState) http.Handler {
+func serveTracks(app *model.AppState) http.Handler {
     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-        slices := strings.Split(r.URL.Path[1:], "/")
+        slices := strings.Split(strings.TrimPrefix(r.URL.Path, "/tracks")[1:], "/")
         id := slices[0]
         track, err := controller.GetTrack(app.DB, id)
         if err != nil {

view/index.go

@@ -16,10 +16,10 @@ func IndexHandler(app *model.AppState) http.Handler {
             return
         }
 
+        if r.URL.Path == "/" || r.URL.Path == "/index.html" {
             type IndexData struct {
                 TwitchStatus *model.TwitchStreamInfo
             }
-
             var err error
             var twitchStatus *model.TwitchStreamInfo = nil
             if app.Twitch != nil && len(app.Config.Twitch.Broadcaster) > 0 {
@@ -28,9 +28,7 @@ func IndexHandler(app *model.AppState) http.Handler {
                     fmt.Fprintf(os.Stderr, "WARN: Failed to get Twitch status for %s: %v\n", app.Config.Twitch.Broadcaster, err)
                 }
             }
-
+            err = templates.IndexTemplate.Execute(w, IndexData{
-        if r.URL.Path == "/" || r.URL.Path == "/index.html" {
-            err := templates.IndexTemplate.Execute(w, IndexData{
                 TwitchStatus: twitchStatus,
             })
             if err != nil {