diff --git a/consts/consts.go b/consts/consts.go index 416b566a1..39b6751de 100644 --- a/consts/consts.go +++ b/consts/consts.go @@ -1,6 +1,8 @@ package consts -import "time" +import ( + "time" +) const ( AppName = "navidrome" @@ -40,3 +42,8 @@ var ( }, } ) + +const ( + VariousArtists = "Various Artists" + UnknownArtist = "[Unknown Artist]" +) diff --git a/engine/common.go b/engine/common.go index 91ac4207f..e1089096d 100644 --- a/engine/common.go +++ b/engine/common.go @@ -4,6 +4,7 @@ import ( "fmt" "time" + "github.com/deluan/navidrome/consts" "github.com/deluan/navidrome/model" ) @@ -121,7 +122,7 @@ func FromMediaFile(mf *model.MediaFile) Entry { func realArtistName(mf *model.MediaFile) string { switch { case mf.Compilation: - return "Various Artists" + return consts.VariousArtists case mf.AlbumArtist != "": return mf.AlbumArtist } diff --git a/persistence/album_repository.go b/persistence/album_repository.go index b3165bc1d..5c3fa6ad5 100644 --- a/persistence/album_repository.go +++ b/persistence/album_repository.go @@ -6,6 +6,7 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" + "github.com/deluan/navidrome/consts" "github.com/deluan/navidrome/log" "github.com/deluan/navidrome/model" "github.com/deluan/rest" @@ -108,7 +109,7 @@ func (r *albumRepository) Refresh(ids ...string) error { al.CoverArtId = "" } if al.Compilation { - al.AlbumArtist = "Various Artists" + al.AlbumArtist = consts.VariousArtists } if al.AlbumArtist == "" { al.AlbumArtist = al.Artist diff --git a/persistence/artist_repository.go b/persistence/artist_repository.go index f5ee37d7d..256ef3304 100644 --- a/persistence/artist_repository.go +++ b/persistence/artist_repository.go @@ -8,6 +8,7 @@ import ( . "github.com/Masterminds/squirrel" "github.com/astaxie/beego/orm" "github.com/deluan/navidrome/conf" + "github.com/deluan/navidrome/consts" "github.com/deluan/navidrome/log" "github.com/deluan/navidrome/model" "github.com/deluan/navidrome/utils" @@ -128,7 +129,7 @@ func (r *artistRepository) Refresh(ids ...string) error { toUpdate := 0 for _, ar := range artists { if ar.Compilation { - ar.AlbumArtist = "Various Artists" + ar.AlbumArtist = consts.VariousArtists } if ar.AlbumArtist != "" { ar.Name = ar.AlbumArtist diff --git a/scanner/tag_scanner.go b/scanner/tag_scanner.go index 0eb3fd2e3..d01ca46cc 100644 --- a/scanner/tag_scanner.go +++ b/scanner/tag_scanner.go @@ -10,6 +10,7 @@ import ( "strings" "time" + "github.com/deluan/navidrome/consts" "github.com/deluan/navidrome/log" "github.com/deluan/navidrome/model" ) @@ -241,7 +242,7 @@ func (s *TagScanner) toMediaFile(md *Metadata) model.MediaFile { mf.AlbumID = s.albumID(md) mf.Album = s.mapAlbumName(md) if md.Artist() == "" { - mf.Artist = "[Unknown Artist]" + mf.Artist = consts.UnknownArtist } else { mf.Artist = md.Artist() } @@ -278,13 +279,13 @@ func (s *TagScanner) mapTrackTitle(md *Metadata) string { func (s *TagScanner) mapArtistName(md *Metadata) string { switch { case md.Compilation(): - return "Various Artists" + return consts.VariousArtists case md.AlbumArtist() != "": return md.AlbumArtist() case md.Artist() != "": return md.Artist() default: - return "[Unknown Artist]" + return consts.UnknownArtist } }