Michael Manganiello
a220243279
The Grid view and related components were highly coupled to Albums, including the filter button that is currently used only for album filtering. As part of the migration of Artists to Grid view, this is the smallest possible change to convert many of the existing code to generics/interfaces that will allow different media to be displayed and filtered by using Grid views. The main changes in this diff are: * Introduction of generics for Media types (`M`) and Filter options (`F`), which can be later extended to other entities besides Albums. * Complete decoupling of `GridViewPage` and related components from Albums (making these pages also generic). * Refactoring of Subsonic/Jellyfin specific code to understand these new generics when dealing with filtering logic.
85 lines
2.8 KiB
Go
85 lines
2.8 KiB
Go
package browsing
|
|
|
|
import (
|
|
"slices"
|
|
|
|
"fyne.io/fyne/v2"
|
|
"fyne.io/fyne/v2/widget"
|
|
"github.com/dweymouth/supersonic/backend"
|
|
"github.com/dweymouth/supersonic/backend/mediaprovider"
|
|
"github.com/dweymouth/supersonic/ui/controller"
|
|
myTheme "github.com/dweymouth/supersonic/ui/theme"
|
|
"github.com/dweymouth/supersonic/ui/util"
|
|
"github.com/dweymouth/supersonic/ui/widgets"
|
|
)
|
|
|
|
type albumsPageAdapter struct {
|
|
cfg *backend.AlbumsPageConfig
|
|
contr *controller.Controller
|
|
mp mediaprovider.MediaProvider
|
|
pm *backend.PlaybackManager
|
|
filter mediaprovider.AlbumFilter
|
|
filterBtn *widgets.AlbumFilterButton
|
|
}
|
|
|
|
func NewAlbumsPage(cfg *backend.AlbumsPageConfig, pool *util.WidgetPool, contr *controller.Controller, pm *backend.PlaybackManager, mp mediaprovider.MediaProvider, im *backend.ImageManager) Page {
|
|
adapter := &albumsPageAdapter{cfg: cfg, contr: contr, mp: mp, pm: pm}
|
|
return NewGridViewPage(adapter, pool, mp, im)
|
|
}
|
|
|
|
func (a *albumsPageAdapter) Title() string { return "Albums" }
|
|
|
|
func (a *albumsPageAdapter) Filter() mediaprovider.AlbumFilter {
|
|
if a.filter == nil {
|
|
a.filter = mediaprovider.NewAlbumFilter(
|
|
mediaprovider.AlbumFilterOptions{},
|
|
)
|
|
}
|
|
return a.filter
|
|
}
|
|
|
|
func (a *albumsPageAdapter) FilterButton() widgets.FilterButton[mediaprovider.Album, mediaprovider.AlbumFilterOptions] {
|
|
if a.filterBtn == nil {
|
|
disableGenres := len(a.Filter().Options().Genres) > 0
|
|
genreFn := a.mp.GetGenres
|
|
if disableGenres {
|
|
// genre filter is disabled for this page, so no need to actually call genre list fetching function
|
|
genreFn = func() ([]*mediaprovider.Genre, error) { return nil, nil }
|
|
}
|
|
a.filterBtn = widgets.NewAlbumFilterButton(a.Filter(), genreFn)
|
|
a.filterBtn.GenreDisabled = disableGenres
|
|
}
|
|
return a.filterBtn
|
|
}
|
|
|
|
func (a *albumsPageAdapter) PlaceholderResource() fyne.Resource { return myTheme.AlbumIcon }
|
|
|
|
func (a *albumsPageAdapter) Route() controller.Route { return controller.AlbumsRoute() }
|
|
|
|
func (a *albumsPageAdapter) SortOrders() ([]string, string) {
|
|
orders := a.mp.AlbumSortOrders()
|
|
sortOrder := a.cfg.SortOrder
|
|
if !slices.Contains(orders, sortOrder) {
|
|
sortOrder = string(orders[0])
|
|
}
|
|
return orders, sortOrder
|
|
}
|
|
|
|
func (a *albumsPageAdapter) SaveSortOrder(order string) {
|
|
a.cfg.SortOrder = order
|
|
}
|
|
|
|
func (a *albumsPageAdapter) ActionButton() *widget.Button { return nil }
|
|
|
|
func (a *albumsPageAdapter) Iter(sortOrder string, filter mediaprovider.AlbumFilter) widgets.GridViewIterator {
|
|
return widgets.NewGridViewAlbumIterator(a.mp.IterateAlbums(sortOrder, filter))
|
|
}
|
|
|
|
func (a *albumsPageAdapter) SearchIter(query string, filter mediaprovider.AlbumFilter) widgets.GridViewIterator {
|
|
return widgets.NewGridViewAlbumIterator(a.mp.SearchAlbums(query, filter))
|
|
}
|
|
|
|
func (a *albumsPageAdapter) ConnectGridActions(gv *widgets.GridView) {
|
|
a.contr.ConnectAlbumGridActions(gv)
|
|
}
|