owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix random iterator with filter

Browse Source
This commit is contained in:
Drew Weymouth
2023-05-15 18:42:48 -07:00
parent 5361de6581
commit ce2e4a5688
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/mediaprovider/subsonic/albumiterator.go
+30 -26
View File
@@ -281,31 +281,31 @@ func (r *randomIter) Next() *mediaprovider.Album {
return nil return nil
} }
if r.prefetched == nil { // repeat fetch task until we have matching results
// or we reach the end (handled via short circuit return)
for len(r.prefetched) == 0 {
if r.phaseTwo { if r.phaseTwo {
for len(r.prefetched) == 0 { // fetch albums from deterministic order
albums, err := r.s.GetAlbumList2("newest", map[string]string{"size": "20", "offset": strconv.Itoa(r.offset)}) albums, err := r.s.GetAlbumList2("newest", map[string]string{"size": "25", "offset": strconv.Itoa(r.offset)})
if err != nil { if err != nil {
log.Println(err) log.Printf("error fetching albums: %s", err.Error())
albums = nil albums = nil
} }
if len(albums) == 0 { if len(albums) == 0 {
r.done = true r.done = true
r.albumIDSet = nil r.albumIDSet = nil
return nil return nil
} }
r.offset += len(albums) r.offset += len(albums)
for _, album := range albums { for _, album := range albums {
if _, ok := r.albumIDSet[album.ID]; !ok && filterMatches(r.filter, album) { if _, ok := r.albumIDSet[album.ID]; !ok && filterMatches(r.filter, album) {
r.prefetched = append(r.prefetched, album) r.prefetched = append(r.prefetched, album)
if r.prefetchCB != nil { if r.prefetchCB != nil {
go r.prefetchCB(album.CoverArt) go r.prefetchCB(album.CoverArt)
}
r.albumIDSet[album.ID] = true
} }
r.albumIDSet[album.ID] = true
} }
} }
r.prefetchedPos = 0
} else { } else {
albums, err := r.s.GetAlbumList2("random", map[string]string{"size": "25"}) albums, err := r.s.GetAlbumList2("random", map[string]string{"size": "25"})
if err != nil { if err != nil {
@@ -316,13 +316,17 @@ func (r *randomIter) Next() *mediaprovider.Album {
} }
var hitCount int var hitCount int
for _, album := range albums { for _, album := range albums {
if _, ok := r.albumIDSet[album.ID]; !ok && filterMatches(r.filter, album) { if _, ok := r.albumIDSet[album.ID]; !ok {
// still need to keep track even if album is not matched
// by the filter because we need to know when to move to phase two
hitCount++ hitCount++
r.prefetched = append(r.prefetched, album)
if r.prefetchCB != nil {
go r.prefetchCB(album.CoverArt)
}
r.albumIDSet[album.ID] = true r.albumIDSet[album.ID] = true
if filterMatches(r.filter, album) {
r.prefetched = append(r.prefetched, album)
if r.prefetchCB != nil {
go r.prefetchCB(album.CoverArt)
}
}
} }
} }
if successRatio := float64(hitCount) / float64(25); successRatio < 0.3 { if successRatio := float64(hitCount) / float64(25); successRatio < 0.3 {