jeremy/records
1
Fork 0
Code Releases Activity

server: make constructors concise

Browse source
This commit is contained in:
Jeremy Baxter 2026-01-10 21:24:52 +13:00
parent 8553658128
commit dcb8094403
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
server/pages.go
View file

@ -45,9 +45,7 @@ type IndexPage struct {
Showcase string Showcase string
} }
func MakeIndexPage() IndexPage { func MakeIndexPage() (p IndexPage) {
var p IndexPage
albums := musicindex.Albums() albums := musicindex.Albums()
rand.Shuffle(len(albums), func(i, j int) { rand.Shuffle(len(albums), func(i, j int) {
albums[i], albums[j] = albums[j], albums[i] albums[i], albums[j] = albums[j], albums[i]
@ -71,9 +69,11 @@ func MakeIndexPage() IndexPage {
} }
b.WriteString(`</div>`) b.WriteString(`</div>`)
} }
b.WriteString(`</div>`) b.WriteString(`</div>`)
p.Showcase = b.String() p.Showcase = b.String()
return p
return
} }
func (p IndexPage) SourceFile() string { return "base.html" } func (p IndexPage) SourceFile() string { return "base.html" }
@ -102,8 +102,7 @@ func ArtistSortOptions() []string {
return []string{"name", "albums", "songs"} return []string{"name", "albums", "songs"}
} }
func MakeArtistsPage(sortBy string) ArtistsPage { func MakeArtistsPage(sortBy string) (p ArtistsPage) {
var p ArtistsPage
var b strings.Builder var b strings.Builder
artistNames := musicindex.Artists() artistNames := musicindex.Artists()
@ -138,9 +137,11 @@ func MakeArtistsPage(sortBy string) ArtistsPage {
b.WriteString(fmt.Sprintf("<br>%d album%s, %d songs</li><br>", b.WriteString(fmt.Sprintf("<br>%d album%s, %d songs</li><br>",
albums, util.OptionalString(albums != 1, "s"), artist.Songs)) albums, util.OptionalString(albums != 1, "s"), artist.Songs))
} }
b.WriteString(`</div>`) b.WriteString(`</div>`)
p.bodyHTML = b.String() p.bodyHTML = b.String()
return p
return
} }
func (p ArtistsPage) SourceFile() string { return "base.html" } func (p ArtistsPage) SourceFile() string { return "base.html" }
@ -196,14 +197,13 @@ func writeAlbums(b *strings.Builder, sortBy string, albums []musicindex.Album, a
b.WriteString(`</tbody></table></div>`) b.WriteString(`</tbody></table></div>`)
} }
func MakeAlbumsPage(sortBy string) AlbumsPage { func MakeAlbumsPage(sortBy string) (p AlbumsPage) {
var p AlbumsPage
var b strings.Builder var b strings.Builder
writeAlbums(&b, sortBy, musicindex.Albums(), false) writeAlbums(&b, sortBy, musicindex.Albums(), false)
p.bodyHTML = b.String() p.bodyHTML = b.String()
return p return
} }
func (p AlbumsPage) SourceFile() string { return "base.html" } func (p AlbumsPage) SourceFile() string { return "base.html" }
@ -215,8 +215,7 @@ type ArtistPage struct {
bodyHTML string bodyHTML string
} }
func MakeArtistPage(sortBy string, name string) ArtistPage { func MakeArtistPage(sortBy string, name string) (p ArtistPage) {
var p ArtistPage
var b strings.Builder var b strings.Builder
artist := musicindex.FindArtist(name) artist := musicindex.FindArtist(name)
@ -227,7 +226,7 @@ func MakeArtistPage(sortBy string, name string) ArtistPage {
p.Artist = artist p.Artist = artist
p.bodyHTML = b.String() p.bodyHTML = b.String()
return p return
} }
func (p ArtistPage) SourceFile() string { return "base.html" } func (p ArtistPage) SourceFile() string { return "base.html" }
@ -239,8 +238,7 @@ type AlbumPage struct {
bodyHTML string bodyHTML string
} }
func MakeAlbumPage(album musicindex.Album) AlbumPage { func MakeAlbumPage(album musicindex.Album) (p AlbumPage) {
var p AlbumPage
var b strings.Builder var b strings.Builder
b.WriteString(`<br><div class="album"><div class="album-cover">`) b.WriteString(`<br><div class="album"><div class="album-cover">`)
@ -269,7 +267,7 @@ func MakeAlbumPage(album musicindex.Album) AlbumPage {
p.Album = album p.Album = album
p.bodyHTML = b.String() p.bodyHTML = b.String()
return p return
} }
func (p AlbumPage) SourceFile() string { return "base.html" } func (p AlbumPage) SourceFile() string { return "base.html" }