mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 21:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Simplify normalized AlbumPlayCountMode calc

Browse source
This commit is contained in:
Deluan 2024-05-09 08:13:42 -04:00
parent 747069b229
commit 09d1fd0658
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
persistence/album_repository.go
View file

@ -4,7 +4,6 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"math"
"strings" "strings"
. "github.com/Masterminds/squirrel" . "github.com/Masterminds/squirrel"
@ -22,12 +21,10 @@ type albumRepository struct {
type dbAlbum struct { type dbAlbum struct {
*model.Album `structs:",flatten"` *model.Album `structs:",flatten"`
Discs string `structs:"-" json:"discs"` Discs string `structs:"-" json:"discs"`
PlayCount float64 `structs:"-" json:"play_count"`
} }
func (a *dbAlbum) PostScan() error { func (a *dbAlbum) PostScan() error {
a.Album.PlayCount = int64(math.Round(a.PlayCount))
if a.Discs != "" { if a.Discs != "" {
return json.Unmarshal([]byte(a.Discs), &a.Album.Discs) return json.Unmarshal([]byte(a.Discs), &a.Album.Discs)
} }

2
persistence/sql_annotations.go
View file

@ -28,7 +28,7 @@ func (r sqlRepository) newSelectWithAnnotation(idField string, options ...model.
"play_date", "play_date",
) )
if conf.Server.AlbumPlayCountMode == consts.AlbumPlayCountModeNormalized && r.tableName == "album" { if conf.Server.AlbumPlayCountMode == consts.AlbumPlayCountModeNormalized && r.tableName == "album" {
query = query.Columns("coalesce(round(cast(play_count as float) / coalesce(song_count, 1), 1), 0) as play_count") query = query.Columns("round(coalesce(round(cast(play_count as float) / coalesce(song_count, 1), 1), 0)) as play_count")
} else { } else {
query = query.Columns("coalesce(play_count, 0) as play_count") query = query.Columns("coalesce(play_count, 0) as play_count")
} }