diff --git a/backend/mediaprovider/jellyfin/iterators.go b/backend/mediaprovider/jellyfin/iterators.go index 60c8a17..e7f299c 100644 --- a/backend/mediaprovider/jellyfin/iterators.go +++ b/backend/mediaprovider/jellyfin/iterators.go @@ -10,21 +10,17 @@ import ( ) const ( - AlbumSortRecentlyAdded string = "Recently Added" - AlbumSortRecentlyPlayed string = "Recently Played" - AlbumSortFrequentlyPlayed string = "Frequently Played" - AlbumSortRandom string = "Random" - AlbumSortTitleAZ string = "Title (A-Z)" - AlbumSortArtistAZ string = "Artist (A-Z)" - AlbumSortYearAscending string = "Year (ascending)" - AlbumSortYearDescending string = "Year (descending)" + AlbumSortRecentlyAdded string = "Recently Added" + AlbumSortRandom string = "Random" + AlbumSortTitleAZ string = "Title (A-Z)" + AlbumSortArtistAZ string = "Artist (A-Z)" + AlbumSortYearAscending string = "Year (ascending)" + AlbumSortYearDescending string = "Year (descending)" ) func (j *jellyfinMediaProvider) AlbumSortOrders() []string { return []string{ AlbumSortRecentlyAdded, - AlbumSortRecentlyPlayed, - AlbumSortFrequentlyPlayed, AlbumSortRandom, AlbumSortTitleAZ, AlbumSortArtistAZ, @@ -39,9 +35,6 @@ func (j *jellyfinMediaProvider) IterateAlbums(sortOrder string, filter mediaprov case AlbumSortRecentlyAdded: jfSort.Field = jellyfin.SortByDateCreated jfSort.Mode = jellyfin.SortDesc - case AlbumSortFrequentlyPlayed: - jfSort.Field = jellyfin.SortByPlayCount - jfSort.Mode = jellyfin.SortDesc case AlbumSortRandom: jfSort.Field = jellyfin.SortByRandom case AlbumSortArtistAZ: @@ -50,9 +43,6 @@ func (j *jellyfinMediaProvider) IterateAlbums(sortOrder string, filter mediaprov case AlbumSortTitleAZ: jfSort.Field = jellyfin.SortByName jfSort.Mode = jellyfin.SortAsc - case AlbumSortRecentlyPlayed: - jfSort.Field = jellyfin.SortByDatePlayed - jfSort.Mode = jellyfin.SortDesc case AlbumSortYearAscending: jfSort.Field = jellyfin.SortByYear jfSort.Mode = jellyfin.SortAsc diff --git a/ui/browsing/albumspage.go b/ui/browsing/albumspage.go index 50629ad..c93074c 100644 --- a/ui/browsing/albumspage.go +++ b/ui/browsing/albumspage.go @@ -35,11 +35,12 @@ func (a *albumsPageAdapter) PlaceholderResource() fyne.Resource { return myTheme func (a *albumsPageAdapter) Route() controller.Route { return controller.AlbumsRoute() } func (a *albumsPageAdapter) SortOrders() ([]string, string) { - orders := a.contr.App.ServerManager.Server.AlbumSortOrders() - if !sharedutil.SliceContains(a.mp.AlbumSortOrders(), a.cfg.SortOrder) { - a.cfg.SortOrder = string(a.mp.AlbumSortOrders()[0]) + orders := a.mp.AlbumSortOrders() + sortOrder := a.cfg.SortOrder + if !sharedutil.SliceContains(orders, sortOrder) { + sortOrder = string(orders[0]) } - return orders, a.cfg.SortOrder + return orders, sortOrder } func (a *albumsPageAdapter) SaveSortOrder(order string) {