fix: restore old date display/sort behaviour (#3862)

* fix(server): bring back legacy date mappings

Signed-off-by: Deluan <deluan@navidrome.org>

* reuse the mapDates logic in the legacyReleaseDate function

Signed-off-by: Deluan <deluan@navidrome.org>

* fix mappings

Signed-off-by: Deluan <deluan@navidrome.org>

* show original and release dates in album grid

Signed-off-by: Deluan <deluan@navidrome.org>

* fix tests based on new year mapping

Signed-off-by: Deluan <deluan@navidrome.org>

* fix(subsonic): prefer returning original_year over (recording) year
when sorting albums

Signed-off-by: Deluan <deluan@navidrome.org>

* fix case when we don't have originalYear

Signed-off-by: Deluan <deluan@navidrome.org>

* show all dates in album's info, and remove the recording date from the album page

Signed-off-by: Deluan <deluan@navidrome.org>

* better?

Signed-off-by: Deluan <deluan@navidrome.org>

* add snapshot tests for Album Details

Signed-off-by: Deluan <deluan@navidrome.org>

* fix(subsonic): sort order for getAlbumList?type=byYear

Signed-off-by: Deluan <deluan@navidrome.org>

---------

Signed-off-by: Deluan <deluan@navidrome.org>

.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
 		"dockerfile": "Dockerfile",
 		"args": {
 			// Update the VARIANT arg to pick a version of Go: 1, 1.15, 1.14
-			"VARIANT": "1.23",
+			"VARIANT": "1.24",
 			// Options
 			"INSTALL_NODE": "true",
 			"NODE_VERSION": "v20"

Dockerfile

@@ -61,7 +61,7 @@ COPY --from=ui /build /build
 
 ########################################################################################################################
 ### Build Navidrome binary
-FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.23-bookworm AS base
+FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.24-bookworm AS base
 RUN apt-get update && apt-get install -y clang lld
 COPY --from=xx / /
 WORKDIR /workspace
@@ -133,12 +133,12 @@ COPY --from=build /out/navidrome /app/
 VOLUME ["/data", "/music"]
 ENV ND_MUSICFOLDER=/music
 ENV ND_DATAFOLDER=/data
+ENV ND_CONFIGFILE=/data/navidrome.toml
 ENV ND_PORT=4533
 ENV GODEBUG="asyncpreemptoff=1"
 RUN touch /.nddockerenv
 
 EXPOSE ${ND_PORT}
-HEALTHCHECK CMD wget -O- http://localhost:${ND_PORT}/ping || exit 1
 WORKDIR /app
 
 ENTRYPOINT ["/app/navidrome"]

Makefile

@@ -29,11 +29,11 @@ dev: check_env   ##@Development Start Navidrome in development mode, with hot-re
 .PHONY: dev
 
 server: check_go_env buildjs ##@Development Start the backend in development mode
-	@ND_ENABLEINSIGHTSCOLLECTOR="false" go run github.com/cespare/reflex@latest -d none -c reflex.conf
+	@ND_ENABLEINSIGHTSCOLLECTOR="false" go tool reflex -d none -c reflex.conf
 .PHONY: server
 
 watch: ##@Development Start Go tests in watch mode (re-run when code changes)
-	go run github.com/onsi/ginkgo/v2/ginkgo@latest watch -tags=netgo -notify ./...
+	go tool ginkgo watch -tags=netgo -notify ./...
 .PHONY: watch
 
 test: ##@Development Run Go tests
@@ -59,16 +59,16 @@ lintall: lint ##@Development Lint Go and JS code
 
 format: ##@Development Format code
 	@(cd ./ui && npm run prettier)
-	@go run golang.org/x/tools/cmd/goimports@latest -w `find . -name '*.go' | grep -v _gen.go$$`
+	@go tool goimports -w `find . -name '*.go' | grep -v _gen.go$$`
 	@go mod tidy
 .PHONY: format
 
 wire: check_go_env ##@Development Update Dependency Injection
-	go run github.com/google/wire/cmd/wire@latest gen -tags=netgo ./...
+	go tool wire gen -tags=netgo ./...
 .PHONY: wire
 
 snapshots: ##@Development Update (GoLang) Snapshot tests
-	UPDATE_SNAPSHOTS=true go run github.com/onsi/ginkgo/v2/ginkgo@latest ./server/subsonic/responses/...
+	UPDATE_SNAPSHOTS=true go tool ginkgo ./server/subsonic/responses/...
 .PHONY: snapshots
 
 migration-sql: ##@Development Create an empty SQL migration file

Procfile.dev

@@ -1,2 +1,2 @@
 JS: sh -c "cd ./ui && npm start"
-GO: go run github.com/cespare/reflex@latest -d none -c reflex.conf
+GO: go tool reflex -d none -c reflex.conf

adapters/taglib/taglib_wrapper.cpp

@@ -201,41 +201,42 @@ int taglib_read(const FILENAME_CHAR_T *filename, unsigned long id) {
 char has_cover(const TagLib::FileRef f) {
   char hasCover = 0;
   // ----- MP3
-  if (TagLib::MPEG::File *
-      mp3File{dynamic_cast<TagLib::MPEG::File *>(f.file())}) {
+  if (TagLib::MPEG::File * mp3File{dynamic_cast<TagLib::MPEG::File *>(f.file())}) {
     if (mp3File->ID3v2Tag()) {
       const auto &frameListMap{mp3File->ID3v2Tag()->frameListMap()};
       hasCover = !frameListMap["APIC"].isEmpty();
     }
   }
   // ----- FLAC
-  else if (TagLib::FLAC::File *
-           flacFile{dynamic_cast<TagLib::FLAC::File *>(f.file())}) {
+  else if (TagLib::FLAC::File * flacFile{dynamic_cast<TagLib::FLAC::File *>(f.file())}) {
     hasCover = !flacFile->pictureList().isEmpty();
   }
   // ----- MP4
-  else if (TagLib::MP4::File *
-           mp4File{dynamic_cast<TagLib::MP4::File *>(f.file())}) {
+  else if (TagLib::MP4::File * mp4File{dynamic_cast<TagLib::MP4::File *>(f.file())}) {
     auto &coverItem{mp4File->tag()->itemMap()["covr"]};
     TagLib::MP4::CoverArtList coverArtList{coverItem.toCoverArtList()};
     hasCover = !coverArtList.isEmpty();
   }
   // ----- Ogg
-  else if (TagLib::Ogg::Vorbis::File *
-           vorbisFile{dynamic_cast<TagLib::Ogg::Vorbis::File *>(f.file())}) {
+  else if (TagLib::Ogg::Vorbis::File * vorbisFile{dynamic_cast<TagLib::Ogg::Vorbis::File *>(f.file())}) {
     hasCover = !vorbisFile->tag()->pictureList().isEmpty();
   }
   // ----- Opus
-  else if (TagLib::Ogg::Opus::File *
-           opusFile{dynamic_cast<TagLib::Ogg::Opus::File *>(f.file())}) {
+  else if (TagLib::Ogg::Opus::File * opusFile{dynamic_cast<TagLib::Ogg::Opus::File *>(f.file())}) {
     hasCover = !opusFile->tag()->pictureList().isEmpty();
   }
   // ----- WMA
-  if (TagLib::ASF::File *
-      asfFile{dynamic_cast<TagLib::ASF::File *>(f.file())}) {
+  else if (TagLib::ASF::File * asfFile{dynamic_cast<TagLib::ASF::File *>(f.file())}) {
     const TagLib::ASF::Tag *tag{asfFile->tag()};
     hasCover = tag && tag->attributeListMap().contains("WM/Picture");
   }
+  // ----- WAV
+  else if (TagLib::RIFF::WAV::File * wavFile{ dynamic_cast<TagLib::RIFF::WAV::File*>(f.file()) }) {
+    if (wavFile->hasID3v2Tag()) {
+        const auto& frameListMap{ wavFile->ID3v2Tag()->frameListMap() };
+        hasCover = !frameListMap["APIC"].isEmpty();
+    }
+  }
 
   return hasCover;
 }

conf/configuration.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/bmatcuk/doublestar/v4"
+	"github.com/go-viper/encoding/ini"
 	"github.com/kr/pretty"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/log"
@@ -128,7 +129,9 @@ type scannerOptions struct {
 	WatcherWait        time.Duration
 	ScanOnStartup      bool
 	Extractor          string
-	GroupAlbumReleases bool // Deprecated: BFR Update docs
+	ArtistJoiner       string
+	GenreSeparators    string // Deprecated: Use Tags.genre.Split instead
+	GroupAlbumReleases bool   // Deprecated: Use PID.Album instead
 }
 
 type subsonicOptions struct {
@@ -139,6 +142,7 @@ type subsonicOptions struct {
 }
 
 type TagConf struct {
+	Ignore    bool     `yaml:"ignore"`
 	Aliases   []string `yaml:"aliases"`
 	Type      string   `yaml:"type"`
 	MaxLength int      `yaml:"maxLength"`
@@ -302,11 +306,11 @@ func Load(noConfigDump bool) {
 		disableExternalServices()
 	}
 
-	// BFR Remove before release
 	if Server.Scanner.Extractor != consts.DefaultScannerExtractor {
 		log.Warn(fmt.Sprintf("Extractor '%s' is not implemented, using 'taglib'", Server.Scanner.Extractor))
 		Server.Scanner.Extractor = consts.DefaultScannerExtractor
 	}
+	logDeprecatedOptions("Scanner.GenreSeparators")
 	logDeprecatedOptions("Scanner.GroupAlbumReleases")
 
 	// Call init hooks
@@ -489,9 +493,11 @@ func init() {
 	viper.SetDefault("scanner.enabled", true)
 	viper.SetDefault("scanner.schedule", "0")
 	viper.SetDefault("scanner.extractor", consts.DefaultScannerExtractor)
-	viper.SetDefault("scanner.groupalbumreleases", false)
 	viper.SetDefault("scanner.watcherwait", consts.DefaultWatcherWait)
 	viper.SetDefault("scanner.scanonstartup", true)
+	viper.SetDefault("scanner.artistjoiner", consts.ArtistJoiner)
+	viper.SetDefault("scanner.genreseparators", "")
+	viper.SetDefault("scanner.groupalbumreleases", false)
 
 	viper.SetDefault("subsonic.appendsubtitle", true)
 	viper.SetDefault("subsonic.artistparticipations", false)
@@ -545,6 +551,10 @@ func init() {
 }
 
 func InitConfig(cfgFile string) {
+	codecRegistry := viper.NewCodecRegistry()
+	_ = codecRegistry.RegisterCodec("ini", ini.Codec{})
+	viper.SetOptions(viper.WithCodecRegistry(codecRegistry))
+
 	cfgFile = getConfigFile(cfgFile)
 	if cfgFile != "" {
 		// Use config file from the flag.
@@ -568,9 +578,17 @@ func InitConfig(cfgFile string) {
 	}
 }
 
+// getConfigFile returns the path to the config file, either from the flag or from the environment variable.
+// If it is defined in the environment variable, it will check if the file exists.
 func getConfigFile(cfgFile string) string {
 	if cfgFile != "" {
 		return cfgFile
 	}
-	return os.Getenv("ND_CONFIGFILE")
+	cfgFile = os.Getenv("ND_CONFIGFILE")
+	if cfgFile != "" {
+		if _, err := os.Stat(cfgFile); err == nil {
+			return cfgFile
+		}
+	}
+	return ""
 }

conf/configuration_test.go

@@ -0,0 +1,50 @@
+package conf_test
+
+import (
+	"fmt"
+	"path/filepath"
+	"testing"
+
+	. "github.com/navidrome/navidrome/conf"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"github.com/spf13/viper"
+)
+
+func TestConfiguration(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Configuration Suite")
+}
+
+var _ = Describe("Configuration", func() {
+	BeforeEach(func() {
+		// Reset viper configuration
+		viper.Reset()
+		viper.SetDefault("datafolder", GinkgoT().TempDir())
+		viper.SetDefault("loglevel", "error")
+		ResetConf()
+	})
+
+	DescribeTable("should load configuration from",
+		func(format string) {
+			filename := filepath.Join("testdata", "cfg."+format)
+
+			// Initialize config with the test file
+			InitConfig(filename)
+			// Load the configuration (with noConfigDump=true)
+			Load(true)
+
+			// Execute the format-specific assertions
+			Expect(Server.MusicFolder).To(Equal(fmt.Sprintf("/%s/music", format)))
+			Expect(Server.UIWelcomeMessage).To(Equal("Welcome " + format))
+			Expect(Server.Tags["custom"].Aliases).To(Equal([]string{format, "test"}))
+
+			// The config file used should be the one we created
+			Expect(Server.ConfigFile).To(Equal(filename))
+		},
+		Entry("TOML format", "toml"),
+		Entry("YAML format", "yaml"),
+		Entry("INI format", "ini"),
+		Entry("JSON format", "json"),
+	)
+})

conf/export_test.go

@@ -0,0 +1,5 @@
+package conf
+
+func ResetConf() {
+	Server = &configOptions{}
+}

conf/testdata/cfg.ini

@@ -0,0 +1,6 @@
+[default]
+MusicFolder = /ini/music
+UIWelcomeMessage = Welcome ini
+
+[Tags]
+Custom.Aliases = ini,test

conf/testdata/cfg.json

@@ -0,0 +1,12 @@
+{
+  "musicFolder": "/json/music",
+  "uiWelcomeMessage": "Welcome json",
+  "Tags": {
+    "custom": {
+      "aliases": [
+        "json",
+        "test"
+      ]
+    }
+  }
+}

conf/testdata/cfg.toml

@@ -0,0 +1,5 @@
+musicFolder = "/toml/music"
+uiWelcomeMessage = "Welcome toml"
+
+[Tags.custom]
+aliases = ["toml", "test"]

conf/testdata/cfg.yaml

@@ -0,0 +1,7 @@
+musicFolder: "/yaml/music"
+uiWelcomeMessage: "Welcome yaml"
+Tags:
+  custom:
+    aliases:
+      - yaml
+      - test

consts/consts.go

@@ -151,13 +151,17 @@ var (
 	UnknownArtistID     = id.NewHash(strings.ToLower(UnknownArtist))
 	VariousArtistsMbzId = "89ad4ac3-39f7-470e-963a-56509c546377"
 
-	ServerStart = time.Now()
+	ArtistJoiner = " • "
 )
 
-var InContainer = func() bool {
-	// Check if the /.nddockerenv file exists
-	if _, err := os.Stat("/.nddockerenv"); err == nil {
-		return true
-	}
-	return false
-}()
+var (
+	ServerStart = time.Now()
+
+	InContainer = func() bool {
+		// Check if the /.nddockerenv file exists
+		if _, err := os.Stat("/.nddockerenv"); err == nil {
+			return true
+		}
+		return false
+	}()
+)

core/agents/lastfm/agent.go

@@ -296,7 +296,7 @@ func (l *lastfmAgent) NowPlaying(ctx context.Context, userId string, track *mode
 	})
 	if err != nil {
 		log.Warn(ctx, "Last.fm client.updateNowPlaying returned error", "track", track.Title, err)
-		return scrobbler.ErrUnrecoverable
+		return errors.Join(err, scrobbler.ErrUnrecoverable)
 	}
 	return nil
 }
@@ -304,7 +304,7 @@ func (l *lastfmAgent) NowPlaying(ctx context.Context, userId string, track *mode
 func (l *lastfmAgent) Scrobble(ctx context.Context, userId string, s scrobbler.Scrobble) error {
 	sk, err := l.sessionKeys.Get(ctx, userId)
 	if err != nil || sk == "" {
-		return scrobbler.ErrNotAuthorized
+		return errors.Join(err, scrobbler.ErrNotAuthorized)
 	}
 
 	if s.Duration <= 30 {
@@ -328,12 +328,12 @@ func (l *lastfmAgent) Scrobble(ctx context.Context, userId string, s scrobbler.S
 	isLastFMError := errors.As(err, &lfErr)
 	if !isLastFMError {
 		log.Warn(ctx, "Last.fm client.scrobble returned error", "track", s.Title, err)
-		return scrobbler.ErrRetryLater
+		return errors.Join(err, scrobbler.ErrRetryLater)
 	}
 	if lfErr.Code == 11 || lfErr.Code == 16 {
-		return scrobbler.ErrRetryLater
+		return errors.Join(err, scrobbler.ErrRetryLater)
 	}
-	return scrobbler.ErrUnrecoverable
+	return errors.Join(err, scrobbler.ErrUnrecoverable)
 }
 
 func (l *lastfmAgent) IsAuthorized(ctx context.Context, userId string) bool {

core/agents/listenbrainz/agent.go

@@ -76,14 +76,14 @@ func (l *listenBrainzAgent) formatListen(track *model.MediaFile) listenInfo {
 func (l *listenBrainzAgent) NowPlaying(ctx context.Context, userId string, track *model.MediaFile) error {
 	sk, err := l.sessionKeys.Get(ctx, userId)
 	if err != nil || sk == "" {
-		return scrobbler.ErrNotAuthorized
+		return errors.Join(err, scrobbler.ErrNotAuthorized)
 	}
 
 	li := l.formatListen(track)
 	err = l.client.updateNowPlaying(ctx, sk, li)
 	if err != nil {
 		log.Warn(ctx, "ListenBrainz updateNowPlaying returned error", "track", track.Title, err)
-		return scrobbler.ErrUnrecoverable
+		return errors.Join(err, scrobbler.ErrUnrecoverable)
 	}
 	return nil
 }
@@ -91,7 +91,7 @@ func (l *listenBrainzAgent) NowPlaying(ctx context.Context, userId string, track
 func (l *listenBrainzAgent) Scrobble(ctx context.Context, userId string, s scrobbler.Scrobble) error {
 	sk, err := l.sessionKeys.Get(ctx, userId)
 	if err != nil || sk == "" {
-		return scrobbler.ErrNotAuthorized
+		return errors.Join(err, scrobbler.ErrNotAuthorized)
 	}
 
 	li := l.formatListen(&s.MediaFile)
@@ -105,12 +105,12 @@ func (l *listenBrainzAgent) Scrobble(ctx context.Context, userId string, s scrob
 	isListenBrainzError := errors.As(err, &lbErr)
 	if !isListenBrainzError {
 		log.Warn(ctx, "ListenBrainz Scrobble returned HTTP error", "track", s.Title, err)
-		return scrobbler.ErrRetryLater
+		return errors.Join(err, scrobbler.ErrRetryLater)
 	}
 	if lbErr.Code == 500 || lbErr.Code == 503 {
-		return scrobbler.ErrRetryLater
+		return errors.Join(err, scrobbler.ErrRetryLater)
 	}
-	return scrobbler.ErrUnrecoverable
+	return errors.Join(err, scrobbler.ErrUnrecoverable)
 }
 
 func (l *listenBrainzAgent) IsAuthorized(ctx context.Context, userId string) bool {

core/artwork/artwork_internal_test.go

@@ -15,7 +15,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-// BFR Fix tests
+// TODO Fix tests
 var _ = XDescribe("Artwork", func() {
 	var aw *artwork
 	var ds model.DataStore

core/artwork/reader_resized.go

@@ -63,12 +63,12 @@ func (a *resizedArtworkReader) Reader(ctx context.Context) (io.ReadCloser, strin
 
 	resized, origSize, err := resizeImage(orig, a.size, a.square)
 	if resized == nil {
-		log.Trace(ctx, "Image smaller than requested size", "artID", a.artID, "original", origSize, "resized", a.size)
+		log.Trace(ctx, "Image smaller than requested size", "artID", a.artID, "original", origSize, "resized", a.size, "square", a.square)
 	} else {
-		log.Trace(ctx, "Resizing artwork", "artID", a.artID, "original", origSize, "resized", a.size)
+		log.Trace(ctx, "Resizing artwork", "artID", a.artID, "original", origSize, "resized", a.size, "square", a.square)
 	}
 	if err != nil {
-		log.Warn(ctx, "Could not resize image. Will return image as is", "artID", a.artID, "size", a.size, err)
+		log.Warn(ctx, "Could not resize image. Will return image as is", "artID", a.artID, "size", a.size, "square", a.square, err)
 	}
 	if err != nil || resized == nil {
 		// if we couldn't resize the image, return the original

core/ffmpeg/ffmpeg.go

@@ -29,7 +29,7 @@ func New() FFmpeg {
 }
 
 const (
-	extractImageCmd = "ffmpeg -i %s -an -vcodec copy -f image2pipe -"
+	extractImageCmd = "ffmpeg -i %s -map 0:v -map -0:V -vcodec copy -f image2pipe -"
 	probeCmd        = "ffmpeg %s -f ffmetadata"
 )
 

core/scrobbler/play_tracker_test.go

@@ -239,7 +239,6 @@ func (f *fakeScrobbler) Scrobble(ctx context.Context, userId string, s Scrobble)
 	return nil
 }
 
-// BFR This is duplicated in a few places
 func _p(id, name string, sortName ...string) model.Participant {
 	p := model.Participant{Artist: model.Artist{ID: id, Name: name}}
 	if len(sortName) > 0 {

db/migrations/20241026183640_support_new_scanner.go

@@ -164,7 +164,9 @@ join library on media_file.library_id = library.id`, string(os.PathSeparator)))
 			return nil
 		}
 
-		stmt, err := tx.PrepareContext(ctx, "insert into folder (id, library_id, path, name, parent_id) values (?, ?, ?, ?, ?)")
+		stmt, err := tx.PrepareContext(ctx,
+			"insert into folder (id, library_id, path, name, parent_id, updated_at) values (?, ?, ?, ?, ?, '0000-00-00 00:00:00')",
+		)
 		if err != nil {
 			return err
 		}
@@ -172,14 +174,20 @@ join library on media_file.library_id = library.id`, string(os.PathSeparator)))
 		// Finally, walk the in-mem filesystem and insert all folders into the DB.
 		err = fs.WalkDir(fsys, ".", func(path string, d fs.DirEntry, err error) error {
 			if err != nil {
-				return err
+				// Don't abort the walk, just log the error
+				log.Error("error walking folder to DB", "path", path, err)
+				return nil
 			}
-			if d.IsDir() {
-				f := model.NewFolder(lib, path)
-				_, err = stmt.ExecContext(ctx, f.ID, lib.ID, f.Path, f.Name, f.ParentID)
-				if err != nil {
-					log.Error("Error writing folder to DB", "path", path, err)
-				}
+			// Skip entries that are not directories
+			if !d.IsDir() {
+				return nil
+			}
+
+			// Create a folder in the DB
+			f := model.NewFolder(lib, path)
+			_, err = stmt.ExecContext(ctx, f.ID, lib.ID, f.Path, f.Name, f.ParentID)
+			if err != nil {
+				log.Error("error writing folder to DB", "path", path, err)
 			}
 			return err
 		})
@@ -187,7 +195,12 @@ join library on media_file.library_id = library.id`, string(os.PathSeparator)))
 			return fmt.Errorf("error populating folder table: %w", err)
 		}
 
-		libPathLen := utf8.RuneCountInString(lib.Path)
+		// Count the number of characters in the library path
+		libPath := filepath.Clean(lib.Path)
+		libPathLen := utf8.RuneCountInString(libPath)
+
+		// In one go, update all paths in the media_file table, removing the library path prefix
+		// and replacing any backslashes with slashes (the path separator used by the io/fs package)
 		_, err = tx.ExecContext(ctx, fmt.Sprintf(`
 update media_file set path = replace(substr(path, %d), '\', '/');`, libPathLen+2))
 		if err != nil {

git/pre-commit

@@ -10,7 +10,7 @@
 #
 # This script does not handle file names that contain spaces.
 
-gofmtcmd="go run golang.org/x/tools/cmd/goimports@latest"
+gofmtcmd="go tool goimports"
 
 gofiles=$(git diff --cached --name-only --diff-filter=ACM | grep '.go$' | grep -v '_gen.go$')
 [ -z "$gofiles" ] && exit 0

go.mod

@@ -1,6 +1,6 @@
 module github.com/navidrome/navidrome
 
-go 1.23.4
+go 1.24.1
 
 // Fork to fix https://github.com/navidrome/navidrome/pull/3254
 replace github.com/dhowden/tag v0.0.0-20240417053706-3d75831295e8 => github.com/deluan/tag v0.0.0-20241002021117-dfe5e6ea396d
@@ -26,6 +26,7 @@ require (
 	github.com/go-chi/cors v1.2.1
 	github.com/go-chi/httprate v0.14.1
 	github.com/go-chi/jwtauth/v5 v5.3.2
+	github.com/go-viper/encoding/ini v0.1.1
 	github.com/gohugoio/hashstructure v0.5.0
 	github.com/google/go-pipeline v0.0.0-20230411140531-6cbedfc1d3fc
 	github.com/google/uuid v1.6.0
@@ -50,7 +51,7 @@ require (
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.9.1
-	github.com/spf13/viper v1.19.0
+	github.com/spf13/viper v1.20.0
 	github.com/stretchr/testify v1.10.0
 	github.com/unrolled/secure v1.17.0
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1
@@ -68,19 +69,23 @@ require (
 require (
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/reflex v0.3.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/creack/pty v1.1.11 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7 // indirect
+	github.com/google/subcommands v1.2.0 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
@@ -90,17 +95,15 @@ require (
 	github.com/lestrrat-go/httprc v1.0.6 // indirect
 	github.com/lestrrat-go/iter v1.0.2 // indirect
 	github.com/lestrrat-go/option v1.0.1 // indirect
-	github.com/magiconair/properties v1.8.9 // indirect
 	github.com/mfridman/interpolate v0.0.2 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/ogier/pflag v0.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/sagikazarmark/locafero v0.7.0 // indirect
-	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/sethvargo/go-retry v0.3.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
@@ -111,8 +114,16 @@ require (
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.36.0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
 	golang.org/x/tools v0.31.0 // indirect
 	google.golang.org/protobuf v1.36.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 )
+
+tool (
+	github.com/cespare/reflex
+	github.com/google/wire/cmd/wire
+	github.com/onsi/ginkgo/v2/ginkgo
+	golang.org/x/tools/cmd/goimports
+)

go.sum

@@ -14,10 +14,14 @@ github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR
 github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M=
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0=
+github.com/cespare/reflex v0.3.1 h1:N4Y/UmRrjwOkNT0oQQnYsdr6YBxvHqtSfPB4mqOyAKk=
+github.com/cespare/reflex v0.3.1/go.mod h1:I+0Pnu2W693i7Hv6ZZG76qHTY0mgUa7uCIfCtikXojE=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
+github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -48,6 +52,7 @@ github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
 github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
@@ -65,6 +70,10 @@ github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpv
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
+github.com/go-viper/encoding/ini v0.1.1 h1:MVWY7B2XNw7lnOqHutGRc97bF3rP7omOdgjdMPAJgbs=
+github.com/go-viper/encoding/ini v0.1.1/go.mod h1:Pfi4M2V1eAGJVZ5q6FrkHPhtHED2YgLlXhvgMVrB+YQ=
+github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
+github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/gohugoio/hashstructure v0.5.0 h1:G2fjSBU36RdwEJBWJ+919ERvOVqAg9tfcYp47K9swqg=
@@ -78,6 +87,7 @@ github.com/google/go-pipeline v0.0.0-20230411140531-6cbedfc1d3fc h1:hd+uUVsB1vdx
 github.com/google/go-pipeline v0.0.0-20230411140531-6cbedfc1d3fc/go.mod h1:SL66SJVysrh7YbDCP9tH30b8a9o/N2HeiQNUm85EKhc=
 github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7 h1:+J3r2e8+RsmN3vKfo75g0YSY61ms37qzPglu4p0sGro=
 github.com/google/pprof v0.0.0-20250302191652-9094ed2288e7/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
 github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -92,11 +102,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jellydator/ttlcache/v3 v3.3.0 h1:BdoC9cE81qXfrxeb9eoJi9dWrdhSuwXMAnHTbnBm4Wc=
@@ -105,11 +112,16 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kardianos/service v1.2.2 h1:ZvePhAHfvo0A7Mftk/tEzqEZ7Q4lgnR8sGz4xu1YX60=
 github.com/kardianos/service v1.2.2/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
 github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
@@ -130,8 +142,6 @@ github.com/lestrrat-go/jwx/v2 v2.1.4 h1:uBCMmJX8oRZStmKuMMOFb0Yh9xmEMgNJLgjuKKt4
 github.com/lestrrat-go/jwx/v2 v2.1.4/go.mod h1:nWRbDFR1ALG2Z6GJbBXzfQaYyvn751KuuyySN2yR6is=
 github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
 github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
-github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
-github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/matoous/go-nanoid/v2 v2.1.0 h1:P64+dmq21hhWdtvZfEAofnvJULaRR1Yib0+PnU669bE=
 github.com/matoous/go-nanoid/v2 v2.1.0/go.mod h1:KlbGNQ+FhrUNIHUxZdL63t7tl4LaPkZNpUULS8H4uVM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -144,12 +154,12 @@ github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwX
 github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
 github.com/mileusna/useragent v1.3.5 h1:SJM5NzBmh/hO+4LGeATKpaEX9+b4vcGg2qXGLiNGDws=
 github.com/mileusna/useragent v1.3.5/go.mod h1:3d8TOmwL/5I8pJjyVDteHtgDGcefrFUX4ccGOMKNYYc=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/ogier/pflag v0.0.1 h1:RW6JSWSu/RkSatfcLtogGfFgpim5p7ARQ10ECk5O750=
+github.com/ogier/pflag v0.0.1/go.mod h1:zkFki7tvTa0tafRvTBIZTvzYyAu6kQhPZFnshFFPE+g=
 github.com/onsi/ginkgo/v2 v2.23.0 h1:FA1xjp8ieYDzlgS5ABTpdUDB7wtngggONc8a7ku2NqQ=
 github.com/onsi/ginkgo/v2 v2.23.0/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM=
 github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
@@ -186,8 +196,6 @@ github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDj
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
 github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo=
 github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k=
-github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
-github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
 github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
 github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
 github.com/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah2SE=
@@ -209,8 +217,8 @@ github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
-github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
+github.com/spf13/viper v1.20.0 h1:zrxIyR3RQIOsarIrgL8+sAvALXul9jeEPa06Y0Ph6vY=
+github.com/spf13/viper v1.20.0/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
@@ -253,6 +261,8 @@ golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -276,6 +286,7 @@ golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
 golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

model/album.go

@@ -17,7 +17,7 @@ type Album struct {
 	Name          string `structs:"name" json:"name"`
 	EmbedArtPath  string `structs:"embed_art_path" json:"-"`
 	AlbumArtistID string `structs:"album_artist_id" json:"albumArtistId"` // Deprecated, use Participants
-	// BFR Rename to AlbumArtistDisplayName
+	// AlbumArtist is the display name used for the album artist.
 	AlbumArtist          string   `structs:"album_artist" json:"albumArtist"`
 	MaxYear              int      `structs:"max_year" json:"maxYear"`
 	MinYear              int      `structs:"min_year" json:"minYear"`

model/criteria/operators_test.go

@@ -46,7 +46,6 @@ var _ = Describe("Operators", func() {
 		Entry("notInPlaylist", NotInPlaylist{"id": "deadbeef-dead-beef"}, "media_file.id NOT IN "+
 			"(SELECT media_file_id FROM playlist_tracks pl LEFT JOIN playlist on pl.playlist_id = playlist.id WHERE (pl.playlist_id = ? AND playlist.public = ?))", "deadbeef-dead-beef", 1),
 
-		// TODO These may be flaky
 		Entry("inTheLast", InTheLast{"lastPlayed": 30}, "annotation.play_date > ?", StartOfPeriod(30, time.Now())),
 		Entry("notInTheLast", NotInTheLast{"lastPlayed": 30}, "(annotation.play_date < ? OR annotation.play_date IS NULL)", StartOfPeriod(30, time.Now())),
 

model/mediafile.go

@@ -31,10 +31,10 @@ type MediaFile struct {
 	Title       string `structs:"title" json:"title"`
 	Album       string `structs:"album" json:"album"`
 	ArtistID    string `structs:"artist_id" json:"artistId"` // Deprecated: Use Participants instead
-	// BFR Rename to ArtistDisplayName
+	// Artist is the display name used for the artist.
 	Artist        string `structs:"artist" json:"artist"`
 	AlbumArtistID string `structs:"album_artist_id" json:"albumArtistId"` // Deprecated: Use Participants instead
-	// BFR Rename to AlbumArtistDisplayName
+	// AlbumArtist is the display name used for the album artist.
 	AlbumArtist          string  `structs:"album_artist" json:"albumArtist"`
 	AlbumID              string  `structs:"album_id" json:"albumId"`
 	HasCoverArt          bool    `structs:"has_cover_art" json:"hasCoverArt"`

model/metadata/legacy_ids.go

@@ -51,20 +51,6 @@ func legacyMapAlbumName(md Metadata) string {
 
 // Keep the TaggedLikePicard logic for backwards compatibility
 func legacyReleaseDate(md Metadata) string {
-	// Start with defaults
-	date := md.Date(model.TagRecordingDate)
-	year := date.Year()
-	originalDate := md.Date(model.TagOriginalDate)
-	originalYear := originalDate.Year()
-	releaseDate := md.Date(model.TagReleaseDate)
-	releaseYear := releaseDate.Year()
-
-	// MusicBrainz Picard writes the Release Date of an album to the Date tag, and leaves the Release Date tag empty
-	taggedLikePicard := (originalYear != 0) &&
-		(releaseYear == 0) &&
-		(year >= originalYear)
-	if taggedLikePicard {
-		return string(date)
-	}
+	_, _, releaseDate := md.mapDates()
 	return string(releaseDate)
 }

model/metadata/legacy_ids_test.go

@@ -0,0 +1,30 @@
+package metadata
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("legacyReleaseDate", func() {
+
+	DescribeTable("legacyReleaseDate",
+		func(recordingDate, originalDate, releaseDate, expected string) {
+			md := New("", Info{
+				Tags: map[string][]string{
+					"DATE":         {recordingDate},
+					"ORIGINALDATE": {originalDate},
+					"RELEASEDATE":  {releaseDate},
+				},
+			})
+
+			result := legacyReleaseDate(md)
+			Expect(result).To(Equal(expected))
+		},
+		Entry("regular mapping", "2020-05-15", "2019-02-10", "2021-01-01", "2021-01-01"),
+		Entry("legacy mapping", "2020-05-15", "2019-02-10", "", "2020-05-15"),
+		Entry("legacy mapping, originalYear < year", "2018-05-15", "2019-02-10", "2021-01-01", "2021-01-01"),
+		Entry("legacy mapping, originalYear empty", "2020-05-15", "", "2021-01-01", "2021-01-01"),
+		Entry("legacy mapping, releaseYear", "2020-05-15", "2019-02-10", "2021-01-01", "2021-01-01"),
+		Entry("legacy mapping, same dates", "2020-05-15", "2020-05-15", "", "2020-05-15"),
+	)
+})

model/metadata/map_mediafile.go

@@ -1,6 +1,7 @@
 package metadata
 
 import (
+	"cmp"
 	"encoding/json"
 	"maps"
 	"math"
@@ -39,11 +40,9 @@ func (md Metadata) ToMediaFile(libID int, folderID string) model.MediaFile {
 	mf.ExplicitStatus = md.mapExplicitStatusTag()
 
 	// Dates
-	origDate := md.Date(model.TagOriginalDate)
+	date, origDate, relDate := md.mapDates()
 	mf.OriginalYear, mf.OriginalDate = origDate.Year(), string(origDate)
-	relDate := md.Date(model.TagReleaseDate)
 	mf.ReleaseYear, mf.ReleaseDate = relDate.Year(), string(relDate)
-	date := md.Date(model.TagRecordingDate)
 	mf.Year, mf.Date = date.Year(), string(date)
 
 	// MBIDs
@@ -72,7 +71,7 @@ func (md Metadata) ToMediaFile(libID int, folderID string) model.MediaFile {
 	mf.UpdatedAt = md.ModTime()
 
 	mf.Participants = md.mapParticipants()
-	mf.Artist = md.mapDisplayArtist(mf)
+	mf.Artist = md.mapDisplayArtist()
 	mf.AlbumArtist = md.mapDisplayAlbumArtist(mf)
 
 	// Persistent IDs
@@ -164,3 +163,22 @@ func (md Metadata) mapExplicitStatusTag() string {
 		return ""
 	}
 }
+
+func (md Metadata) mapDates() (date Date, originalDate Date, releaseDate Date) {
+	// Start with defaults
+	date = md.Date(model.TagRecordingDate)
+	originalDate = md.Date(model.TagOriginalDate)
+	releaseDate = md.Date(model.TagReleaseDate)
+
+	// For some historic reason, taggers have been writing the Release Date of an album to the Date tag,
+	// and leave the Release Date tag empty.
+	legacyMappings := (originalDate != "") &&
+		(releaseDate == "") &&
+		(date >= originalDate)
+	if legacyMappings {
+		return originalDate, originalDate, date
+	}
+	// when there's no Date, first fall back to Original Date, then to Release Date.
+	date = cmp.Or(date, originalDate, releaseDate)
+	return date, originalDate, releaseDate
+}

model/metadata/map_mediafile_test.go

@@ -35,7 +35,7 @@ var _ = Describe("ToMediaFile", func() {
 	}
 
 	Describe("Dates", func() {
-		It("should parse the dates like Picard", func() {
+		It("should parse properly tagged dates ", func() {
 			mf = toMediaFile(model.RawTags{
 				"ORIGINALDATE": {"1978-09-10"},
 				"DATE":         {"1977-03-04"},
@@ -49,6 +49,32 @@ var _ = Describe("ToMediaFile", func() {
 			Expect(mf.ReleaseYear).To(Equal(2002))
 			Expect(mf.ReleaseDate).To(Equal("2002-01-02"))
 		})
+
+		It("should parse dates with only year", func() {
+			mf = toMediaFile(model.RawTags{
+				"ORIGINALYEAR": {"1978"},
+				"DATE":         {"1977"},
+				"RELEASEDATE":  {"2002"},
+			})
+
+			Expect(mf.Year).To(Equal(1977))
+			Expect(mf.Date).To(Equal("1977"))
+			Expect(mf.OriginalYear).To(Equal(1978))
+			Expect(mf.OriginalDate).To(Equal("1978"))
+			Expect(mf.ReleaseYear).To(Equal(2002))
+			Expect(mf.ReleaseDate).To(Equal("2002"))
+		})
+
+		It("should parse dates tagged the legacy way (no release date)", func() {
+			mf = toMediaFile(model.RawTags{
+				"DATE":         {"2014"},
+				"ORIGINALDATE": {"1966"},
+			})
+
+			Expect(mf.Year).To(Equal(1966))
+			Expect(mf.OriginalYear).To(Equal(1966))
+			Expect(mf.ReleaseYear).To(Equal(2014))
+		})
 	})
 
 	Describe("Lyrics", func() {

model/metadata/map_participants.go

@@ -2,7 +2,9 @@ package metadata
 
 import (
 	"cmp"
+	"strings"
 
+	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/utils/str"
@@ -175,7 +177,11 @@ func (md Metadata) getRoleValues(role model.TagName) []string {
 	if len(values) == 0 {
 		return nil
 	}
-	if conf := model.TagRolesConf(); len(conf.Split) > 0 {
+	conf := model.TagMainMappings()[role]
+	if conf.Split == nil {
+		conf = model.TagRolesConf()
+	}
+	if len(conf.Split) > 0 {
 		values = conf.SplitTagValue(values)
 		return filterDuplicatedOrEmptyValues(values)
 	}
@@ -192,39 +198,39 @@ func (md Metadata) getArtistValues(single, multi model.TagName) []string {
 	if len(vSingle) != 1 {
 		return vSingle
 	}
-	if conf := model.TagArtistsConf(); len(conf.Split) > 0 {
+	conf := model.TagMainMappings()[single]
+	if conf.Split == nil {
+		conf = model.TagArtistsConf()
+	}
+	if len(conf.Split) > 0 {
 		vSingle = conf.SplitTagValue(vSingle)
 		return filterDuplicatedOrEmptyValues(vSingle)
 	}
 	return vSingle
 }
 
-func (md Metadata) getTags(tagNames ...model.TagName) []string {
-	for _, tagName := range tagNames {
-		values := md.Strings(tagName)
-		if len(values) > 0 {
-			return values
-		}
-	}
-	return nil
-}
-func (md Metadata) mapDisplayRole(mf model.MediaFile, role model.Role, tagNames ...model.TagName) string {
-	artistNames := md.getTags(tagNames...)
-	values := []string{
-		"",
-		mf.Participants.First(role).Name,
-		consts.UnknownArtist,
-	}
-	if len(artistNames) == 1 {
-		values[0] = artistNames[0]
-	}
-	return cmp.Or(values...)
+func (md Metadata) mapDisplayName(singularTagName, pluralTagName model.TagName) string {
+	return cmp.Or(
+		strings.Join(md.tags[singularTagName], conf.Server.Scanner.ArtistJoiner),
+		strings.Join(md.tags[pluralTagName], conf.Server.Scanner.ArtistJoiner),
+	)
 }
 
-func (md Metadata) mapDisplayArtist(mf model.MediaFile) string {
-	return md.mapDisplayRole(mf, model.RoleArtist, model.TagTrackArtist, model.TagTrackArtists)
+func (md Metadata) mapDisplayArtist() string {
+	return cmp.Or(
+		md.mapDisplayName(model.TagTrackArtist, model.TagTrackArtists),
+		consts.UnknownArtist,
+	)
 }
 
 func (md Metadata) mapDisplayAlbumArtist(mf model.MediaFile) string {
-	return md.mapDisplayRole(mf, model.RoleAlbumArtist, model.TagAlbumArtist, model.TagAlbumArtists)
+	fallbackName := consts.UnknownArtist
+	if md.Bool(model.TagCompilation) {
+		fallbackName = consts.VariousArtists
+	}
+	return cmp.Or(
+		md.mapDisplayName(model.TagAlbumArtist, model.TagAlbumArtists),
+		mf.Participants.First(model.RoleAlbumArtist).Name,
+		fallbackName,
+	)
 }

model/metadata/map_participants_test.go

@@ -45,6 +45,10 @@ var _ = Describe("Participants", func() {
 				mf = toMediaFile(model.RawTags{})
 			})
 
+			It("should set the display name to Unknown Artist", func() {
+				Expect(mf.Artist).To(Equal("[Unknown Artist]"))
+			})
+
 			It("should set artist to Unknown Artist", func() {
 				Expect(mf.Artist).To(Equal("[Unknown Artist]"))
 			})
@@ -92,6 +96,7 @@ var _ = Describe("Participants", func() {
 				Expect(artist.MbzArtistID).To(Equal(mbid1))
 			})
 		})
+
 		Context("Multiple values in a Single-valued ARTIST tags, no ARTISTS tags", func() {
 			BeforeEach(func() {
 				mf = toMediaFile(model.RawTags{
@@ -101,12 +106,13 @@ var _ = Describe("Participants", func() {
 				})
 			})
 
-			It("should split the tag", func() {
-				By("keeping the first artist as the display name")
+			It("should use the full string as display name", func() {
 				Expect(mf.Artist).To(Equal("Artist Name feat. Someone Else"))
 				Expect(mf.SortArtistName).To(Equal("Name, Artist"))
 				Expect(mf.OrderArtistName).To(Equal("artist name"))
+			})
 
+			It("should split the tag", func() {
 				participants := mf.Participants
 				Expect(participants).To(SatisfyAll(
 					HaveKeyWithValue(model.RoleArtist, HaveLen(2)),
@@ -130,6 +136,7 @@ var _ = Describe("Participants", func() {
 				Expect(artist1.SortArtistName).To(Equal("Else, Someone"))
 				Expect(artist1.MbzArtistID).To(BeEmpty())
 			})
+
 			It("should split the tag using case-insensitive separators", func() {
 				mf = toMediaFile(model.RawTags{
 					"ARTIST": {"A1 FEAT. A2"},
@@ -167,8 +174,8 @@ var _ = Describe("Participants", func() {
 				})
 			})
 
-			It("should use the first artist name as display name", func() {
-				Expect(mf.Artist).To(Equal("First Artist"))
+			It("should concatenate all ARTIST values as display name", func() {
+				Expect(mf.Artist).To(Equal("First Artist • Second Artist"))
 			})
 
 			It("should populate the participants with all artists", func() {
@@ -194,6 +201,101 @@ var _ = Describe("Participants", func() {
 			})
 		})
 
+		Context("Single-valued ARTIST tag, single-valued ARTISTS tag, same values", func() {
+			BeforeEach(func() {
+				mf = toMediaFile(model.RawTags{
+					"ARTIST":               {"Artist Name"},
+					"ARTISTS":              {"Artist Name"},
+					"ARTISTSORT":           {"Name, Artist"},
+					"MUSICBRAINZ_ARTISTID": {mbid1},
+				})
+			})
+
+			It("should use the ARTIST tag as display name", func() {
+				Expect(mf.Artist).To(Equal("Artist Name"))
+			})
+
+			It("should populate the participants with the ARTIST", func() {
+				participants := mf.Participants
+				Expect(participants).To(HaveLen(2)) // ARTIST and ALBUMARTIST
+				Expect(participants).To(SatisfyAll(
+					HaveKeyWithValue(model.RoleArtist, HaveLen(1)),
+				))
+
+				artist := participants[model.RoleArtist][0]
+				Expect(artist.ID).ToNot(BeEmpty())
+				Expect(artist.Name).To(Equal("Artist Name"))
+				Expect(artist.OrderArtistName).To(Equal("artist name"))
+				Expect(artist.SortArtistName).To(Equal("Name, Artist"))
+				Expect(artist.MbzArtistID).To(Equal(mbid1))
+			})
+		})
+
+		Context("Single-valued ARTIST tag, single-valued ARTISTS tag, different values", func() {
+			BeforeEach(func() {
+				mf = toMediaFile(model.RawTags{
+					"ARTIST":               {"Artist Name"},
+					"ARTISTS":              {"Artist Name 2"},
+					"ARTISTSORT":           {"Name, Artist"},
+					"MUSICBRAINZ_ARTISTID": {mbid1},
+				})
+			})
+
+			It("should use the ARTIST tag as display name", func() {
+				Expect(mf.Artist).To(Equal("Artist Name"))
+			})
+
+			It("should use only artists from ARTISTS", func() {
+				participants := mf.Participants
+				Expect(participants).To(HaveLen(2)) // ARTIST and ALBUMARTIST
+				Expect(participants).To(SatisfyAll(
+					HaveKeyWithValue(model.RoleArtist, HaveLen(1)),
+				))
+
+				artist := participants[model.RoleArtist][0]
+				Expect(artist.ID).ToNot(BeEmpty())
+				Expect(artist.Name).To(Equal("Artist Name 2"))
+				Expect(artist.OrderArtistName).To(Equal("artist name 2"))
+				Expect(artist.SortArtistName).To(Equal("Name, Artist"))
+				Expect(artist.MbzArtistID).To(Equal(mbid1))
+			})
+		})
+
+		Context("No ARTIST tag, multi-valued ARTISTS tag", func() {
+			BeforeEach(func() {
+				mf = toMediaFile(model.RawTags{
+					"ARTISTS":     {"First Artist", "Second Artist"},
+					"ARTISTSSORT": {"Name, First Artist", "Name, Second Artist"},
+				})
+			})
+
+			It("should concatenate ARTISTS as display name", func() {
+				Expect(mf.Artist).To(Equal("First Artist • Second Artist"))
+			})
+
+			It("should populate the participants with all artists", func() {
+				participants := mf.Participants
+				Expect(participants).To(HaveLen(2)) // ARTIST and ALBUMARTIST
+				Expect(participants).To(SatisfyAll(
+					HaveKeyWithValue(model.RoleArtist, HaveLen(2)),
+				))
+
+				artist0 := participants[model.RoleArtist][0]
+				Expect(artist0.ID).ToNot(BeEmpty())
+				Expect(artist0.Name).To(Equal("First Artist"))
+				Expect(artist0.OrderArtistName).To(Equal("first artist"))
+				Expect(artist0.SortArtistName).To(Equal("Name, First Artist"))
+				Expect(artist0.MbzArtistID).To(BeEmpty())
+
+				artist1 := participants[model.RoleArtist][1]
+				Expect(artist1.ID).ToNot(BeEmpty())
+				Expect(artist1.Name).To(Equal("Second Artist"))
+				Expect(artist1.OrderArtistName).To(Equal("second artist"))
+				Expect(artist1.SortArtistName).To(Equal("Name, Second Artist"))
+				Expect(artist1.MbzArtistID).To(BeEmpty())
+			})
+		})
+
 		Context("Single-valued ARTIST tags, multi-valued ARTISTS tags", func() {
 			BeforeEach(func() {
 				mf = toMediaFile(model.RawTags{
@@ -231,6 +333,7 @@ var _ = Describe("Participants", func() {
 			})
 		})
 
+		// Not a good tagging strategy, but supported anyway.
 		Context("Multi-valued ARTIST tags, multi-valued ARTISTS tags", func() {
 			BeforeEach(func() {
 				mf = toMediaFile(model.RawTags{
@@ -242,13 +345,8 @@ var _ = Describe("Participants", func() {
 				})
 			})
 
-			XIt("should use the values concatenated as a display name ", func() {
-				Expect(mf.Artist).To(Equal("First Artist + Second Artist"))
-			})
-
-			// TODO: remove when the above is implemented
-			It("should use the first artist name as display name", func() {
-				Expect(mf.Artist).To(Equal("First Artist 2"))
+			It("should use ARTIST values concatenated as a display name ", func() {
+				Expect(mf.Artist).To(Equal("First Artist • Second Artist"))
 			})
 
 			It("should prioritize ARTISTS tags", func() {
@@ -275,6 +373,7 @@ var _ = Describe("Participants", func() {
 	})
 
 	Describe("ALBUMARTIST(S) tags", func() {
+		// Only test specific scenarios for ALBUMARTIST(S) tags, as the logic is the same as for ARTIST(S) tags.
 		Context("No ALBUMARTIST/ALBUMARTISTS tags", func() {
 			When("the COMPILATION tag is not set", func() {
 				BeforeEach(func() {
@@ -305,6 +404,35 @@ var _ = Describe("Participants", func() {
 				})
 			})
 
+			When("the COMPILATION tag is not set and there is no ALBUMARTIST tag", func() {
+				BeforeEach(func() {
+					mf = toMediaFile(model.RawTags{
+						"ARTIST":     {"Artist Name", "Another Artist"},
+						"ARTISTSORT": {"Name, Artist", "Artist, Another"},
+					})
+				})
+
+				It("should use the first ARTIST as ALBUMARTIST", func() {
+					Expect(mf.AlbumArtist).To(Equal("Artist Name"))
+				})
+
+				It("should add the ARTIST to participants as ALBUMARTIST", func() {
+					participants := mf.Participants
+					Expect(participants).To(HaveLen(2))
+					Expect(participants).To(SatisfyAll(
+						HaveKeyWithValue(model.RoleAlbumArtist, HaveLen(2)),
+					))
+
+					albumArtist := participants[model.RoleAlbumArtist][0]
+					Expect(albumArtist.Name).To(Equal("Artist Name"))
+					Expect(albumArtist.SortArtistName).To(Equal("Name, Artist"))
+
+					albumArtist = participants[model.RoleAlbumArtist][1]
+					Expect(albumArtist.Name).To(Equal("Another Artist"))
+					Expect(albumArtist.SortArtistName).To(Equal("Artist, Another"))
+				})
+			})
+
 			When("the COMPILATION tag is true", func() {
 				BeforeEach(func() {
 					mf = toMediaFile(model.RawTags{
@@ -331,6 +459,19 @@ var _ = Describe("Participants", func() {
 					Expect(albumArtist.MbzArtistID).To(Equal(consts.VariousArtistsMbzId))
 				})
 			})
+
+			When("the COMPILATION tag is true and there are ALBUMARTIST tags", func() {
+				BeforeEach(func() {
+					mf = toMediaFile(model.RawTags{
+						"COMPILATION": {"1"},
+						"ALBUMARTIST": {"Album Artist Name 1", "Album Artist Name 2"},
+					})
+				})
+
+				It("should use the ALBUMARTIST names as display name", func() {
+					Expect(mf.AlbumArtist).To(Equal("Album Artist Name 1 • Album Artist Name 2"))
+				})
+			})
 		})
 
 		Context("ALBUMARTIST tag is set", func() {

model/metadata/metadata.go

@@ -120,7 +120,7 @@ func (md Metadata) first(key model.TagName) string {
 
 func float(value string, def ...float64) float64 {
 	v, err := strconv.ParseFloat(value, 64)
-	if err != nil || v == math.Inf(-1) || v == math.Inf(1) {
+	if err != nil || v == math.Inf(-1) || math.IsInf(v, 1) || math.IsNaN(v) {
 		if len(def) > 0 {
 			return def[0]
 		}

model/metadata/metadata_test.go

@@ -90,13 +90,14 @@ var _ = Describe("Metadata", func() {
 				md = metadata.New(filePath, props)
 
 				Expect(md.All()).To(SatisfyAll(
-					HaveLen(5),
 					Not(HaveKey(unknownTag)),
 					HaveKeyWithValue(model.TagTrackArtist, []string{"Artist Name", "Second Artist"}),
 					HaveKeyWithValue(model.TagAlbum, []string{"Album Name"}),
-					HaveKeyWithValue(model.TagRecordingDate, []string{"2022-10-02", "2022"}),
+					HaveKeyWithValue(model.TagRecordingDate, []string{"2022-10-02"}),
+					HaveKeyWithValue(model.TagReleaseDate, []string{"2022"}),
 					HaveKeyWithValue(model.TagGenre, []string{"Pop", "Rock"}),
 					HaveKeyWithValue(model.TagTrackNumber, []string{"1/10"}),
+					HaveLen(6),
 				))
 			})
 
@@ -264,6 +265,7 @@ var _ = Describe("Metadata", func() {
 				Entry("1.2dB", "1.2dB", 1.2),
 				Entry("Infinity", "Infinity", 0.0),
 				Entry("Invalid value", "INVALID VALUE", 0.0),
+				Entry("NaN", "NaN", 0.0),
 			)
 			DescribeTable("Peak",
 				func(tagValue string, expected float64) {
@@ -275,6 +277,7 @@ var _ = Describe("Metadata", func() {
 				Entry("Invalid dB suffix", "0.7dB", 1.0),
 				Entry("Infinity", "Infinity", 1.0),
 				Entry("Invalid value", "INVALID VALUE", 1.0),
+				Entry("NaN", "NaN", 1.0),
 			)
 			DescribeTable("getR128GainValue",
 				func(tagValue string, expected float64) {

model/player.go

@@ -28,5 +28,4 @@ type PlayerRepository interface {
 	Put(p *Player) error
 	CountAll(...QueryOptions) (int64, error)
 	CountByClient(...QueryOptions) (map[string]int64, error)
-	// TODO: Add CountAll method. Useful at least for metrics.
 }

model/tag_mappings.go

@@ -1,6 +1,7 @@
 package model
 
 import (
+	"cmp"
 	"maps"
 	"regexp"
 	"slices"
@@ -55,6 +56,7 @@ func (c TagConf) SplitTagValue(values []string) []string {
 type TagType string
 
 const (
+	TagTypeString  TagType = "string"
 	TagTypeInteger TagType = "int"
 	TagTypeFloat   TagType = "float"
 	TagTypeDate    TagType = "date"
@@ -113,8 +115,9 @@ func collectTags(tagMappings, normalized map[TagName]TagConf) {
 			aliases = append(aliases, strings.ToLower(val))
 		}
 		if v.Split != nil {
-			if v.Type != "" {
-				log.Error("Tag splitting only available for string types", "tag", k, "split", v.Split, "type", v.Type)
+			if v.Type != "" && v.Type != TagTypeString {
+				log.Error("Tag splitting only available for string types", "tag", k, "split", v.Split,
+					"type", string(v.Type))
 				v.Split = nil
 			} else {
 				v.SplitRx = compileSplitRegex(k, v.Split)
@@ -173,21 +176,42 @@ func loadTagMappings() {
 		log.Error("No tag mappings found in mappings.yaml, check the format")
 	}
 
+	// Use Scanner.GenreSeparators if specified and Tags.genre is not defined
+	if conf.Server.Scanner.GenreSeparators != "" && len(conf.Server.Tags["genre"].Aliases) == 0 {
+		genreConf := _mappings.Main[TagName("genre")]
+		genreConf.Split = strings.Split(conf.Server.Scanner.GenreSeparators, "")
+		genreConf.SplitRx = compileSplitRegex("genre", genreConf.Split)
+		_mappings.Main[TagName("genre")] = genreConf
+		log.Debug("Loading deprecated list of genre separators", "separators", genreConf.Split)
+	}
+
 	// Overwrite the default mappings with the ones from the config
 	for tag, cfg := range conf.Server.Tags {
-		if len(cfg.Aliases) == 0 {
+		if cfg.Ignore {
 			delete(_mappings.Main, TagName(tag))
 			delete(_mappings.Additional, TagName(tag))
 			continue
 		}
-		c := TagConf{
-			Aliases:   cfg.Aliases,
-			Type:      TagType(cfg.Type),
-			MaxLength: cfg.MaxLength,
-			Split:     cfg.Split,
-			Album:     cfg.Album,
-			SplitRx:   compileSplitRegex(TagName(tag), cfg.Split),
+		oldValue, ok := _mappings.Main[TagName(tag)]
+		if !ok {
+			oldValue = _mappings.Additional[TagName(tag)]
 		}
+		aliases := cfg.Aliases
+		if len(aliases) == 0 {
+			aliases = oldValue.Aliases
+		}
+		split := cfg.Split
+		if split == nil {
+			split = oldValue.Split
+		}
+		c := TagConf{
+			Aliases:   aliases,
+			Split:     split,
+			Type:      cmp.Or(TagType(cfg.Type), oldValue.Type),
+			MaxLength: cmp.Or(cfg.MaxLength, oldValue.MaxLength),
+			Album:     cmp.Or(cfg.Album, oldValue.Album),
+		}
+		c.SplitRx = compileSplitRegex(TagName(tag), c.Split)
 		if _, ok := _mappings.Main[TagName(tag)]; ok {
 			_mappings.Main[TagName(tag)] = c
 		} else {

persistence/album_repository.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"maps"
 	"slices"
+	"strings"
 	"sync"
 	"time"
 
@@ -96,9 +97,10 @@ func NewAlbumRepository(ctx context.Context, db dbx.Builder) model.AlbumReposito
 	r.tableName = "album"
 	r.registerModel(&model.Album{}, albumFilters())
 	r.setSortMappings(map[string]string{
-		"name":           "order_album_name, order_album_artist_name",
-		"artist":         "compilation, order_album_artist_name, order_album_name",
-		"album_artist":   "compilation, order_album_artist_name, order_album_name",
+		"name":         "order_album_name, order_album_artist_name",
+		"artist":       "compilation, order_album_artist_name, order_album_name",
+		"album_artist": "compilation, order_album_artist_name, order_album_name",
+		// TODO Rename this to just year (or date)
 		"max_year":       "coalesce(nullif(original_date,''), cast(max_year as text)), release_date, name",
 		"random":         "random",
 		"recently_added": recentlyAddedSort(),
@@ -119,11 +121,17 @@ var albumFilters = sync.OnceValue(func() map[string]filterFunc {
 		"has_rating":      hasRatingFilter,
 		"missing":         booleanFilter,
 		"genre_id":        tagIDFilter,
+		"role_total_id":   allRolesFilter,
 	}
 	// Add all album tags as filters
 	for tag := range model.AlbumLevelTags() {
 		filters[string(tag)] = tagIDFilter
 	}
+
+	for role := range model.AllRoles {
+		filters["role_"+role+"_id"] = artistRoleFilter
+	}
+
 	return filters
 })
 
@@ -153,20 +161,30 @@ func yearFilter(_ string, value interface{}) Sqlizer {
 	}
 }
 
-// BFR: Support other roles
 func artistFilter(_ string, value interface{}) Sqlizer {
 	return Or{
-		Exists("json_tree(Participants, '$.albumartist')", Eq{"value": value}),
-		Exists("json_tree(Participants, '$.artist')", Eq{"value": value}),
+		Exists("json_tree(participants, '$.albumartist')", Eq{"value": value}),
+		Exists("json_tree(participants, '$.artist')", Eq{"value": value}),
 	}
-	// For any role:
-	//return Like{"Participants": fmt.Sprintf(`%%"%s"%%`, value)}
+}
+
+func artistRoleFilter(name string, value interface{}) Sqlizer {
+	roleName := strings.TrimSuffix(strings.TrimPrefix(name, "role_"), "_id")
+
+	// Check if the role name is valid. If not, return an invalid filter
+	if _, ok := model.AllRoles[roleName]; !ok {
+		return Gt{"": nil}
+	}
+	return Exists(fmt.Sprintf("json_tree(participants, '$.%s')", roleName), Eq{"value": value})
+}
+
+func allRolesFilter(_ string, value interface{}) Sqlizer {
+	return Like{"participants": fmt.Sprintf(`%%"%s"%%`, value)}
 }
 
 func (r *albumRepository) CountAll(options ...model.QueryOptions) (int64, error) {
 	sql := r.newSelect()
 	sql = r.withAnnotation(sql, "album.id")
-	// BFR WithParticipants (for filtering by name)?
 	return r.count(sql, options...)
 }
 

persistence/album_repository_test.go

@@ -2,6 +2,7 @@ package persistence
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/navidrome/navidrome/conf"
@@ -236,6 +237,52 @@ var _ = Describe("AlbumRepository", func() {
 			}
 		})
 	})
+
+	Describe("artistRoleFilter", func() {
+		DescribeTable("creates correct SQL expressions for artist roles",
+			func(filterName, artistID, expectedSQL string) {
+				sqlizer := artistRoleFilter(filterName, artistID)
+				sql, args, err := sqlizer.ToSql()
+				Expect(err).ToNot(HaveOccurred())
+				Expect(sql).To(Equal(expectedSQL))
+				Expect(args).To(Equal([]interface{}{artistID}))
+			},
+			Entry("artist role", "role_artist_id", "123",
+				"exists (select 1 from json_tree(participants, '$.artist') where value = ?)"),
+			Entry("albumartist role", "role_albumartist_id", "456",
+				"exists (select 1 from json_tree(participants, '$.albumartist') where value = ?)"),
+			Entry("composer role", "role_composer_id", "789",
+				"exists (select 1 from json_tree(participants, '$.composer') where value = ?)"),
+		)
+
+		It("works with the actual filter map", func() {
+			filters := albumFilters()
+
+			for roleName := range model.AllRoles {
+				filterName := "role_" + roleName + "_id"
+				filterFunc, exists := filters[filterName]
+				Expect(exists).To(BeTrue(), fmt.Sprintf("Filter %s should exist", filterName))
+
+				sqlizer := filterFunc(filterName, "test-id")
+				sql, args, err := sqlizer.ToSql()
+				Expect(err).ToNot(HaveOccurred())
+				Expect(sql).To(Equal(fmt.Sprintf("exists (select 1 from json_tree(participants, '$.%s') where value = ?)", roleName)))
+				Expect(args).To(Equal([]interface{}{"test-id"}))
+			}
+		})
+
+		It("rejects invalid roles", func() {
+			sqlizer := artistRoleFilter("role_invalid_id", "123")
+			_, _, err := sqlizer.ToSql()
+			Expect(err).To(HaveOccurred())
+		})
+
+		It("rejects invalid filter names", func() {
+			sqlizer := artistRoleFilter("invalid_name", "123")
+			_, _, err := sqlizer.ToSql()
+			Expect(err).To(HaveOccurred())
+		})
+	})
 })
 
 func _p(id, name string, sortName ...string) model.Participant {

persistence/artist_repository.go

@@ -85,7 +85,7 @@ func (a *dbArtist) PostMapArgs(m map[string]any) error {
 	m["full_text"] = formatFullText(a.Name, a.SortArtistName)
 
 	// Do not override the sort_artist_name and mbz_artist_id fields if they are empty
-	// BFR: Better way to handle this?
+	// TODO: Better way to handle this?
 	if v, ok := m["sort_artist_name"]; !ok || v.(string) == "" {
 		delete(m, "sort_artist_name")
 	}
@@ -134,7 +134,6 @@ func roleFilter(_ string, role any) Sqlizer {
 func (r *artistRepository) selectArtist(options ...model.QueryOptions) SelectBuilder {
 	query := r.newSelect(options...).Columns("artist.*")
 	query = r.withAnnotation(query, "artist.id")
-	// BFR How to handle counts and sizes (per role)?
 	return query
 }
 

persistence/mediafile_repository.go

@@ -105,7 +105,6 @@ var mediaFileFilter = sync.OnceValue(func() map[string]filterFunc {
 func (r *mediaFileRepository) CountAll(options ...model.QueryOptions) (int64, error) {
 	query := r.newSelect()
 	query = r.withAnnotation(query, "media_file.id")
-	// BFR WithParticipants (for filtering by name)?
 	return r.count(query, options...)
 }
 

persistence/mediafile_repository_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"time"
 
-	"github.com/Masterminds/squirrel"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/id"
@@ -53,17 +52,6 @@ var _ = Describe("MediaRepository", func() {
 		Expect(err).To(MatchError(model.ErrNotFound))
 	})
 
-	XIt("filters by genre", func() {
-		Expect(mr.GetAll(model.QueryOptions{
-			Sort:    "genre.name asc, title asc",
-			Filters: squirrel.Eq{"genre.name": "Rock"},
-		})).To(Equal(model.MediaFiles{
-			songDayInALife,
-			songAntenna,
-			songComeTogether,
-		}))
-	})
-
 	Context("Annotations", func() {
 		It("increments play count when the tracks does not have annotations", func() {
 			id := "incplay.firsttime"

persistence/persistence_suite_test.go

@@ -29,13 +29,6 @@ func TestPersistence(t *testing.T) {
 	RunSpecs(t, "Persistence Suite")
 }
 
-// BFR Test tags
-//var (
-//	genreElectronic = model.Genre{ID: "gn-1", Name: "Electronic"}
-//	genreRock       = model.Genre{ID: "gn-2", Name: "Rock"}
-//	testGenres      = model.Genres{genreElectronic, genreRock}
-//)
-
 func mf(mf model.MediaFile) model.MediaFile {
 	mf.Tags = model.Tags{}
 	mf.LibraryID = 1

persistence/playlist_repository_test.go

@@ -145,7 +145,7 @@ var _ = Describe("PlaylistRepository", func() {
 			})
 		})
 
-		// BFR Validate these tests
+		// TODO Validate these tests
 		XContext("child smart playlists", func() {
 			When("refresh day has expired", func() {
 				It("should refresh tracks for smart playlist referenced in parent smart playlist criteria", func() {

persistence/playlist_track_repository.go

@@ -51,11 +51,16 @@ func (r *playlistRepository) Tracks(playlistId string, refreshSmartPlaylist bool
 	})
 	p.setSortMappings(
 		map[string]string{
-			"id":       "playlist_tracks.id",
-			"artist":   "order_artist_name",
-			"album":    "order_album_name, order_album_artist_name",
-			"title":    "order_title",
-			"duration": "duration", // To make sure the field will be whitelisted
+			"id":           "playlist_tracks.id",
+			"artist":       "order_artist_name",
+			"album_artist": "order_album_artist_name",
+			"album":        "order_album_name, order_album_artist_name",
+			"title":        "order_title",
+			// To make sure these fields will be whitelisted
+			"duration": "duration",
+			"year":     "year",
+			"bpm":      "bpm",
+			"channels": "channels",
 		},
 		"f") // TODO I don't like this solution, but I won't change it now as it's not the focus of BFR.
 

release/wix/navidrome.wxs

@@ -43,9 +43,9 @@
 
 					<Component Id="Configuration" Guid="9e17ed4b-ef13-44bf-a605-ed4132cff7f6" Win64="$(var.Win64)">
 						<IniFile Id="ConfigurationPort" Name="navidrome.ini" Action="createLine" Directory="INSTALLDIR" Key="Port" Section="default" Value="&apos;[ND_PORT]&apos;" />
-						<IniFile Id="ConfigurationMusicDir" Name="navidrome.ini" Action="addLine" Directory="INSTALLDIR" Key="MusicFolder" Section="default" Value="&apos;[ND_MUSICFOLDER]&apos;" />
-						<IniFile Id="ConfigurationDataDir" Name="navidrome.ini" Action="addLine" Directory="INSTALLDIR" Key="DataFolder" Section="default" Value="&apos;[ND_DATAFOLDER]&apos;" />
-						<IniFile Id="FFmpegPath" Name="navidrome.ini" Action="addLine" Directory="INSTALLDIR" Key="FFmpegPath" Section="default" Value="&apos;[INSTALLDIR]ffmpeg.exe&apos;" />
+						<IniFile Id="ConfigurationMusicDir" Name="navidrome.ini" Action="createLine" Directory="INSTALLDIR" Key="MusicFolder" Section="default" Value="&apos;[ND_MUSICFOLDER]&apos;" />
+						<IniFile Id="ConfigurationDataDir" Name="navidrome.ini" Action="createLine" Directory="INSTALLDIR" Key="DataFolder" Section="default" Value="&apos;[ND_DATAFOLDER]&apos;" />
+						<IniFile Id="FFmpegPath" Name="navidrome.ini" Action="createLine" Directory="INSTALLDIR" Key="FFmpegPath" Section="default" Value="&apos;[INSTALLDIR]ffmpeg.exe&apos;" />
 					</Component>
 
 					<Component Id='MainExecutable' Guid='e645aa06-8bbc-40d6-8d3c-73b4f5b76fd7' Win64="$(var.Win64)">

resources/i18n/el.json

@@ -0,0 +1,514 @@
+{
+    "languageName": "Ελληνικά",
+    "resources": {
+        "song": {
+            "name": "Τραγούδι |||| Τραγούδια",
+            "fields": {
+                "albumArtist": "Καλλιτεχνης Αλμπουμ",
+                "duration": "Διαρκεια",
+                "trackNumber": "#",
+                "playCount": "Αναπαραγωγες",
+                "title": "Τιτλος",
+                "artist": "Καλλιτεχνης",
+                "album": "Αλμπουμ",
+                "path": "Διαδρομη αρχειου",
+                "genre": "Ειδος",
+                "compilation": "Συλλογή",
+                "year": "Ετος",
+                "size": "Μεγεθος αρχειου",
+                "updatedAt": "Ενημερωθηκε",
+                "bitRate": "Ρυθμός Bit",
+                "discSubtitle": "Υπότιτλοι Δίσκου",
+                "starred": "Αγαπημένο",
+                "comment": "Σχόλιο",
+                "rating": "Βαθμολογια",
+                "quality": "Ποιοτητα",
+                "bpm": "BPM",
+                "playDate": "Παίχτηκε Τελευταία",
+                "channels": "Κανάλια",
+                "createdAt": "Ημερομηνία προσθήκης",
+                "grouping": "Ομαδοποίηση",
+                "mood": "Διάθεση",
+                "participants": "Πρόσθετοι συμμετέχοντες",
+                "tags": "Πρόσθετες Ετικέτες",
+                "mappedTags": "Χαρτογραφημένες ετικέτες",
+                "rawTags": "Ακατέργαστες ετικέτες",
+                "bitDepth": "Λίγο βάθος"
+            },
+            "actions": {
+                "addToQueue": "Αναπαραγωγη Μετα",
+                "playNow": "Αναπαραγωγή Τώρα",
+                "addToPlaylist": "Προσθήκη στη λίστα αναπαραγωγής",
+                "shuffleAll": "Ανακατεμα ολων",
+                "download": "Ληψη",
+                "playNext": "Επόμενη Αναπαραγωγή",
+                "info": "Εμφάνιση Πληροφοριών"
+            }
+        },
+        "album": {
+            "name": "Άλμπουμ |||| Άλμπουμ",
+            "fields": {
+                "albumArtist": "Καλλιτεχνης Αλμπουμ",
+                "artist": "Καλλιτεχνης",
+                "duration": "Διαρκεια",
+                "songCount": "Τραγουδια",
+                "playCount": "Αναπαραγωγες",
+                "name": "Ονομα",
+                "genre": "Ειδος",
+                "compilation": "Συλλογη",
+                "year": "Ετος",
+                "updatedAt": "Ενημερωθηκε",
+                "comment": "Σχόλιο",
+                "rating": "Βαθμολογια",
+                "createdAt": "Ημερομηνία προσθήκης",
+                "size": "Μέγεθος",
+                "originalDate": "Πρωτότυπο",
+                "releaseDate": "Κυκλοφόρησε",
+                "releases": "Έκδοση |||| Εκδόσεις",
+                "released": "Κυκλοφόρησε",
+                "recordLabel": "Επιγραφή",
+                "catalogNum": "Αριθμός καταλόγου",
+                "releaseType": "Τύπος",
+                "grouping": "Ομαδοποίηση",
+                "media": "Μέσα",
+                "mood": "Διάθεση"
+            },
+            "actions": {
+                "playAll": "Αναπαραγωγή",
+                "playNext": "Αναπαραγωγη Μετα",
+                "addToQueue": "Αναπαραγωγη Αργοτερα",
+                "shuffle": "Ανακατεμα",
+                "addToPlaylist": "Προσθηκη στη λιστα αναπαραγωγης",
+                "download": "Ληψη",
+                "info": "Εμφάνιση Πληροφοριών",
+                "share": "Μερίδιο"
+            },
+            "lists": {
+                "all": "Όλα",
+                "random": "Τυχαία",
+                "recentlyAdded": "Νέες Προσθήκες",
+                "recentlyPlayed": "Παίχτηκαν Πρόσφατα",
+                "mostPlayed": "Παίζονται Συχνά",
+                "starred": "Αγαπημένα",
+                "topRated": "Κορυφαία"
+            }
+        },
+        "artist": {
+            "name": "Καλλιτέχνης |||| Καλλιτέχνες",
+            "fields": {
+                "name": "Ονομα",
+                "albumCount": "Αναπαραγωγές Αλμπουμ",
+                "songCount": "Αναπαραγωγες Τραγουδιου",
+                "playCount": "Αναπαραγωγες",
+                "rating": "Βαθμολογια",
+                "genre": "Είδος",
+                "size": "Μέγεθος",
+                "role": "Ρόλος"
+            },
+            "roles": {
+                "albumartist": "Καλλιτέχνης Άλμπουμ |||| Καλλιτέχνες άλμπουμ",
+                "artist": "Καλλιτέχνης |||| Καλλιτέχνες",
+                "composer": "Συνθέτης |||| Συνθέτες",
+                "conductor": "Μαέστρος |||| Μαέστροι",
+                "lyricist": "Στιχουργός |||| Στιχουργοί",
+                "arranger": "Τακτοποιητής |||| Τακτοποιητές",
+                "producer": "Παραγωγός |||| Παραγωγοί",
+                "director": "Διευθυντής |||| Διευθυντές",
+                "engineer": "Μηχανικός |||| Μηχανικοί",
+                "mixer": "Μίξερ |||| Μίξερ",
+                "remixer": "Ρεμίξερ |||| Ρεμίξερ",
+                "djmixer": "Dj Μίξερ |||| Dj Μίξερ",
+                "performer": "Εκτελεστής |||| Ερμηνευτές"
+            }
+        },
+        "user": {
+            "name": "Χρήστης |||| Χρήστες",
+            "fields": {
+                "userName": "Ονομα Χρηστη",
+                "isAdmin": "Ειναι Διαχειριστης",
+                "lastLoginAt": "Τελευταια συνδεση στις",
+                "updatedAt": "Ενημερωθηκε",
+                "name": "Όνομα",
+                "password": "Κωδικός Πρόσβασης",
+                "createdAt": "Δημιουργήθηκε στις",
+                "changePassword": "Αλλαγή Κωδικού Πρόσβασης;",
+                "currentPassword": "Υπάρχων Κωδικός Πρόσβασης",
+                "newPassword": "Νέος Κωδικός Πρόσβασης",
+                "token": "Token",
+                "lastAccessAt": "Τελευταία Πρόσβαση"
+            },
+            "helperTexts": {
+                "name": "Αλλαγές στο όνομα σας θα εφαρμοστούν στην επόμενη σύνδεση"
+            },
+            "notifications": {
+                "created": "Ο χρήστης δημιουργήθηκε",
+                "updated": "Ο χρήστης ενημερώθηκε",
+                "deleted": "Ο χρήστης διαγράφηκε"
+            },
+            "message": {
+                "listenBrainzToken": "Εισάγετε το token του χρήστη σας στο ListenBrainz.",
+                "clickHereForToken": "Κάντε κλικ εδώ για να αποκτήσετε το token σας"
+            }
+        },
+        "player": {
+            "name": "Συσκευή Αναπαραγωγής |||| Συσκευές Αναπαραγωγής",
+            "fields": {
+                "name": "Όνομα",
+                "transcodingId": "Διακωδικοποίηση",
+                "maxBitRate": "Μεγ. Ρυθμός Bit",
+                "client": "Πελάτης",
+                "userName": "Ονομα Χρηστη",
+                "lastSeen": "Τελευταια προβολη στις",
+                "reportRealPath": "Αναφορά Πραγματικής Διαδρομής",
+                "scrobbleEnabled": "Αποστολή scrobbles σε εξωτερικές συσκευές"
+            }
+        },
+        "transcoding": {
+            "name": "Διακωδικοποίηση |||| Διακωδικοποιήσεις",
+            "fields": {
+                "name": "Όνομα",
+                "targetFormat": "Μορφη Προορισμου",
+                "defaultBitRate": "Προκαθορισμένος Ρυθμός Bit",
+                "command": "Εντολή"
+            }
+        },
+        "playlist": {
+            "name": "Λίστα αναπαραγωγής |||| Λίστες αναπαραγωγής",
+            "fields": {
+                "name": "Όνομα",
+                "duration": "Διάρκεια",
+                "ownerName": "Ιδιοκτήτης",
+                "public": "Δημόσιο",
+                "updatedAt": "Ενημερωθηκε",
+                "createdAt": "Δημιουργήθηκε στις",
+                "songCount": "Τραγούδια",
+                "comment": "Σχόλιο",
+                "sync": "Αυτόματη εισαγωγή",
+                "path": "Εισαγωγή από"
+            },
+            "actions": {
+                "selectPlaylist": "Επιλέξτε μια λίστα αναπαραγωγής:",
+                "addNewPlaylist": "Δημιουργία \"%{name}\"",
+                "export": "Εξαγωγη",
+                "makePublic": "Να γίνει δημόσιο",
+                "makePrivate": "Να γίνει ιδιωτικό"
+            },
+            "message": {
+                "duplicate_song": "Προσθήκη διπλοεγγραφών τραγουδιών",
+                "song_exist": "Υπάρχουν διπλοεγγραφές στην λίστα αναπαραγωγής. Θέλετε να προστεθούν οι διπλοεγγραφές ή να τις παραβλέψετε;"
+            }
+        },
+        "radio": {
+            "name": "Ραδιόφωνο ||| Ραδιόφωνο",
+            "fields": {
+                "name": "Όνομα",
+                "streamUrl": "Ρεύμα URL",
+                "homePageUrl": "Αρχική σελίδα URL",
+                "updatedAt": "Ενημερώθηκε στις",
+                "createdAt": "Δημιουργήθηκε στις"
+            },
+            "actions": {
+                "playNow": "Αναπαραγωγή"
+            }
+        },
+        "share": {
+            "name": "Μοιραστείτε |||| Μερίδια",
+            "fields": {
+                "username": "Κοινή χρήση από",
+                "url": "URL",
+                "description": "Περιγραφή",
+                "contents": "Περιεχόμενα",
+                "expiresAt": "Λήγει",
+                "lastVisitedAt": "Τελευταία Επίσκεψη",
+                "visitCount": "Επισκέψεις",
+                "format": "Μορφή",
+                "maxBitRate": "Μέγ. Ρυθμός Bit",
+                "updatedAt": "Ενημερώθηκε στις",
+                "createdAt": "Δημιουργήθηκε στις",
+                "downloadable": "Επιτρέπονται οι λήψεις?"
+            }
+        },
+        "missing": {
+            "name": "Λείπει αρχείο |||| Λείπουν αρχεία",
+            "fields": {
+                "path": "Διαδρομή",
+                "size": "Μέγεθος",
+                "updatedAt": "Εξαφανίστηκε"
+            },
+            "actions": {
+                "remove": "Αφαίρεση"
+            },
+            "notifications": {
+                "removed": "Λείπει αρχείο(α) αφαιρέθηκε"
+            },
+            "empty": "Δεν λείπουν αρχεία"
+        }
+    },
+    "ra": {
+        "auth": {
+            "welcome1": "Σας ευχαριστούμε που εγκαταστήσατε το Navidrome!",
+            "welcome2": "Για να ξεκινήσετε, δημιουργήστε έναν χρήστη ως διαχειριστή",
+            "confirmPassword": "Επιβεβαίωση κωδικού πρόσβασης",
+            "buttonCreateAdmin": "Δημιουργία Διαχειριστή",
+            "auth_check_error": "Παρακαλούμε συνδεθείτε για να συννεχίσετε",
+            "user_menu": "Προφίλ",
+            "username": "Ονομα Χρηστη",
+            "password": "Κωδικός Πρόσβασης",
+            "sign_in": "Σύνδεση",
+            "sign_in_error": "Η αυθεντικοποίηση απέτυχε, παρακαλούμε προσπαθήστε ξανά",
+            "logout": "Αποσύνδεση",
+            "insightsCollectionNote": "Το Navidrome συλλέγει ανώνυμα δεδομένα χρήσης σε\nβοηθήσουν στη βελτίωση του έργου. Κάντε κλικ [εδώ] για να μάθετε\nπερισσότερα και να εξαιρεθείτε αν θέλετε"
+        },
+        "validation": {
+            "invalidChars": "Παρακαλούμε χρησημοποιήστε μόνο γράμματα και αριθμούς",
+            "passwordDoesNotMatch": "Ο κωδικός πρόσβασης δεν ταιριάζει",
+            "required": "Υποχρεωτικό",
+            "minLength": "Πρέπει να είναι %{min} χαρακτήρες τουλάχιστον",
+            "maxLength": "Πρέπει να είναι %{max} χαρακτήρες ή λιγότερο",
+            "minValue": "Πρέπει να είναι τουλάχιστον %{min}",
+            "maxValue": "Πρέπει να είναι %{max} ή λιγότερο",
+            "number": "Πρέπει να είναι αριθμός",
+            "email": "Πρέπει να είναι ένα έγκυρο email",
+            "oneOf": "Πρέπει να είναι ένα από τα ακόλουθα: %{options}",
+            "regex": "Πρέπει να ταιριάζει με ένα συγκεκριμένο τύπο (κανονική έκφραση): %{pattern}",
+            "unique": "Πρέπει να είναι μοναδικό",
+            "url": "Πρέπει να είναι έγκυρη διεύθυνση URL"
+        },
+        "action": {
+            "add_filter": "Προσθηκη φιλτρου",
+            "add": "Προσθήκη",
+            "back": "Πίσω",
+            "bulk_actions": "1 αντικείμενο επιλέχθηκε |||| %{smart_count} αντικείμενα επιλέχθηκαν",
+            "cancel": "Ακύρωση",
+            "clear_input_value": "Καθαρισμός τιμής",
+            "clone": "Κλωνοποίηση",
+            "confirm": "Επιβεβαίωση",
+            "create": "Δημιουργία",
+            "delete": "Διαγραφή",
+            "edit": "Επεξεργασία",
+            "export": "Εξαγωγη",
+            "list": "Λίστα",
+            "refresh": "Ανανέωση",
+            "remove_filter": "Αφαίρεση αυτού του φίλτρου",
+            "remove": "Αφαίρεση",
+            "save": "Αποθηκευση",
+            "search": "Αναζήτηση",
+            "show": "Προβολή",
+            "sort": "Ταξινόμιση",
+            "undo": "Αναίρεση",
+            "expand": "Επέκταση",
+            "close": "Κλείσιμο",
+            "open_menu": "Άνοιγμα μενού",
+            "close_menu": "Κλείσιμο μενού",
+            "unselect": "Αποεπιλογή",
+            "skip": "Παράβλεψη",
+            "bulk_actions_mobile": "1 |||| %{smart_count}",
+            "share": "Κοινοποίηση",
+            "download": "Λήψη "
+        },
+        "boolean": {
+            "true": "Ναι",
+            "false": "Όχι"
+        },
+        "page": {
+            "create": "Δημιουργία %{name}",
+            "dashboard": "Πίνακας Ελέγχου",
+            "edit": "%{name} #%{id}",
+            "error": "Κάτι πήγε στραβά",
+            "list": "%{name}",
+            "loading": "Φόρτωση",
+            "not_found": "Δεν βρέθηκε",
+            "show": "%{name} #%{id}",
+            "empty": "Δεν υπάρχει %{name} ακόμη.",
+            "invite": "Θέλετε να προσθέσετε ένα?"
+        },
+        "input": {
+            "file": {
+                "upload_several": "Ρίξτε μερικά αρχεία για να τα ανεβάσετε, ή κάντε κλικ για να επιλέξετε ένα.",
+                "upload_single": "Ρίξτε ένα αρχείο για να τα ανεβάσετε, ή κάντε κλικ για να το επιλέξετε."
+            },
+            "image": {
+                "upload_several": "Ρίξτε μερικές φωτογραφίες για να τις ανεβάσετε, ή κάντε κλικ για να επιλέξετε μια.",
+                "upload_single": "Ρίξτε μια φωτογραφία για να την ανεβάσετε, ή κάντε κλικ για να την επιλέξετε."
+            },
+            "references": {
+                "all_missing": "Αδυναμία εύρεσης δεδομένων αναφοράς.",
+                "many_missing": "Τουλάχιστον μια από τις συσχετιζόμενες αναφορές φαίνεται δεν είναι διαθέσιμη.",
+                "single_missing": "Η συσχετιζόμενη αναφορά φαίνεται δεν είναι διαθέσιμη."
+            },
+            "password": {
+                "toggle_visible": "Απόκρυψη κωδικού πρόσβασης",
+                "toggle_hidden": "Εμφάνιση κωδικού πρόσβασης"
+            }
+        },
+        "message": {
+            "about": "Σχετικά",
+            "are_you_sure": "Είστε σίγουροι;",
+            "bulk_delete_content": "Είστε σίγουροι πως θέλετε να διαγράψετε το %{name}; |||| Είστε σίγουροι πως θέλετε να διαγράψετε τα %{smart_count};",
+            "bulk_delete_title": "Διαγραφή του %{name} |||| Διαγραφή του %{smart_count} %{name}",
+            "delete_content": "Είστε σίγουροι πως θέλετε να διαγράψετε αυτό το αντικείμενο;",
+            "delete_title": "Διαγραφή του %{name} #%{id}",
+            "details": "Λεπτομέρειες",
+            "error": "Παρουσιάστηκε ένα πρόβλημα από τη μεριά του πελάτη και το αίτημα σας δεν μπορεί να ολοκληρωθεί.",
+            "invalid_form": "Η φόρμα δεν είναι έγκυρη. Ελέγξτε για σφάλματα",
+            "loading": "Η σελίδα φορτώνει, περιμένετε λίγο",
+            "no": "Όχι",
+            "not_found": "Είτε έχετε εισάγει λανθασμένο URL, είτε ακολουθήσατε έναν υπερσύνδεσμο που δεν ισχύει.",
+            "yes": "Ναι",
+            "unsaved_changes": "Μερικές από τις αλλαγές σας δεν έχουν αποθηκευτεί. Είστε σίγουροι πως θέλετε να τις αγνοήσετε;"
+        },
+        "navigation": {
+            "no_results": "Δεν βρέθηκαν αποτελέσματα",
+            "no_more_results": "Η σελίδα %{page} είναι εκτός ορίων. Δοκιμάστε την προηγούμενη σελίδα.",
+            "page_out_of_boundaries": "Η σελίδα {page} είναι εκτός ορίων",
+            "page_out_from_end": "Δεν είναι δυνατή η πλοήγηση πέραν της τελευταίας σελίδας",
+            "page_out_from_begin": "Δεν είναι δυνατή η πλοήγηση πριν τη σελίδα 1",
+            "page_range_info": "%{offsetBegin}-%{offsetEnd} από %{total}",
+            "page_rows_per_page": "Αντικείμενα ανά σελίδα:",
+            "next": "Επόμενο",
+            "prev": "Προηγούμενο",
+            "skip_nav": "Παράβλεψη στο περιεχόμενο"
+        },
+        "notification": {
+            "updated": "Το στοιχείο ενημερώθηκε |||| %{smart_count} στοιχεία ενημερώθηκαν",
+            "created": "Το στοιχείο δημιουργήθηκε",
+            "deleted": "Το στοιχείο διαγράφηκε |||| %{smart_count} στοιχεία διαγράφηκαν",
+            "bad_item": "Λανθασμένο στοιχείο",
+            "item_doesnt_exist": "Το παρόν στοιχείο δεν υπάρχει",
+            "http_error": "Σφάλμα κατά την επικοινωνία με το διακομιστή",
+            "data_provider_error": "Σφάλμα παρόχου δεδομένων. Παρακαλούμε συμβουλευτείτε την κονσόλα για περισσότερες πληροφορίες.",
+            "i18n_error": "Αδυναμία ανάκτησης των μεταφράσεων για την συγκεκριμένη γλώσσα",
+            "canceled": "Η συγκεκριμένη δράση ακυρώθηκε",
+            "logged_out": "Η συνεδρία σας έχει λήξει, παρακαλούμε ξανασυνδεθείτε.",
+            "new_version": "Υπάρχει νέα έκδοση διαθέσιμη! Παρακαλούμε ανανεώστε το παράθυρο."
+        },
+        "toggleFieldsMenu": {
+            "columnsToDisplay": "Στήλες προς εμφάνιση",
+            "layout": "Διάταξη",
+            "grid": "Πλεγμα",
+            "table": "Πινακας"
+        }
+    },
+    "message": {
+        "note": "ΣΗΜΕΙΩΣΗ",
+        "transcodingDisabled": "Η αλλαγή της διαμόρφωσης της διακωδικοποίησης μέσω της διεπαφής του περιηγητή ιστού είναι απενεργοποιημένη για λόγους ασφαλείας. Εαν επιθυμείτε να αλλάξετε (τροποποίηση ή δημιουργία) των επιλογών διακωδικοποίησης, επανεκκινήστε το διακομιστή με την επιλογή %{config}.",
+        "transcodingEnabled": "Το Navidrome λειτουργεί με %{config}, καθιστόντας δυνατή την εκτέλεση εντολών συστήματος μέσω των ρυθμίσεων διακωδικοποίησης χρησιμοποιώντας την διεπαφή ιστού. Προτείνουμε να το απενεργοποιήσετε για λόγους ασφαλείας και να το ενεργοποιήσετε μόνο όταν παραμετροποιείτε τις επιλογές διακωδικοποίησης.",
+        "songsAddedToPlaylist": "Προστέθηκε 1 τραγούδι στη λίστα αναπαραγωγής |||| Προστέθηκαν %{smart_count} τραγούδια στη λίστα αναπαραγωγής",
+        "noPlaylistsAvailable": "Κανένα διαθέσιμο",
+        "delete_user_title": "Διαγραφή του χρήστη '%{name}'",
+        "delete_user_content": "Είστε σίγουροι πως θέλετε να διαγράψετε αυτό το χρήστη και όλα τα δεδομένα του (συμπεριλαμβανομένων των λιστών αναπαραγωγής και προτιμήσεων);",
+        "notifications_blocked": "Έχετε μπλοκάρει τις Ειδοποιήσεις από τη σελίδα, μέσω των ρυθμίσεων του περιηγητή ιστού σας",
+        "notifications_not_available": "Αυτός ο περιηγητής ιστού δεν υποστηρίζει ειδοποιήσεις στην επιφάνεια εργασίας ή δεν έχετε πρόσβαση στο Navidrome μέσω https",
+        "lastfmLinkSuccess": "Το Last.fm έχει διασυνδεθεί επιτυχώς και η λειτουργία scrobbling ενεργοποιήθηκε",
+        "lastfmLinkFailure": "Δεν μπορεί να πραγματοποιηθεί διασύνδεση με το Last.fm",
+        "lastfmUnlinkSuccess": "Το Last.fm αποσυνδέθηκε και η λειτουργία scrobbling έχει απενεργοποιηθεί",
+        "lastfmUnlinkFailure": "Το Last.fm δεν μπορεί να αποσυνδεθεί",
+        "openIn": {
+            "lastfm": "Άνοιγμα στο Last.fm",
+            "musicbrainz": "Άνοιγμα στο MusicBrainz"
+        },
+        "lastfmLink": "Διαβάστε περισσότερα...",
+        "listenBrainzLinkSuccess": "Το ListenBrainz έχει διασυνδεθεί επιτυχώς και η λειτουργία scrobbling έχει ενεργοποιηθεί για το χρήστη: %{user}",
+        "listenBrainzLinkFailure": "Το ListenBrainz δεν μπορεί να διασυνδεθεί: %{error}",
+        "listenBrainzUnlinkSuccess": "Το ListenBrainz έχει αποσυνδεθεί και το scrobbling έχει απενεργοποιηθεί",
+        "listenBrainzUnlinkFailure": "Το ListenBrainz δεν μπορεί να διασυνδεθεί",
+        "downloadOriginalFormat": "Λήψη σε αρχική μορφή",
+        "shareOriginalFormat": "Κοινή χρήση σε αρχική μορφή",
+        "shareDialogTitle": "Κοινή χρήση %{resource} '%{name}'",
+        "shareBatchDialogTitle": "Κοινή χρήση 1 %{resource} |||| Κοινή χρήση %{smart_count} %{resource}",
+        "shareSuccess": "Το URL αντιγράφτηκε στο πρόχειρο: %{url}",
+        "shareFailure": "Σφάλμα κατά την αντιγραφή της διεύθυνσης URL %{url} στο πρόχειρο",
+        "downloadDialogTitle": "Λήψη %{resource} '%{name}'(%{size})",
+        "shareCopyToClipboard": "Αντιγραφή στο πρόχειρο: Ctrl+C, Enter",
+        "remove_missing_title": "Αφαιρέστε τα αρχεία που λείπουν",
+        "remove_missing_content": "Είστε βέβαιοι ότι θέλετε να αφαιρέσετε τα επιλεγμένα αρχεία που λείπουν από τη βάση δεδομένων; Αυτό θα καταργήσει οριστικά τυχόν αναφορές σε αυτά, συμπεριλαμβανομένων των αριθμών παιχνιδιών και των αξιολογήσεών τους."
+    },
+    "menu": {
+        "library": "Βιβλιοθήκη",
+        "settings": "Ρυθμίσεις",
+        "version": "Έκδοση",
+        "theme": "Θέμα",
+        "personal": {
+            "name": "Προσωπικές",
+            "options": {
+                "theme": "Θέμα",
+                "language": "Γλώσσα",
+                "defaultView": "Προκαθορισμένη προβολή",
+                "desktop_notifications": "Ειδοποιήσεις στην Επιφάνεια Εργασίας",
+                "lastfmScrobbling": "Λειτουργία Scrobble στο Last.fm",
+                "listenBrainzScrobbling": "Λειτουργία scrobble με το ListenBrainz",
+                "replaygain": "Λειτουργία ReplayGain",
+                "preAmp": "ReplayGain PreAmp (dB)",
+                "gain": {
+                    "none": "Ανενεργό",
+                    "album": "Χρησιμοποιήστε το Album Gain",
+                    "track": "Χρησιμοποιήστε το Track Gain"
+                },
+                "lastfmNotConfigured": "Το Last.fm API-Key δεν έχει ρυθμιστεί"
+            }
+        },
+        "albumList": "Άλμπουμ",
+        "about": "Σχετικά",
+        "playlists": "Λίστες Αναπαραγωγής",
+        "sharedPlaylists": "Κοινοποιημένες Λίστες Αναπαραγωγής"
+    },
+    "player": {
+        "playListsText": "Ουρά Αναπαραγωγής",
+        "openText": "Άνοιγμα",
+        "closeText": "Κλείσιμο",
+        "notContentText": "Δεν υπάρχει μουσική",
+        "clickToPlayText": "Κλίκ για αναπαραγωγή",
+        "clickToPauseText": "Κλίκ για παύση",
+        "nextTrackText": "Επόμενο κομμάτι",
+        "previousTrackText": "Προηγούμενο κομμάτι",
+        "reloadText": "Επαναφόρτωση",
+        "volumeText": "Ένταση",
+        "toggleLyricText": "Εναλλαγή στίχων",
+        "toggleMiniModeText": "Ελαχιστοποίηση",
+        "destroyText": "Κλέισιμο",
+        "downloadText": "Ληψη",
+        "removeAudioListsText": "Διαγραφή λιστών ήχου",
+        "clickToDeleteText": "Κάντε κλικ για να διαγράψετε %{name}",
+        "emptyLyricText": "Δεν υπάρχουν στίχοι",
+        "playModeText": {
+            "order": "Στη σειρά",
+            "orderLoop": "Επανάληψη",
+            "singleLoop": "Επανάληψη μια φορά",
+            "shufflePlay": "Ανακατεμα"
+        }
+    },
+    "about": {
+        "links": {
+            "homepage": "Αρχική σελίδα",
+            "source": "Πηγαίος κώδικας",
+            "featureRequests": "Αιτήματα χαρακτηριστικών",
+            "lastInsightsCollection": "Τελευταία συλλογή πληροφοριών",
+            "insights": {
+                "disabled": "Απενεργοποιημένο",
+                "waiting": "Αναμονή"
+            }
+        }
+    },
+    "activity": {
+        "title": "Δραστηριότητα",
+        "totalScanned": "Σαρώμένοι Φάκελοι",
+        "quickScan": "Γρήγορη Σάρωση",
+        "fullScan": "Πλήρης Σάρωση",
+        "serverUptime": "Λειτουργία Διακομιστή",
+        "serverDown": "ΕΚΤΟΣ ΣΥΝΔΕΣΗΣ"
+    },
+    "help": {
+        "title": "Συντομεύσεις του Navidrome",
+        "hotkeys": {
+            "show_help": "Προβολή αυτής της Βοήθειας",
+            "toggle_menu": "Εναλλαγή Μπάρας Μενού",
+            "toggle_play": "Αναπαραγωγή / Παύση",
+            "prev_song": "Προηγούμενο Τραγούδι",
+            "next_song": "Επόμενο Τραγούδι",
+            "vol_up": "Αύξηση Έντασης",
+            "vol_down": "Μείωση Έντασης",
+            "toggle_love": "Προσθήκη αυτού του κομματιού στα αγαπημένα",
+            "current_song": "Μεταβείτε στο Τρέχον τραγούδι"
+        }
+    }
+}

resources/i18n/es.json

@@ -27,12 +27,12 @@
         "playDate": "Últimas reproducciones",
         "channels": "Canales",
         "createdAt": "Creado el",
-        "grouping": "",
+        "grouping": "Agrupación",
         "mood": "",
-        "participants": "",
-        "tags": "",
-        "mappedTags": "",
-        "rawTags": ""
+        "participants": "Participantes",
+        "tags": "Etiquetas",
+        "mappedTags": "Etiquetas asignadas",
+        "rawTags": "Etiquetas sin procesar"
       },
       "actions": {
         "addToQueue": "Reproducir después",
@@ -65,10 +65,10 @@
         "releaseDate": "Publicado",
         "releases": "Lanzamiento |||| Lanzamientos",
         "released": "Publicado",
-        "recordLabel": "",
-        "catalogNum": "",
-        "releaseType": "",
-        "grouping": "",
+        "recordLabel": "Discográfica",
+        "catalogNum": "Número de catálogo",
+        "releaseType": "Tipo de lanzamiento",
+        "grouping": "Agrupación",
         "media": "",
         "mood": ""
       },
@@ -76,7 +76,7 @@
         "playAll": "Reproducir",
         "playNext": "Reproducir siguiente",
         "addToQueue": "Reproducir después",
-        "shuffle": "Aletorio",
+        "shuffle": "Aleatorio",
         "addToPlaylist": "Agregar a la lista",
         "download": "Descargar",
         "info": "Obtener información",
@@ -102,22 +102,22 @@
         "rating": "Calificación",
         "genre": "Género",
         "size": "Tamaño",
-        "role": ""
+        "role": "Rol"
       },
       "roles": {
-        "albumartist": "",
-        "artist": "",
-        "composer": "",
-        "conductor": "",
-        "lyricist": "",
-        "arranger": "",
-        "producer": "",
-        "director": "",
-        "engineer": "",
-        "mixer": "",
-        "remixer": "",
-        "djmixer": "",
-        "performer": ""
+        "albumartist": "Artista del álbum",
+        "artist": "Artista",
+        "composer": "Compositor",
+        "conductor": "Director de orquesta",
+        "lyricist": "Letrista",
+        "arranger": "Arreglista",
+        "producer": "Productor",
+        "director": "Director",
+        "engineer": "Ingeniero de sonido",
+        "mixer": "Mezclador",
+        "remixer": "Remixer",
+        "djmixer": "DJ Mixer",
+        "performer": "Intérprete"
       }
     },
     "user": {
@@ -141,7 +141,7 @@
       },
       "notifications": {
         "created": "Usuario creado",
-        "updated": "Usuario actulalizado",
+        "updated": "Usuario actualizado",
         "deleted": "Usuario eliminado"
       },
       "message": {
@@ -228,17 +228,17 @@
       }
     },
     "missing": {
-      "name": "",
+      "name": "Faltante",
       "fields": {
-        "path": "",
-        "size": "",
-        "updatedAt": ""
+        "path": "Ruta",
+        "size": "Tamaño",
+        "updatedAt": "Actualizado el"
       },
       "actions": {
-        "remove": ""
+        "remove": "Eliminar"
       },
       "notifications": {
-        "removed": ""
+        "removed": "Eliminado"
       }
     }
   },
@@ -413,12 +413,12 @@
     "downloadOriginalFormat": "Descargar formato original",
     "shareOriginalFormat": "Compartir formato original",
     "shareDialogTitle": "Compartir %{resource} '%{name}'",
-    "shareBatchDialogTitle": "Compartir 1 %{resource} |||| Share %{smart_count} %{resource}",
+    "shareBatchDialogTitle": "Compartir 1 %{resource} |||| Compartir %{smart_count} %{resource}",
     "shareSuccess": "URL copiada al portapapeles: %{url}",
     "shareFailure": "Error al copiar la URL %{url} al portapapeles",
     "downloadDialogTitle": "Descargar %{resource} '%{name}' (%{size})",
     "shareCopyToClipboard": "Copiar al portapapeles: Ctrl+C, Intro",
-    "remove_missing_title": "",
+    "remove_missing_title": "Eliminar elemento faltante",
     "remove_missing_content": ""
   },
   "menu": {
@@ -509,4 +509,4 @@
       "current_song": "Canción actual"
     }
   }
-}
+}

resources/i18n/eu.json

@@ -216,6 +216,7 @@
         "username": "Partekatzailea:",
         "url": "URLa",
         "description": "Deskribapena",
+        "downloadable": "Deskargatzea ahalbidetu?",
         "contents": "Edukia",
         "expiresAt": "Iraungitze-data:",
         "lastVisitedAt": "Azkenekoz bisitatu zen:",
@@ -223,22 +224,24 @@
         "format": "Formatua",
         "maxBitRate": "Gehienezko bit tasa",
         "updatedAt": "Eguneratze-data:",
-        "createdAt": "Sortze-data:",
-        "downloadable": "Deskargatzea ahalbidetu?"
-      }
+        "createdAt": "Sortze-data:"
+      },
+      "notifications": {},
+      "actions": {}
     },
     "missing": {
-      "name": "",
+      "name": "Fitxategia falta da|||| Fitxategiak falta dira",
+      "empty": "Ez da fitxategirik falta",
       "fields": {
-        "path": "",
-        "size": "",
-        "updatedAt": ""
+        "path": "Bidea",
+        "size": "Tamaina",
+        "updatedAt": "Desagertze-data:"
       },
       "actions": {
-        "remove": ""
+        "remove": "Kendu"
       },
       "notifications": {
-        "removed": ""
+        "removed": "Faltan zeuden fitxategiak kendu dira"
       }
     }
   },
@@ -509,4 +512,4 @@
       "current_song": "Uneko abestia"
     }
   }
-}
+}

resources/i18n/fr.json

@@ -26,7 +26,14 @@
         "bpm": "BPM",
         "playDate": "Derniers joués",
         "channels": "Canaux",
-        "createdAt": "Date d'ajout"
+        "createdAt": "Date d'ajout",
+        "grouping": "Regroupement",
+        "mood": "Humeur",
+        "participants": "Participants supplémentaires",
+        "tags": "Étiquettes supplémentaires",
+        "mappedTags": "Étiquettes correspondantes",
+        "rawTags": "Étiquettes brutes",
+        "bitDepth": "Profondeur de bit"
       },
       "actions": {
         "addToQueue": "Ajouter à la file",
@@ -58,7 +65,13 @@
         "originalDate": "Original",
         "releaseDate": "Sortie",
         "releases": "Sortie |||| Sorties",
-        "released": "Sortie"
+        "released": "Sortie",
+        "recordLabel": "Label",
+        "catalogNum": "Numéro de catalogue",
+        "releaseType": "Type",
+        "grouping": "Regroupement",
+        "media": "Média",
+        "mood": "Humeur"
       },
       "actions": {
         "playAll": "Lire",
@@ -89,7 +102,23 @@
         "playCount": "Lectures",
         "rating": "Classement",
         "genre": "Genre",
-        "size": "Taille"
+        "size": "Taille",
+        "role": "Rôle"
+      },
+      "roles": {
+        "albumartist": "Artiste de l'album |||| Artistes de l'album",
+        "artist": "Artiste |||| Artistes",
+        "composer": "Compositeur |||| Compositeurs",
+        "conductor": "Chef d'orchestre |||| Chefs d'orchestre",
+        "lyricist": "Parolier |||| Paroliers",
+        "arranger": "Arrangeur |||| Arrangeurs",
+        "producer": "Producteur |||| Producteurs",
+        "director": "Réalisateur |||| Réalisateurs",
+        "engineer": "Ingénieur |||| Ingénieurs",
+        "mixer": "Mixeur |||| Mixeurs",
+        "remixer": "Remixeur |||| Remixeurs",
+        "djmixer": "Mixeur DJ |||| Mixeurs DJ",
+        "performer": "Interprète |||| Interprètes"
       }
     },
     "user": {
@@ -152,7 +181,7 @@
         "public": "Publique",
         "updatedAt": "Mise à jour le",
         "createdAt": "Créée le",
-        "songCount": "Titres",
+        "songCount": "Morceaux",
         "comment": "Commentaire",
         "sync": "Import automatique",
         "path": "Importer depuis"
@@ -198,6 +227,21 @@
         "createdAt": "Créé le",
         "downloadable": "Autoriser les téléchargements ?"
       }
+    },
+    "missing": {
+      "name": "Fichier manquant|||| Fichiers manquants",
+      "fields": {
+        "path": "Chemin",
+        "size": "Taille",
+        "updatedAt": "A disparu le"
+      },
+      "actions": {
+        "remove": "Supprimer"
+      },
+      "notifications": {
+        "removed": "Fichier(s) manquant(s) supprimé(s)"
+      },
+      "empty": "Aucun fichier manquant"
     }
   },
   "ra": {
@@ -273,10 +317,10 @@
       "error": "Un problème est survenu",
       "list": "%{name}",
       "loading": "Chargement",
-      "not_found": "Page manquante",
+      "not_found": "Introuvable",
       "show": "%{name} #%{id}",
       "empty": "Pas encore de %{name}.",
-      "invite": "Voulez-vous en créer ?"
+      "invite": "Voulez-vous en créer un ?"
     },
     "input": {
       "file": {
@@ -375,7 +419,9 @@
     "shareSuccess": "Lien copié vers le presse-papier : %{url}",
     "shareFailure": "Erreur en copiant le lien %{url} vers le presse-papier",
     "downloadDialogTitle": "Télécharger %{resource} '%{name}' (%{size})",
-    "shareCopyToClipboard": "Copier vers le presse-papier : Ctrl+C, Enter"
+    "shareCopyToClipboard": "Copier vers le presse-papier : Ctrl+C, Enter",
+    "remove_missing_title": "Supprimer les fichiers manquants",
+    "remove_missing_content": "Êtes-vous sûr(e) de vouloir supprimer les fichiers manquants sélectionnés de la base de données ? Ceci supprimera définitivement toute référence à ceux-ci, y compris leurs nombres d'écoutes et leurs notations"
   },
   "menu": {
     "library": "Bibliothèque",

resources/i18n/it.json

@@ -53,12 +53,12 @@
                 "updatedAt": "Ultimo aggiornamento",
                 "comment": "Commento",
                 "rating": "Valutazione",
-                "createdAt": "",
-                "size": "",
+                "createdAt": "Data di creazione",
+                "size": "Dimensione",
                 "originalDate": "",
-                "releaseDate": "",
-                "releases": "",
-                "released": ""
+                "releaseDate": "Data di pubblicazione",
+                "releases": "Pubblicazione |||| Pubblicazioni",
+                "released": "Pubblicato"
             },
             "actions": {
                 "playAll": "Riproduci",
@@ -68,7 +68,7 @@
                 "addToPlaylist": "Aggiungi alla Playlist",
                 "download": "Scarica",
                 "info": "Informazioni",
-                "share": ""
+                "share": "Condividi"
             },
             "lists": {
                 "all": "Tutti",
@@ -89,7 +89,7 @@
                 "playCount": "Riproduzioni",
                 "rating": "Valutazione",
                 "genre": "Genere",
-                "size": ""
+                "size": "Dimensione"
             }
         },
         "user": {
@@ -160,8 +160,8 @@
                 "selectPlaylist": "Aggiungi tracce alla playlist:",
                 "addNewPlaylist": "Aggiungi \"%{name}\"",
                 "export": "Esporta",
-                "makePublic": "",
-                "makePrivate": ""
+                "makePublic": "Rendi Pubblica",
+                "makePrivate": "Rendi Privata"
             },
             "message": {
                 "duplicate_song": "Aggiungere i duplicati",
@@ -169,9 +169,9 @@
             }
         },
         "radio": {
-            "name": "",
+            "name": "Radio |||| Radio",
             "fields": {
-                "name": "",
+                "name": "Nome",
                 "streamUrl": "",
                 "homePageUrl": "",
                 "updatedAt": "",

resources/i18n/no.json

@@ -0,0 +1,514 @@
+{
+  "languageName": "Engelsk",
+  "resources": {
+    "song": {
+      "name": "Låt |||| Låter",
+      "fields": {
+        "albumArtist": "Album Artist",
+        "duration": "Tid",
+        "trackNumber": "#",
+        "playCount": "Avspillinger",
+        "title": "Tittel",
+        "artist": "Artist",
+        "album": "Album",
+        "path": "Filbane",
+        "genre": "Sjanger",
+        "compilation": "Samling",
+        "year": "År",
+        "size": "Filstørrelse",
+        "updatedAt": "Oppdatert kl",
+        "bitRate": "Bithastighet",
+        "discSubtitle": "Diskundertekst",
+        "starred": "Favoritt",
+        "comment": "Kommentar",
+        "rating": "Vurdering",
+        "quality": "Kvalitet",
+        "bpm": "BPM",
+        "playDate": "Sist spilt",
+        "channels": "Kanaler",
+        "createdAt": "",
+        "grouping": "",
+        "mood": "",
+        "participants": "",
+        "tags": "",
+        "mappedTags": "",
+        "rawTags": "",
+        "bitDepth": ""
+      },
+      "actions": {
+        "addToQueue": "Spill Senere",
+        "playNow": "Leke nå",
+        "addToPlaylist": "Legg til i spilleliste",
+        "shuffleAll": "Bland alle",
+        "download": "nedlasting",
+        "playNext": "Spill Neste",
+        "info": "Få informasjon"
+      }
+    },
+    "album": {
+      "name": "Album",
+      "fields": {
+        "albumArtist": "Album Artist",
+        "artist": "Artist",
+        "duration": "Tid",
+        "songCount": "Sanger",
+        "playCount": "Avspillinger",
+        "name": "Navn",
+        "genre": "Sjanger",
+        "compilation": "Samling",
+        "year": "År",
+        "updatedAt": "Oppdatert kl",
+        "comment": "Kommentar",
+        "rating": "Vurdering",
+        "createdAt": "",
+        "size": "",
+        "originalDate": "",
+        "releaseDate": "",
+        "releases": "",
+        "released": "",
+        "recordLabel": "",
+        "catalogNum": "",
+        "releaseType": "",
+        "grouping": "",
+        "media": "",
+        "mood": ""
+      },
+      "actions": {
+        "playAll": "Spill",
+        "playNext": "Spill neste",
+        "addToQueue": "Spille senere",
+        "shuffle": "Bland",
+        "addToPlaylist": "Legg til i spilleliste",
+        "download": "nedlasting",
+        "info": "Få informasjon",
+        "share": ""
+      },
+      "lists": {
+        "all": "Alle",
+        "random": "Tilfeldig",
+        "recentlyAdded": "Nylig lagt til",
+        "recentlyPlayed": "Nylig spilt",
+        "mostPlayed": "Mest spilte",
+        "starred": "Favoritter",
+        "topRated": "Topp rangert"
+      }
+    },
+    "artist": {
+      "name": "Artist |||| Artister",
+      "fields": {
+        "name": "Navn",
+        "albumCount": "Antall album",
+        "songCount": "Antall sanger",
+        "playCount": "Spiller",
+        "rating": "Vurdering",
+        "genre": "Sjanger",
+        "size": "",
+        "role": ""
+      },
+      "roles": {
+        "albumartist": "",
+        "artist": "",
+        "composer": "",
+        "conductor": "",
+        "lyricist": "",
+        "arranger": "",
+        "producer": "",
+        "director": "",
+        "engineer": "",
+        "mixer": "",
+        "remixer": "",
+        "djmixer": "",
+        "performer": ""
+      }
+    },
+    "user": {
+      "name": "Bruker |||| Brukere",
+      "fields": {
+        "userName": "Brukernavn",
+        "isAdmin": "er admin",
+        "lastLoginAt": "Siste pålogging kl",
+        "updatedAt": "Oppdatert kl",
+        "name": "Navn",
+        "password": "Passord",
+        "createdAt": "Opprettet kl",
+        "changePassword": "Bytte Passord",
+        "currentPassword": "Nåværende Passord",
+        "newPassword": "Nytt Passord",
+        "token": "Token",
+        "lastAccessAt": ""
+      },
+      "helperTexts": {
+        "name": "Endringer i navnet ditt vil kun gjenspeiles ved neste pålogging"
+      },
+      "notifications": {
+        "created": "Bruker opprettet",
+        "updated": "Bruker oppdatert",
+        "deleted": "Bruker fjernet"
+      },
+      "message": {
+        "listenBrainzToken": "Skriv inn ListenBrainz-brukertokenet ditt.",
+        "clickHereForToken": "Klikk her for å få tokenet ditt"
+      }
+    },
+    "player": {
+      "name": "Avspiller |||| Avspillere",
+      "fields": {
+        "name": "Navn",
+        "transcodingId": "Omkoding",
+        "maxBitRate": "Maks. Bithastighet",
+        "client": "Klient",
+        "userName": "Brukernavn",
+        "lastSeen": "Sist sett kl",
+        "reportRealPath": "Rapporter ekte sti",
+        "scrobbleEnabled": "Send Scrobbles til eksterne tjenester"
+      }
+    },
+    "transcoding": {
+      "name": "Omkoding |||| Omkodinger",
+      "fields": {
+        "name": "Navn",
+        "targetFormat": "Målformat",
+        "defaultBitRate": "Standard bithastighet",
+        "command": "Kommando"
+      }
+    },
+    "playlist": {
+      "name": "Spilleliste |||| Spillelister",
+      "fields": {
+        "name": "Navn",
+        "duration": "Varighet",
+        "ownerName": "Eieren",
+        "public": "Offentlig",
+        "updatedAt": "Oppdatert kl",
+        "createdAt": "Opprettet kl",
+        "songCount": "Sanger",
+        "comment": "Kommentar",
+        "sync": "Autoimport",
+        "path": "Import fra"
+      },
+      "actions": {
+        "selectPlaylist": "Velg en spilleliste:",
+        "addNewPlaylist": "Opprett \"%{name}\"",
+        "export": "Eksport",
+        "makePublic": "Gjør offentlig",
+        "makePrivate": "Gjør privat"
+      },
+      "message": {
+        "duplicate_song": "Legg til dupliserte sanger",
+        "song_exist": "Det legges til duplikater i spillelisten. Vil du legge til duplikatene eller hoppe over dem?"
+      }
+    },
+    "radio": {
+      "name": "",
+      "fields": {
+        "name": "",
+        "streamUrl": "",
+        "homePageUrl": "",
+        "updatedAt": "",
+        "createdAt": ""
+      },
+      "actions": {
+        "playNow": ""
+      }
+    },
+    "share": {
+      "name": "",
+      "fields": {
+        "username": "",
+        "url": "",
+        "description": "",
+        "contents": "",
+        "expiresAt": "",
+        "lastVisitedAt": "",
+        "visitCount": "",
+        "format": "",
+        "maxBitRate": "",
+        "updatedAt": "",
+        "createdAt": "",
+        "downloadable": ""
+      }
+    },
+    "missing": {
+      "name": "",
+      "fields": {
+        "path": "",
+        "size": "",
+        "updatedAt": ""
+      },
+      "actions": {
+        "remove": ""
+      },
+      "notifications": {
+        "removed": ""
+      },
+      "empty": ""
+    }
+  },
+  "ra": {
+    "auth": {
+      "welcome1": "Takk for at du installerte Navidrome!",
+      "welcome2": "Opprett en admin -bruker for å starte",
+      "confirmPassword": "Bekreft Passord",
+      "buttonCreateAdmin": "Opprett Admin",
+      "auth_check_error": "Vennligst Logg inn for å fortsette",
+      "user_menu": "Profil",
+      "username": "Brukernavn",
+      "password": "Passord",
+      "sign_in": "Logg inn",
+      "sign_in_error": "Autentisering mislyktes. Prøv på nytt",
+      "logout": "Logg ut",
+      "insightsCollectionNote": ""
+    },
+    "validation": {
+      "invalidChars": "Bruk bare bokstaver og tall",
+      "passwordDoesNotMatch": "Passordet er ikke like",
+      "required": "Obligatorisk",
+      "minLength": "Må være minst %{min} tegn",
+      "maxLength": "Må være %{max} tegn eller færre",
+      "minValue": "Må være minst %{min}",
+      "maxValue": "Må være %{max} eller mindre",
+      "number": "Må være et tall",
+      "email": "Må være en gyldig e-post",
+      "oneOf": "Må være en av: %{options}",
+      "regex": "Må samsvare med et spesifikt format (regexp): %{pattern}",
+      "unique": "Må være unik",
+      "url": ""
+    },
+    "action": {
+      "add_filter": "Legg til filter",
+      "add": "Legge til",
+      "back": "Gå tilbake",
+      "bulk_actions": "1 element valgt |||| %{smart_count} elementer er valgt",
+      "cancel": "Avbryt",
+      "clear_input_value": "Klar verdi",
+      "clone": "Klone",
+      "confirm": "Bekrefte",
+      "create": "Skape",
+      "delete": "Slett",
+      "edit": "Redigere",
+      "export": "Eksport",
+      "list": "Liste",
+      "refresh": "oppdater",
+      "remove_filter": "Fjern dette filteret",
+      "remove": "Fjerne",
+      "save": "Lagre",
+      "search": "Søk",
+      "show": "Vis",
+      "sort": "Sortere",
+      "undo": "Angre",
+      "expand": "Utvide",
+      "close": "Lukk",
+      "open_menu": "Åpne menyen",
+      "close_menu": "Lukk menyen",
+      "unselect": "Fjern valget",
+      "skip": "Hopp over",
+      "bulk_actions_mobile": "",
+      "share": "",
+      "download": ""
+    },
+    "boolean": {
+      "true": "Ja",
+      "false": "Nei"
+    },
+    "page": {
+      "create": "Opprett %{name}",
+      "dashboard": "Dashbord",
+      "edit": "%{name} #%{id}",
+      "error": "Noe gikk galt",
+      "list": "%{Navn}",
+      "loading": "Laster",
+      "not_found": "Ikke funnet",
+      "show": "%{name} #%{id}",
+      "empty": "Ingen %{name} ennå.",
+      "invite": "Vil du legge til en?"
+    },
+    "input": {
+      "file": {
+        "upload_several": "Slipp noen filer for å laste opp, eller klikk for å velge en.",
+        "upload_single": "Slipp en fil for å laste opp, eller klikk for å velge den."
+      },
+      "image": {
+        "upload_several": "Slipp noen bilder for å laste opp, eller klikk for å velge ett.",
+        "upload_single": "Slipp et bilde for å laste opp, eller klikk for å velge det."
+      },
+      "references": {
+        "all_missing": "Kan ikke finne referansedata.",
+        "many_missing": "Minst én av de tilknyttede referansene ser ikke ut til å være tilgjengelig lenger.",
+        "single_missing": "Tilknyttet referanse ser ikke lenger ut til å være tilgjengelig."
+      },
+      "password": {
+        "toggle_visible": "Skjul passord",
+        "toggle_hidden": "Vis passord"
+      }
+    },
+    "message": {
+      "about": "Om",
+      "are_you_sure": "Er du sikker?",
+      "bulk_delete_content": "Er du sikker på at du vil slette denne %{name}? |||| Er du sikker på at du vil slette disse %{smart_count} elementene?",
+      "bulk_delete_title": "Slett %{name} |||| Slett %{smart_count} %{name}",
+      "delete_content": "Er du sikker på at du vil slette dette elementet?",
+      "delete_title": "Slett %{name} #%{id}",
+      "details": "Detaljer",
+      "error": "Det oppstod en klientfeil og forespørselen din kunne ikke fullføres.",
+      "invalid_form": "Skjemaet er ikke gyldig. Vennligst se etter feil",
+      "loading": "Siden lastes, bare et øyeblikk",
+      "no": "Nei",
+      "not_found": "Enten skrev du inn feil URL, eller så fulgte du en dårlig lenke.",
+      "yes": "Ja",
+      "unsaved_changes": "Noen av endringene dine ble ikke lagret. Er du sikker på at du vil ignorere dem?"
+    },
+    "navigation": {
+      "no_results": "Ingen resultater",
+      "no_more_results": "Sidetallet %{page} er utenfor grensene. Prøv forrige side.",
+      "page_out_of_boundaries": "Sidetall %{page} utenfor grensene",
+      "page_out_from_end": "Kan ikke gå etter siste side",
+      "page_out_from_begin": "Kan ikke gå før side 1",
+      "page_range_info": "%{offsetBegin}-%{offsetEnd} av %{total}",
+      "page_rows_per_page": "Elementer per side:",
+      "next": "Neste",
+      "prev": "Forrige",
+      "skip_nav": "Hopp til innholdet"
+    },
+    "notification": {
+      "updated": "Element oppdatert |||| %{smart_count} elementer er oppdatert",
+      "created": "Element opprettet",
+      "deleted": "Element slettet |||| %{smart_count} elementer slettet",
+      "bad_item": "Feil element",
+      "item_doesnt_exist": "Elementet eksisterer ikke",
+      "http_error": "Serverkommunikasjonsfeil",
+      "data_provider_error": "dataleverandørfeil. Sjekk konsollen for detaljer.",
+      "i18n_error": "Kan ikke laste oversettelsene for det angitte språket",
+      "canceled": "Handlingen avbrutt",
+      "logged_out": "Økten din er avsluttet. Koble til på nytt.",
+      "new_version": "Ny versjon tilgjengelig! Trykk Oppdater "
+    },
+    "toggleFieldsMenu": {
+      "columnsToDisplay": "Kolonner som skal vises",
+      "layout": "Oppsett",
+      "grid": "Nett",
+      "table": "Bord"
+    }
+  },
+  "message": {
+    "note": "Info",
+    "transcodingDisabled": "Endring av transkodingskonfigurasjonen gjennom webgrensesnittet er deaktivert av sikkerhetsgrunner. Hvis du ønsker å endre (redigere eller legge til) transkodingsalternativer, start serveren på nytt med %{config}-konfigurasjonsalternativet.",
+    "transcodingEnabled": "Navidrome kjører for øyeblikket med %{config}, noe som gjør det mulig å kjøre systemkommandoer fra transkodingsinnstillingene ved å bruke nettgrensesnittet. Vi anbefaler å deaktivere den av sikkerhetsgrunner og bare aktivere den når du konfigurerer alternativer for omkoding.",
+    "songsAddedToPlaylist": "Lagt til 1 sang i spillelisten |||| Lagt til %{smart_count} sanger i spillelisten",
+    "noPlaylistsAvailable": "Ingen tilgjengelig",
+    "delete_user_title": "Slett bruker «%{name}»",
+    "delete_user_content": "Er du sikker på at du vil slette denne brukeren og alle dataene deres (inkludert spillelister og preferanser)?",
+    "notifications_blocked": "Du har blokkert varsler for dette nettstedet i nettleserens innstillinger",
+    "notifications_not_available": "Denne nettleseren støtter ikke skrivebordsvarsler, eller du har ikke tilgang til Navidrome over https",
+    "lastfmLinkSuccess": "Last.fm er vellykket koblet og scrobbling aktivert",
+    "lastfmLinkFailure": "Last.fm kunne ikke kobles til",
+    "lastfmUnlinkSuccess": "Last.fm koblet fra og scrobbling deaktivert",
+    "lastfmUnlinkFailure": "Last.fm kunne ikke kobles fra",
+    "openIn": {
+      "lastfm": "Åpne i Last.fm",
+      "musicbrainz": "Åpne i MusicBrainz"
+    },
+    "lastfmLink": "Les mer...",
+    "listenBrainzLinkSuccess": "ListenBrainz er vellykket koblet og scrobbling aktivert som bruker: %{user}",
+    "listenBrainzLinkFailure": "ListenBrainz kunne ikke kobles: %{error}",
+    "listenBrainzUnlinkSuccess": "ListenBrainz koblet fra og scrobbling deaktivert",
+    "listenBrainzUnlinkFailure": "ListenBrainz kunne ikke fjernes",
+    "downloadOriginalFormat": "",
+    "shareOriginalFormat": "",
+    "shareDialogTitle": "",
+    "shareBatchDialogTitle": "",
+    "shareSuccess": "",
+    "shareFailure": "",
+    "downloadDialogTitle": "",
+    "shareCopyToClipboard": "",
+    "remove_missing_title": "",
+    "remove_missing_content": ""
+  },
+  "menu": {
+    "library": "Bibliotek",
+    "settings": "Innstillinger",
+    "version": "Versjon",
+    "theme": "Tema",
+    "personal": {
+      "name": "Personlig",
+      "options": {
+        "theme": "Tema",
+        "language": "Språk",
+        "defaultView": "Standardvisning",
+        "desktop_notifications": "Skrivebordsvarsler",
+        "lastfmScrobbling": "Scrobble til Last.fm",
+        "listenBrainzScrobbling": "Scrobble til ListenBrainz",
+        "replaygain": "",
+        "preAmp": "",
+        "gain": {
+          "none": "",
+          "album": "",
+          "track": ""
+        },
+        "lastfmNotConfigured": ""
+      }
+    },
+    "albumList": "Album",
+    "about": "Om",
+    "playlists": "Spilleliste",
+    "sharedPlaylists": "Delte spillelister"
+  },
+  "player": {
+    "playListsText": "Spillekø",
+    "openText": "Åpne",
+    "closeText": "Lukk",
+    "notContentText": "Ingen musikk",
+    "clickToPlayText": "Klikk for å spille",
+    "clickToPauseText": "Klikk for å sette på pause",
+    "nextTrackText": "Neste spor",
+    "previousTrackText": "Forrige spor",
+    "reloadText": "Last inn på nytt",
+    "volumeText": "Volum",
+    "toggleLyricText": "Veksle mellom tekster",
+    "toggleMiniModeText": "Minimer",
+    "destroyText": "Ødelegge",
+    "downloadText": "nedlasting",
+    "removeAudioListsText": "Slett lydlister",
+    "clickToDeleteText": "Klikk for å slette %{name}",
+    "emptyLyricText": "Ingen sangtekster",
+    "playModeText": {
+      "order": "I rekkefølge",
+      "orderLoop": "Gjenta",
+      "singleLoop": "Gjenta engang",
+      "shufflePlay": "Tilfeldig rekkefølge"
+    }
+  },
+  "about": {
+    "links": {
+      "homepage": "Hjemmeside",
+      "source": "Kildekode",
+      "featureRequests": "Funksjonsforespørsler",
+      "lastInsightsCollection": "",
+      "insights": {
+        "disabled": "",
+        "waiting": ""
+      }
+    }
+  },
+  "activity": {
+    "title": "Aktivitet",
+    "totalScanned": "Totalt skannede mapper",
+    "quickScan": "Rask skanning",
+    "fullScan": "Full skanning",
+    "serverUptime": "Serveroppetid",
+    "serverDown": "OFFLINE"
+  },
+  "help": {
+    "title": "Navidrome hurtigtaster",
+    "hotkeys": {
+      "show_help": "Vis denne hjelpen",
+      "toggle_menu": "Bytt menysidelinje",
+      "toggle_play": "Spill / Pause",
+      "prev_song": "Forrige sang",
+      "next_song": "Neste sang",
+      "vol_up": "Volum opp",
+      "vol_down": "Volum ned",
+      "toggle_love": "Legg til dette sporet i favoritter",
+      "current_song": ""
+    }
+  }
+}

resources/i18n/pl.json

@@ -26,7 +26,14 @@
         "bpm": "BPM",
         "playDate": "Ostatnio Odtwarzane",
         "channels": "Kanały",
-        "createdAt": "Data dodania"
+        "createdAt": "Data dodania",
+        "grouping": "",
+        "mood": "",
+        "participants": "",
+        "tags": "",
+        "mappedTags": "",
+        "rawTags": "",
+        "bitDepth": ""
       },
       "actions": {
         "addToQueue": "Odtwarzaj Później",
@@ -58,7 +65,13 @@
         "originalDate": "Pierwotna Data",
         "releaseDate": "Data Wydania",
         "releases": "Wydanie |||| Wydania",
-        "released": "Wydany"
+        "released": "Wydany",
+        "recordLabel": "",
+        "catalogNum": "",
+        "releaseType": "",
+        "grouping": "",
+        "media": "",
+        "mood": ""
       },
       "actions": {
         "playAll": "Odtwarzaj",
@@ -89,7 +102,23 @@
         "playCount": "Liczba Odtworzeń",
         "rating": "Ocena",
         "genre": "Gatunek",
-        "size": "Rozmiar"
+        "size": "Rozmiar",
+        "role": ""
+      },
+      "roles": {
+        "albumartist": "",
+        "artist": "",
+        "composer": "",
+        "conductor": "",
+        "lyricist": "",
+        "arranger": "",
+        "producer": "Producent |||| Producenci",
+        "director": "Reżyser |||| Reżyserzy",
+        "engineer": "Inżynier |||| Inżynierowie",
+        "mixer": "Mikser |||| Mikserzy",
+        "remixer": "Remixer |||| Remixerzy",
+        "djmixer": "Didżej |||| Didżerzy",
+        "performer": "Wykonawca |||| Wykonawcy"
       }
     },
     "user": {
@@ -198,6 +227,21 @@
         "createdAt": "Stworzono",
         "downloadable": "Zezwolić Na Pobieranie?"
       }
+    },
+    "missing": {
+      "name": "Brakujący Plik|||| Brakujące Pliki",
+      "fields": {
+        "path": "Ścieżka",
+        "size": "Rozmiar",
+        "updatedAt": "Zniknął na"
+      },
+      "actions": {
+        "remove": "Usuń"
+      },
+      "notifications": {
+        "removed": "Usunięto brakujące pliki"
+      },
+      "empty": ""
     }
   },
   "ra": {
@@ -375,7 +419,9 @@
     "shareSuccess": "Adres URL skopiowany do schowka: %{url}",
     "shareFailure": "Błąd podczas kopiowania URL %{url} do schowka",
     "downloadDialogTitle": "Pobierz %{resource} '%{name}' (%{size})",
-    "shareCopyToClipboard": "Skopiuj do schowka: Ctrl+C, Enter"
+    "shareCopyToClipboard": "Skopiuj do schowka: Ctrl+C, Enter",
+    "remove_missing_title": "Usuń brakujące dane",
+    "remove_missing_content": "Czy na pewno chcesz usunąć wybrane brakujące pliki z bazy danych? Spowoduje to trwałe usunięcie wszystkich powiązań, takich jak liczba odtworzeń i oceny."
   },
   "menu": {
     "library": "Biblioteka",

resources/i18n/pt.json

@@ -18,6 +18,7 @@
         "size": "Tamanho",
         "updatedAt": "Últ. Atualização",
         "bitRate": "Bitrate",
+        "bitDepth": "Profundidade de bits",
         "discSubtitle": "Sub-título do disco",
         "starred": "Favorita",
         "comment": "Comentário",
@@ -56,6 +57,7 @@
         "genre": "Gênero",
         "compilation": "Coletânea",
         "year": "Ano",
+        "date": "Data de Lançamento",
         "updatedAt": "Últ. Atualização",
         "comment": "Comentário",
         "rating": "Classificação",
@@ -229,6 +231,7 @@
     },
     "missing": {
       "name": "Arquivo ausente |||| Arquivos ausentes",
+      "empty": "Nenhum arquivo ausente",
       "fields": {
         "path": "Caminho",
         "size": "Tamanho",

resources/i18n/tr.json

@@ -32,7 +32,8 @@
         "participants": "Ek katılımcılar",
         "tags": "Ek Etiketler",
         "mappedTags": "Eşlenen etiketler",
-        "rawTags": "Ham etiketler"
+        "rawTags": "Ham etiketler",
+        "bitDepth": ""
       },
       "actions": {
         "addToQueue": "Oynatma Sırasına Ekle",
@@ -239,7 +240,8 @@
       },
       "notifications": {
         "removed": "Eksik dosya(lar) kaldırıldı"
-      }
+      },
+      "empty": "Eksik Dosya Yok"
     }
   },
   "ra": {

resources/mappings.yaml

@@ -1,6 +1,14 @@
 #file: noinspection SpellCheckingInspection
 # Tag mapping adapted from https://picard-docs.musicbrainz.org/downloads/MusicBrainz_Picard_Tag_Map.html
 #
+# NOTE FOR USERS:
+#
+# This file can be used as a reference to understand how Navidrome maps the tags in your music files to its fields.
+# If you want to customize these mappings, please refer to https://www.navidrome.org/docs/usage/customtags/
+#
+#
+# NOTE FOR DEVELOPERS:
+#
 # This file contains the mapping between the tags in your music files and the fields in Navidrome.
 # You can add new tags, change the aliases, or add new split characters to the existing tags.
 # The artists and roles keys are used to define how to split the tag values into multiple values.
@@ -96,7 +104,7 @@ main:
     aliases: [ disctotal, totaldiscs ]
     album: true
   discsubtitle:
-    aliases: [ tsst, discsubtitle, ----:com.apple.itunes:discsubtitle, wm/setsubtitle ]
+    aliases: [ tsst, discsubtitle, ----:com.apple.itunes:discsubtitle, setsubtitle, wm/setsubtitle ]
   bpm:
     aliases: [ tbpm, bpm, tmpo, wm/beatsperminute ]
   lyrics:
@@ -110,10 +118,10 @@ main:
     aliases: [ tdor, originaldate, ----:com.apple.itunes:originaldate, wm/originalreleasetime, tory, originalyear, ----:com.apple.itunes:originalyear, wm/originalreleaseyear ]
     type: date
   recordingdate:
-    aliases: [ tdrc, date, icrd, ©day, wm/year, year ]
+    aliases: [ tdrc, date, recordingdate, icrd, record date ]
     type: date
   releasedate:
-    aliases: [ tdrl, releasedate ]
+    aliases: [ tdrl, releasedate, ©day, wm/year, year ]
     type: date
   catalognumber:
     aliases: [ txxx:catalognumber, catalognumber, ----:com.apple.itunes:catalognumber, wm/catalogno ]

scanner/controller.go

@@ -98,7 +98,6 @@ type ProgressInfo struct {
 
 type scanner interface {
 	scanAll(ctx context.Context, fullScan bool, progress chan<- *ProgressInfo)
-	// BFR: scanFolders(ctx context.Context, lib model.Lib, folders []string, progress chan<- *ScannerStatus)
 }
 
 type controller struct {

scanner/external.go

@@ -33,6 +33,8 @@ func (s *scannerExternal) scanAll(ctx context.Context, fullScan bool, progress c
 	cmd := exec.CommandContext(ctx, exe, "scan",
 		"--nobanner", "--subprocess",
 		"--configfile", conf.Server.ConfigFile,
+		"--datafolder", conf.Server.DataFolder,
+		"--cachefolder", conf.Server.CacheFolder,
 		If(fullScan, "--full", ""))
 
 	in, out := io.Pipe()

scanner/phase_1_folders.go

@@ -150,6 +150,14 @@ func (p *phaseFolders) producer() ppl.Producer[*folderEntry] {
 					Path:      folder.path,
 					Phase:     "1",
 				})
+
+				// Log folder info
+				log.Trace(p.ctx, "Scanner: Checking folder state", " folder", folder.path, "_updTime", folder.updTime,
+					"_modTime", folder.modTime, "_lastScanStartedAt", folder.job.lib.LastScanStartedAt,
+					"numAudioFiles", len(folder.audioFiles), "numImageFiles", len(folder.imageFiles),
+					"numPlaylists", folder.numPlaylists, "numSubfolders", folder.numSubFolders)
+
+				// Check if folder is outdated
 				if folder.isOutdated() {
 					if !p.state.fullScan {
 						if folder.hasNoFiles() && folder.isNew() {
@@ -161,6 +169,8 @@ func (p *phaseFolders) producer() ppl.Producer[*folderEntry] {
 					totalChanged++
 					folder.elapsed.Stop()
 					put(folder)
+				} else {
+					log.Trace(p.ctx, "Scanner: Skipping up-to-date folder", "folder", folder.path, "lastUpdate", folder.modTime, "lib", job.lib.Name)
 				}
 			}
 			total += job.numFolders.Load()
@@ -334,7 +344,8 @@ func (p *phaseFolders) persistChanges(entry *folderEntry) (*folderEntry, error)
 
 		// Save all new/modified artists to DB. Their information will be incomplete, but they will be refreshed later
 		for i := range entry.artists {
-			err = artistRepo.Put(&entry.artists[i], "name", "mbz_artist_id", "sort_artist_name", "order_artist_name")
+			err = artistRepo.Put(&entry.artists[i], "name",
+				"mbz_artist_id", "sort_artist_name", "order_artist_name", "full_text")
 			if err != nil {
 				log.Error(p.ctx, "Scanner: Error persisting artist to DB", "folder", entry.path, "artist", entry.artists[i].Name, err)
 				return err

scanner/phase_4_playlists.go

@@ -45,8 +45,12 @@ func (p *phasePlaylists) producer() ppl.Producer[*model.Folder] {
 }
 
 func (p *phasePlaylists) produce(put func(entry *model.Folder)) error {
+	if !conf.Server.AutoImportPlaylists {
+		log.Info(p.ctx, "Playlists will not be imported, AutoImportPlaylists is set to false")
+		return nil
+	}
 	u, _ := request.UserFrom(p.ctx)
-	if !conf.Server.AutoImportPlaylists || !u.IsAdmin {
+	if !u.IsAdmin {
 		log.Warn(p.ctx, "Playlists will not be imported, as there are no admin users yet, "+
 			"Please create an admin user first, and then update the playlists for them to be imported")
 		return nil

scanner/walk_dir_tree.go

@@ -70,7 +70,6 @@ func newFolderEntry(job *scanJob, path string) *folderEntry {
 		albumIDMap: make(map[string]string),
 		updTime:    job.popLastUpdate(id),
 	}
-	f.elapsed.Start()
 	return f
 }
 
@@ -115,6 +114,8 @@ func walkFolder(ctx context.Context, job *scanJob, currentFolder string, ignoreP
 		"images", maps.Keys(folder.imageFiles), "playlists", folder.numPlaylists, "imagesUpdatedAt", folder.imagesUpdatedAt,
 		"updTime", folder.updTime, "modTime", folder.modTime, "numChildren", len(children))
 	folder.path = dir
+	folder.elapsed.Start()
+
 	results <- folder
 
 	return nil
@@ -145,7 +146,10 @@ func loadIgnoredPatterns(ctx context.Context, fsys fs.FS, currentFolder string,
 		}
 		// If the .ndignore file is empty, mimic the current behavior and ignore everything
 		if len(newPatterns) == 0 {
+			log.Trace(ctx, "Scanner: .ndignore file is empty, ignoring everything", "path", currentFolder)
 			newPatterns = []string{"**/*"}
+		} else {
+			log.Trace(ctx, "Scanner: .ndignore file found ", "path", ignoreFilePath, "patterns", newPatterns)
 		}
 	}
 	// Combine the patterns from the .ndignore file with the ones passed as argument
@@ -180,7 +184,7 @@ func loadDir(ctx context.Context, job *scanJob, dirPath string, ignorePatterns [
 	children = make([]string, 0, len(entries))
 	for _, entry := range entries {
 		entryPath := path.Join(dirPath, entry.Name())
-		if len(ignorePatterns) > 0 && isScanIgnored(ignoreMatcher, entryPath) {
+		if len(ignorePatterns) > 0 && isScanIgnored(ctx, ignoreMatcher, entryPath) {
 			log.Trace(ctx, "Scanner: Ignoring entry", "path", entryPath)
 			continue
 		}
@@ -309,6 +313,10 @@ func isEntryIgnored(name string) bool {
 	return strings.HasPrefix(name, ".") && !strings.HasPrefix(name, "..")
 }
 
-func isScanIgnored(matcher *ignore.GitIgnore, entryPath string) bool {
-	return matcher.MatchesPath(entryPath)
+func isScanIgnored(ctx context.Context, matcher *ignore.GitIgnore, entryPath string) bool {
+	matches := matcher.MatchesPath(entryPath)
+	if matches {
+		log.Trace(ctx, "Scanner: Ignoring entry matching .ndignore: ", "path", entryPath)
+	}
+	return matches
 }

scanner/watcher.go

@@ -101,22 +101,27 @@ func watchLib(ctx context.Context, lib model.Library, watchChan chan struct{}) {
 		log.Error(ctx, "Watcher: Error watching library", "library", lib.ID, "path", lib.Path, err)
 		return
 	}
-	log.Info(ctx, "Watcher started", "library", lib.ID, "path", lib.Path)
+	absLibPath, err := filepath.Abs(lib.Path)
+	if err != nil {
+		log.Error(ctx, "Watcher: Error converting lib.Path to absolute", "library", lib.ID, "path", lib.Path, err)
+		return
+	}
+	log.Info(ctx, "Watcher started", "library", lib.ID, "libPath", lib.Path, "absoluteLibPath", absLibPath)
 	for {
 		select {
 		case <-ctx.Done():
 			return
 		case path := <-c:
-			path, err = filepath.Rel(lib.Path, path)
+			path, err = filepath.Rel(absLibPath, path)
 			if err != nil {
-				log.Error(ctx, "Watcher: Error getting relative path", "library", lib.ID, "path", path, err)
+				log.Error(ctx, "Watcher: Error getting relative path", "library", lib.ID, "libPath", absLibPath, "path", path, err)
 				continue
 			}
 			if isIgnoredPath(ctx, fsys, path) {
 				log.Trace(ctx, "Watcher: Ignoring change", "library", lib.ID, "path", path)
 				continue
 			}
-			log.Trace(ctx, "Watcher: Detected change", "library", lib.ID, "path", path)
+			log.Trace(ctx, "Watcher: Detected change", "library", lib.ID, "path", path, "libPath", absLibPath)
 			watchChan <- struct{}{}
 		}
 	}

server/subsonic/browsing.go

@@ -252,9 +252,7 @@ func (api *Router) GetSong(r *http.Request) (*responses.Subsonic, error) {
 
 func (api *Router) GetGenres(r *http.Request) (*responses.Subsonic, error) {
 	ctx := r.Context()
-	// TODO Put back when album_count is available
-	//genres, err := api.ds.Genre(ctx).GetAll(model.QueryOptions{Sort: "song_count, album_count, name desc", Order: "desc"})
-	genres, err := api.ds.Genre(ctx).GetAll(model.QueryOptions{Sort: "song_count, name desc", Order: "desc"})
+	genres, err := api.ds.Genre(ctx).GetAll(model.QueryOptions{Sort: "song_count, album_count, name desc", Order: "desc"})
 	if err != nil {
 		log.Error(r, err)
 		return nil, err
@@ -270,30 +268,43 @@ func (api *Router) GetGenres(r *http.Request) (*responses.Subsonic, error) {
 	return response, nil
 }
 
-func (api *Router) GetArtistInfo(r *http.Request) (*responses.Subsonic, error) {
+func (api *Router) getArtistInfo(r *http.Request) (*responses.ArtistInfoBase, *model.Artists, error) {
 	ctx := r.Context()
 	p := req.Params(r)
 	id, err := p.String("id")
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	count := p.IntOr("count", 20)
 	includeNotPresent := p.BoolOr("includeNotPresent", false)
 
 	artist, err := api.externalMetadata.UpdateArtistInfo(ctx, id, count, includeNotPresent)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	base := responses.ArtistInfoBase{}
+	base.Biography = artist.Biography
+	base.SmallImageUrl = public.ImageURL(r, artist.CoverArtID(), 300)
+	base.MediumImageUrl = public.ImageURL(r, artist.CoverArtID(), 600)
+	base.LargeImageUrl = public.ImageURL(r, artist.CoverArtID(), 1200)
+	base.LastFmUrl = artist.ExternalUrl
+	base.MusicBrainzID = artist.MbzArtistID
+
+	return &base, &artist.SimilarArtists, nil
+}
+
+func (api *Router) GetArtistInfo(r *http.Request) (*responses.Subsonic, error) {
+	base, similarArtists, err := api.getArtistInfo(r)
 	if err != nil {
 		return nil, err
 	}
 
 	response := newResponse()
 	response.ArtistInfo = &responses.ArtistInfo{}
-	response.ArtistInfo.Biography = artist.Biography
-	response.ArtistInfo.SmallImageUrl = public.ImageURL(r, artist.CoverArtID(), 300)
-	response.ArtistInfo.MediumImageUrl = public.ImageURL(r, artist.CoverArtID(), 600)
-	response.ArtistInfo.LargeImageUrl = public.ImageURL(r, artist.CoverArtID(), 1200)
-	response.ArtistInfo.LastFmUrl = artist.ExternalUrl
-	response.ArtistInfo.MusicBrainzID = artist.MbzArtistID
-	for _, s := range artist.SimilarArtists {
+	response.ArtistInfo.ArtistInfoBase = *base
+
+	for _, s := range *similarArtists {
 		similar := toArtist(r, s)
 		if s.ID == "" {
 			similar.Id = "-1"
@@ -304,23 +315,20 @@ func (api *Router) GetArtistInfo(r *http.Request) (*responses.Subsonic, error) {
 }
 
 func (api *Router) GetArtistInfo2(r *http.Request) (*responses.Subsonic, error) {
-	info, err := api.GetArtistInfo(r)
+	base, similarArtists, err := api.getArtistInfo(r)
 	if err != nil {
 		return nil, err
 	}
 
 	response := newResponse()
 	response.ArtistInfo2 = &responses.ArtistInfo2{}
-	response.ArtistInfo2.ArtistInfoBase = info.ArtistInfo.ArtistInfoBase
-	for _, s := range info.ArtistInfo.SimilarArtist {
-		similar := responses.ArtistID3{}
-		similar.Id = s.Id
-		similar.Name = s.Name
-		similar.AlbumCount = s.AlbumCount
-		similar.Starred = s.Starred
-		similar.UserRating = s.UserRating
-		similar.CoverArt = s.CoverArt
-		similar.ArtistImageUrl = s.ArtistImageUrl
+	response.ArtistInfo2.ArtistInfoBase = *base
+
+	for _, s := range *similarArtists {
+		similar := toArtistID3(r, s)
+		if s.ID == "" {
+			similar.Id = "-1"
+		}
 		response.ArtistInfo2.SimilarArtist = append(response.ArtistInfo2.SimilarArtist, similar)
 	}
 	return response, nil
@@ -414,7 +422,7 @@ func (api *Router) buildArtist(r *http.Request, artist *model.Artist) (*response
 		return nil, err
 	}
 
-	a.Album = slice.MapWithArg(albums, ctx, childFromAlbum)
+	a.Album = slice.MapWithArg(albums, ctx, buildAlbumID3)
 	return a, nil
 }
 

server/subsonic/filter/filters.go

@@ -48,11 +48,11 @@ func AlbumsByArtist() Options {
 
 func AlbumsByArtistID(artistId string) Options {
 	filters := []Sqlizer{
-		persistence.Exists("json_tree(Participants, '$.albumartist')", Eq{"value": artistId}),
+		persistence.Exists("json_tree(participants, '$.albumartist')", Eq{"value": artistId}),
 	}
 	if conf.Server.Subsonic.ArtistParticipations {
 		filters = append(filters,
-			persistence.Exists("json_tree(Participants, '$.artist')", Eq{"value": artistId}),
+			persistence.Exists("json_tree(participants, '$.artist')", Eq{"value": artistId}),
 		)
 	}
 	return addDefaultFilters(Options{
@@ -62,13 +62,14 @@ func AlbumsByArtistID(artistId string) Options {
 }
 
 func AlbumsByYear(fromYear, toYear int) Options {
-	sortOption := "max_year, name"
+	orderOption := ""
 	if fromYear > toYear {
 		fromYear, toYear = toYear, fromYear
-		sortOption = "max_year desc, name"
+		orderOption = "desc"
 	}
 	return addDefaultFilters(Options{
-		Sort: sortOption,
+		Sort:  "max_year",
+		Order: orderOption,
 		Filters: Or{
 			And{
 				GtOrEq{"min_year": fromYear},
@@ -95,7 +96,7 @@ func SongsByRandom(genre string, fromYear, toYear int) Options {
 	}
 	ff := And{}
 	if genre != "" {
-		ff = append(ff, Eq{"genre.name": genre})
+		ff = append(ff, filterByGenre(genre))
 	}
 	if fromYear != 0 {
 		ff = append(ff, GtOrEq{"year": fromYear})
@@ -118,11 +119,15 @@ func SongWithLyrics(artist, title string) Options {
 
 func ByGenre(genre string) Options {
 	return addDefaultFilters(Options{
-		Sort: "name asc",
-		Filters: persistence.Exists("json_tree(tags)", And{
-			Like{"value": genre},
-			NotEq{"atom": nil},
-		}),
+		Sort:    "name",
+		Filters: filterByGenre(genre),
+	})
+}
+
+func filterByGenre(genre string) Sqlizer {
+	return persistence.Exists("json_tree(tags)", And{
+		Like{"value": genre},
+		NotEq{"atom": nil},
 	})
 }
 

server/subsonic/helpers.go

@@ -77,11 +77,26 @@ func sortName(sortName, orderName string) string {
 	return orderName
 }
 
+func getArtistAlbumCount(a model.Artist) int32 {
+	albumStats := a.Stats[model.RoleAlbumArtist]
+
+	// If ArtistParticipations are set, then `getArtist` will return albums
+	// where the artist is an album artist OR artist. While it may be an underestimate,
+	// guess the count by taking a max of the album artist and artist count. This is
+	// guaranteed to be <= the actual count.
+	// Otherwise, return just the roles as album artist (precise)
+	if conf.Server.Subsonic.ArtistParticipations {
+		artistStats := a.Stats[model.RoleArtist]
+		return int32(max(artistStats.AlbumCount, albumStats.AlbumCount))
+	} else {
+		return int32(albumStats.AlbumCount)
+	}
+}
+
 func toArtist(r *http.Request, a model.Artist) responses.Artist {
 	artist := responses.Artist{
 		Id:             a.ID,
 		Name:           a.Name,
-		AlbumCount:     int32(a.AlbumCount),
 		UserRating:     int32(a.Rating),
 		CoverArt:       a.CoverArtID().String(),
 		ArtistImageUrl: public.ImageURL(r, a.CoverArtID(), 600),
@@ -96,7 +111,7 @@ func toArtistID3(r *http.Request, a model.Artist) responses.ArtistID3 {
 	artist := responses.ArtistID3{
 		Id:             a.ID,
 		Name:           a.Name,
-		AlbumCount:     int32(a.AlbumCount),
+		AlbumCount:     getArtistAlbumCount(a),
 		CoverArt:       a.CoverArtID().String(),
 		ArtistImageUrl: public.ImageURL(r, a.CoverArtID(), 600),
 		UserRating:     int32(a.Rating),
@@ -220,13 +235,12 @@ func osChildFromMediaFile(ctx context.Context, mf model.MediaFile) *responses.Op
 	child.BitDepth = int32(mf.BitDepth)
 	child.Genres = toItemGenres(mf.Genres)
 	child.Moods = mf.Tags.Values(model.TagMood)
-	// BFR What if Child is an Album and not a Song?
 	child.DisplayArtist = mf.Artist
 	child.Artists = artistRefs(mf.Participants[model.RoleArtist])
 	child.DisplayAlbumArtist = mf.AlbumArtist
 	child.AlbumArtists = artistRefs(mf.Participants[model.RoleAlbumArtist])
 	var contributors []responses.Contributor
-	child.DisplayComposer = mf.Participants[model.RoleComposer].Join(" • ")
+	child.DisplayComposer = mf.Participants[model.RoleComposer].Join(consts.ArtistJoiner)
 	for role, participants := range mf.Participants {
 		if role == model.RoleArtist || role == model.RoleAlbumArtist {
 			continue
@@ -282,7 +296,7 @@ func childFromAlbum(ctx context.Context, al model.Album) responses.Child {
 	child.Name = al.Name
 	child.Album = al.Name
 	child.Artist = al.AlbumArtist
-	child.Year = int32(al.MaxYear)
+	child.Year = int32(cmp.Or(al.MaxOriginalYear, al.MaxYear))
 	child.Genre = al.Genre
 	child.CoverArt = al.CoverArtID().String()
 	child.Created = &al.CreatedAt
@@ -366,7 +380,7 @@ func buildAlbumID3(ctx context.Context, album model.Album) responses.AlbumID3 {
 	dir.SongCount = int32(album.SongCount)
 	dir.Duration = int32(album.Duration)
 	dir.PlayCount = album.PlayCount
-	dir.Year = int32(album.MaxYear)
+	dir.Year = int32(cmp.Or(album.MaxOriginalYear, album.MaxYear))
 	dir.Genre = album.Genre
 	if !album.CreatedAt.IsZero() {
 		dir.Created = &album.CreatedAt

server/subsonic/helpers_test.go

@@ -10,6 +10,10 @@ import (
 )
 
 var _ = Describe("helpers", func() {
+	BeforeEach(func() {
+		DeferCleanup(configtest.SetupConfig())
+	})
+
 	Describe("fakePath", func() {
 		var mf model.MediaFile
 		BeforeEach(func() {
@@ -134,4 +138,29 @@ var _ = Describe("helpers", func() {
 		Entry("returns \"explicit\" when the db value is \"e\"", "e", "explicit"),
 		Entry("returns an empty string when the db value is \"\"", "", ""),
 		Entry("returns an empty string when there are unexpected values on the db", "abc", ""))
+
+	Describe("getArtistAlbumCount", func() {
+		artist := model.Artist{
+			Stats: map[model.Role]model.ArtistStats{
+				model.RoleAlbumArtist: {
+					AlbumCount: 3,
+				},
+				model.RoleArtist: {
+					AlbumCount: 4,
+				},
+			},
+		}
+
+		It("Handles album count without artist participations", func() {
+			conf.Server.Subsonic.ArtistParticipations = false
+			result := getArtistAlbumCount(artist)
+			Expect(result).To(Equal(int32(3)))
+		})
+
+		It("Handles album count without with participations", func() {
+			conf.Server.Subsonic.ArtistParticipations = true
+			result := getArtistAlbumCount(artist)
+			Expect(result).To(Equal(int32(4)))
+		})
+	})
 })

server/subsonic/responses/.snapshots/Responses AlbumInfo with data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "albumInfo": {
     "notes": "Believe is the twenty-third studio album by American singer-actress Cher...",

server/subsonic/responses/.snapshots/Responses AlbumInfo with data should match .XML

@@ -1,4 +1,4 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <albumInfo>
     <notes>Believe is the twenty-third studio album by American singer-actress Cher...</notes>
     <musicBrainzId>03c91c40-49a6-44a7-90e7-a700edf97a62</musicBrainzId>

server/subsonic/responses/.snapshots/Responses AlbumInfo without data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "albumInfo": {}
 }

server/subsonic/responses/.snapshots/Responses AlbumInfo without data should match .XML

@@ -1,3 +1,3 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <albumInfo></albumInfo>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses AlbumList with OS data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "albumList": {
     "album": [

server/subsonic/responses/.snapshots/Responses AlbumList with OS data should match .XML

@@ -1,4 +1,4 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <albumList>
     <album id="1" isDir="false" isVideo="false" sortName="sort name" mediaType="album" musicBrainzId="00000000-0000-0000-0000-000000000000" displayArtist="Display artist" displayAlbumArtist="Display album artist" explicitStatus="explicit">
       <genres name="Genre 1"></genres>

server/subsonic/responses/.snapshots/Responses AlbumList with data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "albumList": {
     "album": [

server/subsonic/responses/.snapshots/Responses AlbumList with data should match .XML

@@ -1,4 +1,4 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <albumList>
     <album id="1" isDir="false" title="title" isVideo="false"></album>
   </albumList>

server/subsonic/responses/.snapshots/Responses AlbumList without data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "albumList": {}
 }

server/subsonic/responses/.snapshots/Responses AlbumList without data should match .XML

@@ -1,3 +1,3 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <albumList></albumList>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses AlbumWithSongsID3 with data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "album": {
     "id": "1",

server/subsonic/responses/.snapshots/Responses AlbumWithSongsID3 with data should match .XML

@@ -1,4 +1,4 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <album id="1" name="album" artist="artist" genre="rock" userRating="4" musicBrainzId="1234" isCompilation="true" sortName="sorted album" displayArtist="artist1 &amp; artist2" explicitStatus="clean" version="Deluxe Edition">
     <genres name="rock"></genres>
     <genres name="progressive"></genres>

server/subsonic/responses/.snapshots/Responses AlbumWithSongsID3 without data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "album": {
     "id": "",

server/subsonic/responses/.snapshots/Responses AlbumWithSongsID3 without data should match .XML

@@ -1,3 +1,3 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <album id="" name=""></album>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses AlbumWithSongsID3 without data should match OpenSubsonic .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "album": {
     "id": "",

server/subsonic/responses/.snapshots/Responses AlbumWithSongsID3 without data should match OpenSubsonic .XML

@@ -1,3 +1,3 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <album id="" name=""></album>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses Artist with OpenSubsonic data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "artists": {
     "index": [

server/subsonic/responses/.snapshots/Responses Artist with OpenSubsonic data should match .XML

@@ -1,4 +1,4 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <artists lastModified="1" ignoredArticles="A">
     <index name="A">
       <artist id="111" name="aaa" albumCount="2" starred="2016-03-02T20:30:00Z" userRating="3" artistImageUrl="https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png" musicBrainzId="1234" sortName="sort name">

server/subsonic/responses/.snapshots/Responses Artist with data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "artists": {
     "index": [

server/subsonic/responses/.snapshots/Responses Artist with data should match .XML

@@ -1,4 +1,4 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <artists lastModified="1" ignoredArticles="A">
     <index name="A">
       <artist id="111" name="aaa" albumCount="2" starred="2016-03-02T20:30:00Z" userRating="3" artistImageUrl="https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png"></artist>

server/subsonic/responses/.snapshots/Responses Artist without data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "artists": {
     "lastModified": 1,

server/subsonic/responses/.snapshots/Responses Artist without data should match .XML

@@ -1,3 +1,3 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <artists lastModified="1" ignoredArticles="A"></artists>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses ArtistInfo with data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "artistInfo": {
     "biography": "Black Sabbath is an English \u003ca target='_blank' href=\"https://www.last.fm/tag/heavy%20metal\" class=\"bbcode_tag\" rel=\"tag\"\u003eheavy metal\u003c/a\u003e band",

server/subsonic/responses/.snapshots/Responses ArtistInfo with data should match .XML

@@ -1,4 +1,4 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <artistInfo>
     <biography>Black Sabbath is an English &lt;a target=&#39;_blank&#39; href=&#34;https://www.last.fm/tag/heavy%20metal&#34; class=&#34;bbcode_tag&#34; rel=&#34;tag&#34;&gt;heavy metal&lt;/a&gt; band</biography>
     <musicBrainzId>5182c1d9-c7d2-4dad-afa0-ccfeada921a8</musicBrainzId>

server/subsonic/responses/.snapshots/Responses ArtistInfo without data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "artistInfo": {}
 }

server/subsonic/responses/.snapshots/Responses ArtistInfo without data should match .XML

@@ -1,3 +1,3 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <artistInfo></artistInfo>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses Bookmarks with data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "bookmarks": {
     "bookmark": [

server/subsonic/responses/.snapshots/Responses Bookmarks with data should match .XML

@@ -1,4 +1,4 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <bookmarks>
     <bookmark position="123" username="user2" comment="a comment" created="0001-01-01T00:00:00Z" changed="0001-01-01T00:00:00Z">
       <entry id="1" isDir="false" title="title" isVideo="false"></entry>

server/subsonic/responses/.snapshots/Responses Bookmarks without data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "bookmarks": {}
 }

server/subsonic/responses/.snapshots/Responses Bookmarks without data should match .XML

@@ -1,3 +1,3 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <bookmarks></bookmarks>
 </subsonic-response>

server/subsonic/responses/.snapshots/Responses Child with data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "directory": {
     "child": [

server/subsonic/responses/.snapshots/Responses Child with data should match .XML

@@ -1,4 +1,4 @@
-<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.8.0" type="navidrome" serverVersion="v0.0.0" openSubsonic="true">
+<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
   <directory id="1" name="N">
     <child id="1" isDir="true" title="title" album="album" artist="artist" track="1" year="1985" genre="Rock" coverArt="1" size="8421341" contentType="audio/flac" suffix="flac" starred="2016-03-02T20:30:00Z" transcodedContentType="audio/mpeg" transcodedSuffix="mp3" duration="146" bitRate="320" isVideo="false" bpm="127" comment="a comment" sortName="sorted title" mediaType="song" musicBrainzId="4321" channelCount="2" samplingRate="44100" bitDepth="16" displayArtist="artist 1 &amp; artist 2" displayAlbumArtist="album artist 1 &amp; album artist 2" displayComposer="composer 1 &amp; composer 2" explicitStatus="clean">
       <genres name="rock"></genres>

server/subsonic/responses/.snapshots/Responses Child without data should match .JSON

@@ -1,8 +1,8 @@
 {
   "status": "ok",
-  "version": "1.8.0",
+  "version": "1.16.1",
   "type": "navidrome",
-  "serverVersion": "v0.0.0",
+  "serverVersion": "v0.55.0",
   "openSubsonic": true,
   "directory": {
     "child": [