heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(subsonic): change frequent album list to use total time played per album instead of play count. (#331)

Browse Source 
Co-authored-by: Brian Doherty <brian@mediaserver.dohertyfamily.me>
This commit is contained in:
brian-doherty
2023-06-29 16:11:15 -05:00
committed by GitHub
parent cbab68b057
commit 7982ffc0b4
6 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/ctrlsubsonic/handlers_by_folder.go
View File

@@ -150,7 +150,7 @@ func (c *Controller) ServeGetAlbumList(r *http.Request) *spec.Response {
JOIN plays
ON albums.id=plays.album_id AND plays.user_id=?`,
user.ID)
q = q.Order("plays.count DESC")
q = q.Order("plays.length DESC")
case "newest":
q = q.Order("created_at DESC")
case "random":

2
server/ctrlsubsonic/handlers_by_tags.go
View File

@@ -162,7 +162,7 @@ func (c *Controller) ServeGetAlbumListTwo(r *http.Request) *spec.Response {
case "frequent":
user := r.Context().Value(CtxUser).(*db.User)
q = q.Joins("JOIN plays ON albums.id=plays.album_id AND plays.user_id=?", user.ID)
q = q.Order("plays.count DESC")
q = q.Order("plays.length DESC")
case "newest":
q = q.Order("created_at DESC")
case "random":

2
server/ctrlsubsonic/handlers_common.go
View File

@@ -69,7 +69,7 @@ func (c *Controller) ServeScrobble(r *http.Request) *spec.Response {
optStamp := params.GetOrTime("time", time.Now())
optSubmission := params.GetOrBool("submission", true)
if err := streamUpdateStats(c.DB, user.ID, track.Album.ID, optStamp); err != nil {
if err := streamUpdateStats(c.DB, user.ID, track, optStamp); err != nil {
return spec.NewError(0, "error updating stats: %v", err)
}

9
server/ctrlsubsonic/handlers_raw.go
View File

@@ -58,19 +58,20 @@ func streamGetTransPrefProfile(dbc *db.DB, userID int, client string) (mime stri
var errUnknownMediaType = fmt.Errorf("media type is unknown")
func streamUpdateStats(dbc *db.DB, userID, albumID int, playTime time.Time) error {
func streamUpdateStats(dbc *db.DB, userID int, track *db.Track, playTime time.Time) error {
var play db.Play
err := dbc.
Where("album_id=? AND user_id=?", albumID, userID).
Where("album_id=? AND user_id=?", track.AlbumID, userID).
First(&play).
Error
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
return fmt.Errorf("find stat: %w", err)
}
play.AlbumID = albumID
play.AlbumID = track.AlbumID
play.UserID = userID
play.Count++ // for getAlbumList?type=frequent
play.Length += track.Length
if playTime.After(play.Time) {
play.Time = playTime // for getAlbumList?type=recent
}
@@ -269,7 +270,7 @@ func (c *Controller) ServeStream(w http.ResponseWriter, r *http.Request) *spec.R
if track, ok := audioFile.(*db.Track); ok && track.Album != nil {
defer func() {
if err := streamUpdateStats(c.DB, user.ID, track.Album.ID, time.Now()); err != nil {
if err := streamUpdateStats(c.DB, user.ID, track, time.Now()); err != nil {
log.Printf("error updating track status: %v", err)
}
}()