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

track iterator for jellyfin + generics refactoring of helpers

Browse Source
This commit is contained in:
Drew Weymouth
2023-11-14 09:05:02 -08:00
parent 58428cc35d
commit 831ce1de97
7 changed files with 155 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/mediaprovider/jellyfin/albumiterator.go → backend/mediaprovider/jellyfin/iterators.go
+69 -21
View File
@@ -1,6 +1,8 @@
package jellyfin
import (
"time"
"github.com/dweymouth/go-jellyfin"
"github.com/dweymouth/supersonic/backend/mediaprovider"
"github.com/dweymouth/supersonic/backend/mediaprovider/helpers"
@@ -32,37 +34,34 @@ func (j *jellyfinMediaProvider) AlbumSortOrders() []string {
}
func (j *jellyfinMediaProvider) IterateAlbums(sortOrder string, filter mediaprovider.AlbumFilter) mediaprovider.AlbumIterator {
var jfFilt jellyfin.Filter
if filter.ExcludeUnfavorited {
jfFilt.Favorite = true
filter.ExcludeUnfavorited = false
}
var jfSort jellyfin.Sort
switch sortOrder {
case AlbumSortRecentlyAdded:
jfSort.Field = "DateCreated"
jfSort.Field = jellyfin.SortByDateCreated
jfSort.Mode = jellyfin.SortDesc
case AlbumSortFrequentlyPlayed:
jfSort.Field = "PlayCount"
jfSort.Field = jellyfin.SortByPlayCount
jfSort.Mode = jellyfin.SortDesc
case AlbumSortRandom:
jfSort.Field = "Random"
jfSort.Field = jellyfin.SortByRandom
case AlbumSortArtistAZ:
jfSort.Field = "AlbumArtist"
jfSort.Field = jellyfin.SortByArtist
jfSort.Mode = jellyfin.SortAsc
case AlbumSortTitleAZ:
jfSort.Field = "SortName"
jfSort.Field = jellyfin.SortByName
jfSort.Mode = jellyfin.SortAsc
case AlbumSortRecentlyPlayed:
jfSort.Field = "DatePlayed"
jfSort.Field = jellyfin.SortByDatePlayed
jfSort.Mode = jellyfin.SortDesc
case AlbumSortYearAscending:
jfSort.Field = "ProductionYear"
jfSort.Field = jellyfin.SortByYear
jfSort.Mode = jellyfin.SortAsc
case AlbumSortYearDescending:
jfSort.Field = "ProductionYear"
jfSort.Field = jellyfin.SortByYear
jfSort.Mode = jellyfin.SortDesc
}
jfFilt := jfFilterFromFilter(&filter)
fetcher := func(offs, limit int) ([]*mediaprovider.Album, error) {
al, err := j.client.GetAlbums(jellyfin.QueryOpts{
Sort: jfSort,
@@ -74,6 +73,7 @@ func (j *jellyfinMediaProvider) IterateAlbums(sortOrder string, filter mediaprov
}
return sharedutil.MapSlice(al, toAlbum), nil
}
if sortOrder == AlbumSortRandom {
determFetcher := func(offs, limit int) ([]*mediaprovider.Album, error) {
al, err := j.client.GetAlbums(jellyfin.QueryOpts{
@@ -86,17 +86,65 @@ func (j *jellyfinMediaProvider) IterateAlbums(sortOrder string, filter mediaprov
}
return sharedutil.MapSlice(al, toAlbum), nil
}
return helpers.NewRandomIter(determFetcher, fetcher, filter, j.prefetchCoverCB)
return helpers.NewRandomAlbumIter(determFetcher, fetcher, filter, j.prefetchCoverCB)
}
return helpers.NewBaseIter(fetcher, filter, j.prefetchCoverCB)
return helpers.NewAlbumIterator(fetcher, filter, j.prefetchCoverCB)
}
func (s *jellyfinMediaProvider) SearchAlbums(searchQuery string, filter mediaprovider.AlbumFilter) mediaprovider.AlbumIterator {
return nil
// TODO: unimplemented
func (j *jellyfinMediaProvider) SearchAlbums(searchQuery string, filter mediaprovider.AlbumFilter) mediaprovider.AlbumIterator {
fetcher := func(offs, limit int) ([]*mediaprovider.Album, error) {
sr, err := j.client.Search(searchQuery, jellyfin.TypeAlbum, jellyfin.Paging{StartIndex: offs, Limit: limit})
if err != nil {
return nil, err
}
return sharedutil.MapSlice(sr.Albums, toAlbum), nil
}
return helpers.NewAlbumIterator(fetcher, filter, j.prefetchCoverCB)
}
func (s *jellyfinMediaProvider) IterateTracks(searchQuery string) mediaprovider.TrackIterator {
return nil
// TODO: unimplemented
func (j *jellyfinMediaProvider) IterateTracks(searchQuery string) mediaprovider.TrackIterator {
var fetcher helpers.TrackFetchFn
if searchQuery == "" {
fetcher = func(offs, limit int) ([]*mediaprovider.Track, error) {
var opts jellyfin.QueryOpts
opts.Paging = jellyfin.Paging{StartIndex: offs, Limit: limit}
s, err := j.client.GetSongs(opts)
if err != nil {
return nil, err
}
return sharedutil.MapSlice(s, toTrack), nil
}
} else {
fetcher = func(offs, limit int) ([]*mediaprovider.Track, error) {
sr, err := j.client.Search(searchQuery, jellyfin.TypeSong, jellyfin.Paging{StartIndex: offs, Limit: limit})
if err != nil {
return nil, err
}
return sharedutil.MapSlice(sr.Songs, toTrack), nil
}
}
return helpers.NewTrackIterator(fetcher, j.prefetchCoverCB)
}
// Creates the Jellyfin filter to implement the given mediaprovider filter,
// and zeros out the now-unneeded fields in the mediaprovider filter.
func jfFilterFromFilter(filter *mediaprovider.AlbumFilter) jellyfin.Filter {
var jfFilt jellyfin.Filter
if filter.ExcludeUnfavorited {
jfFilt.Favorite = true
filter.ExcludeUnfavorited = false // Jellyfin will handle this filter
}
if filter.MinYear > 0 && filter.MaxYear > 0 {
jfFilt.YearRange = [2]int{filter.MinYear, filter.MaxYear}
filter.MinYear, filter.MaxYear = 0, 0
} else if filter.MinYear > 0 {
jfFilt.YearRange = [2]int{filter.MinYear, time.Now().Year()}
filter.MinYear, filter.MaxYear = 0, 0
} else if filter.MaxYear > 0 {
jfFilt.YearRange = [2]int{1900, filter.MaxYear}
filter.MinYear, filter.MaxYear = 0, 0
}
jfFilt.Genres = filter.Genres
filter.Genres = nil
return jfFilt
}
backend/mediaprovider/jellyfin/jellyfinmediaprovider.go
+3 -3
View File
@@ -149,7 +149,7 @@ func (j *jellyfinMediaProvider) GetTopTracks(artist mediaprovider.Artist, limit
func (j *jellyfinMediaProvider) GetRandomTracks(genreName string, limit int) ([]*mediaprovider.Track, error) {
var opts jellyfin.QueryOpts
opts.Paging.Limit = limit
opts.Filter.Genres = []jellyfin.NameID{{Name: genreName}}
opts.Filter.Genres = []string{genreName}
opts.Sort.Field = "Random"
tr, err := j.client.GetSongs(opts)
if err != nil {
@@ -341,13 +341,13 @@ func fillAlbum(a *jellyfin.Album, album *mediaprovider.Album) {
}
album.ID = a.ID
//album.CoverArtID = a.CoverArt
album.CoverArtID = a.ID
album.Name = a.Name
album.Duration = int(a.RunTimeTicks / 10_000_000)
album.ArtistIDs = artistIDs
album.ArtistNames = artistNames
album.Year = a.Year
//album.TrackCount = a.
album.TrackCount = a.ChildCount
album.Genres = a.Genres
album.Favorite = a.UserData.IsFavorite
}