lyrics

commit c070e8dcd84851d54d6692a330ac88c973046cea
parent 6f8ba551a03b78160fd059a71ead3c2383ba74b2
Author: brookjeynes <me@brookjeynes.dev>
Date:   Sun,  7 Jun 2026 18:27:48 +1000

refactor: follow go style guides for "Get" functions

Signed-off-by: brookjeynes <me@brookjeynes.dev>

Diffstat:
M
internal/db/album.go
 | 
4
++--
M
internal/db/artist.go
 | 
8
++++----
M
internal/db/song.go
 | 
2
+-
M
internal/server/album.go
 | 
2
+-
M
internal/server/artist.go
 | 
2
+-
M
internal/server/song.go
 | 
2
+-

6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/internal/db/album.go b/internal/db/album.go
@@ -7,7 +7,7 @@ import (
 	"time"
 )
 
-func GetAlbum(e Execer, id domain.AlbumID) (domain.Album, error) {
+func Album(e Execer, id domain.AlbumID) (domain.Album, error) {
 	var album domain.Album
 	var releaseDateStr string
 
@@ -139,7 +139,7 @@ func GetAlbum(e Execer, id domain.AlbumID) (domain.Album, error) {
 
 	album.Songs = make([]domain.Song, 0, len(songRows))
 	for _, r := range songRows {
-		song, err := GetSong(e, r.songID)
+		song, err := Song(e, r.songID)
 		if err != nil {
 			return domain.Album{}, fmt.Errorf("failed to get song %d: %w", r.songID, err)
 		}
diff --git a/internal/db/artist.go b/internal/db/artist.go
@@ -7,7 +7,7 @@ import (
 	"time"
 )
 
-func GetArtist(e Execer, id domain.ArtistID) (domain.Artist, []domain.Album, []domain.Song, []domain.Song, error) {
+func Artist(e Execer, id domain.ArtistID) (domain.Artist, []domain.Album, []domain.Song, []domain.Song, error) {
 	var artist domain.Artist
 
 	err := e.QueryRow(`
@@ -50,7 +50,7 @@ func GetArtist(e Execer, id domain.ArtistID) (domain.Artist, []domain.Album, []d
 
 	albums := make([]domain.Album, 0, len(albumIDs))
 	for _, albumID := range albumIDs {
-		album, err := GetAlbum(e, albumID)
+		album, err := Album(e, albumID)
 		if err != nil {
 			return domain.Artist{}, nil, nil, nil, fmt.Errorf("failed to get album %d: %w", albumID, err)
 		}
@@ -90,7 +90,7 @@ func GetArtist(e Execer, id domain.ArtistID) (domain.Artist, []domain.Album, []d
 
 	singles := make([]domain.Song, 0, len(singleIDs))
 	for _, songID := range singleIDs {
-		song, err := GetSong(e, songID)
+		song, err := Song(e, songID)
 		if err != nil {
 			return domain.Artist{}, nil, nil, nil, fmt.Errorf("failed to get single %d: %w", songID, err)
 		}
@@ -129,7 +129,7 @@ func GetArtist(e Execer, id domain.ArtistID) (domain.Artist, []domain.Album, []d
 
 	featured := make([]domain.Song, 0, len(featuredIDs))
 	for _, songID := range featuredIDs {
-		song, err := GetSong(e, songID)
+		song, err := Song(e, songID)
 		if err != nil {
 			return domain.Artist{}, nil, nil, nil, fmt.Errorf("failed to get featured song %d: %w", songID, err)
 		}
diff --git a/internal/db/song.go b/internal/db/song.go
@@ -7,7 +7,7 @@ import (
 	"time"
 )
 
-func GetSong(e Execer, id domain.SongID) (domain.Song, error) {
+func Song(e Execer, id domain.SongID) (domain.Song, error) {
 	var song domain.Song
 	var releaseDateStr string
 
diff --git a/internal/server/album.go b/internal/server/album.go
@@ -27,7 +27,7 @@ func (ss *ServerState) Album(w http.ResponseWriter, r *http.Request) {
 	slug := r.PathValue("slug")
 	logger = logger.With("id", id, "slug", slug)
 
-	album, err := db.GetAlbum(ss.db, domain.AlbumID(id))
+	album, err := db.Album(ss.db, domain.AlbumID(id))
 	if err != nil {
 		logger.Error("failed to get album", "err", err)
 		htmx.HxError(w, http.StatusInternalServerError, fmt.Sprintf("failed to query for album '%s'", slug))
diff --git a/internal/server/artist.go b/internal/server/artist.go
@@ -27,7 +27,7 @@ func (ss *ServerState) Artist(w http.ResponseWriter, r *http.Request) {
 	slug := r.PathValue("slug")
 	logger = logger.With("id", id, "slug", slug)
 
-	artist, albums, singles, featured, err := db.GetArtist(ss.db, domain.ArtistID(id))
+	artist, albums, singles, featured, err := db.Artist(ss.db, domain.ArtistID(id))
 	if err != nil {
 		logger.Error("failed to get artist", "err", err)
 		htmx.HxError(w, http.StatusInternalServerError, fmt.Sprintf("failed to query for artist '%s'", slug))
diff --git a/internal/server/song.go b/internal/server/song.go
@@ -27,7 +27,7 @@ func (ss *ServerState) Song(w http.ResponseWriter, r *http.Request) {
 	slug := r.PathValue("slug")
 	logger = logger.With("id", id, "slug", slug)
 
-	s, err := db.GetSong(ss.db, domain.SongID(id))
+	s, err := db.Song(ss.db, domain.SongID(id))
 	if err != nil {
 		logger.Error("failed to get song", "err", err)
 		htmx.HxError(w, http.StatusInternalServerError, fmt.Sprintf("failed to query for song '%s'", slug))