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

more refactoring - compiles now but not extensively tested

Browse Source
This commit is contained in:
Drew Weymouth
2023-05-14 20:50:06 -07:00
parent 85042fcbd4
commit fd106560d0
20 changed files with 216 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/browsing/albumspage.go
+17 -16
View File
@@ -24,7 +24,7 @@ type AlbumsPage struct {
contr *controller.Controller
pm *backend.PlaybackManager
im *backend.ImageManager
lm *backend.LibraryManager
mp mediaprovider.MediaProvider
grid *widgets.GridView
searchGrid *widgets.GridView
searcher *widgets.SearchEntry
@@ -55,12 +55,12 @@ func (s *selectWidget) MinSize() fyne.Size {
return fyne.NewSize(170, s.Select.MinSize().Height)
}
func NewAlbumsPage(cfg *backend.AlbumsPageConfig, contr *controller.Controller, pm *backend.PlaybackManager, lm *backend.LibraryManager, im *backend.ImageManager) *AlbumsPage {
func NewAlbumsPage(cfg *backend.AlbumsPageConfig, contr *controller.Controller, pm *backend.PlaybackManager, mp mediaprovider.MediaProvider, im *backend.ImageManager) *AlbumsPage {
a := &AlbumsPage{
cfg: cfg,
contr: contr,
pm: pm,
lm: lm,
mp: mp,
im: im,
}
a.ExtendBaseWidget(a)
@@ -69,12 +69,12 @@ func NewAlbumsPage(cfg *backend.AlbumsPageConfig, contr *controller.Controller,
a.titleDisp.Segments[0].(*widget.TextSegment).Style = widget.RichTextStyle{
SizeName: theme.SizeNameHeadingText,
}
a.sortOrder = NewSelect(backend.AlbumSortOrders, a.onSortOrderChanged)
if !sharedutil.SliceContains(backend.AlbumSortOrders, cfg.SortOrder) {
cfg.SortOrder = string(backend.AlbumSortRecentlyAdded)
a.sortOrder = NewSelect(mp.AlbumSortOrders(), a.onSortOrderChanged)
if !sharedutil.SliceContains(mp.AlbumSortOrders(), cfg.SortOrder) {
cfg.SortOrder = string(mp.AlbumSortOrders()[0])
}
a.sortOrder.Selected = cfg.SortOrder
iter := lm.AlbumsIter(backend.AlbumSortOrder(a.sortOrder.Selected), a.filter)
iter := mp.IterateAlbums(a.sortOrder.Selected, "", a.filter)
a.grid = widgets.NewGridView(widgets.NewGridViewAlbumIterator(iter), im)
contr.ConnectAlbumGridActions(a.grid)
a.createSearchAndFilter()
@@ -112,7 +112,7 @@ func restoreAlbumsPage(saved *savedAlbumsPage) *AlbumsPage {
cfg: saved.cfg,
contr: saved.contr,
pm: saved.pm,
lm: saved.lm,
mp: saved.mp,
im: saved.im,
searchText: saved.searchText,
filter: saved.filter,
@@ -123,7 +123,7 @@ func restoreAlbumsPage(saved *savedAlbumsPage) *AlbumsPage {
a.titleDisp.Segments[0].(*widget.TextSegment).Style = widget.RichTextStyle{
SizeName: theme.SizeNameHeadingText,
}
a.sortOrder = NewSelect(backend.AlbumSortOrders, nil)
a.sortOrder = NewSelect(a.mp.AlbumSortOrders(), nil)
a.sortOrder.Selected = saved.sortOrder
a.sortOrder.OnChanged = a.onSortOrderChanged
a.grid = widgets.NewGridViewFromState(saved.gridState)
@@ -163,7 +163,7 @@ func (a *AlbumsPage) Reload() {
if a.searchText != "" {
a.doSearch(a.searchText)
} else {
iter := a.lm.AlbumsIter(backend.AlbumSortOrder(a.sortOrder.Selected), a.filter)
iter := a.mp.IterateAlbums(a.sortOrder.Selected, "", a.filter)
a.grid.Reset(widgets.NewGridViewAlbumIterator(iter))
a.grid.Refresh()
}
@@ -174,7 +174,7 @@ func (a *AlbumsPage) Save() SavedPage {
cfg: a.cfg,
contr: a.contr,
pm: a.pm,
lm: a.lm,
mp: a.mp,
im: a.im,
searchText: a.searchText,
filter: a.filter,
@@ -188,11 +188,12 @@ func (a *AlbumsPage) Save() SavedPage {
}
func (a *AlbumsPage) doSearch(query string) {
iter := widgets.NewGridViewAlbumIterator(a.mp.IterateAlbums("", query, a.filter))
if a.searchGrid == nil {
a.searchGrid = widgets.NewGridView(widgets.NewGridViewAlbumIterator(a.lm.SearchIter(query)), a.im)
a.searchGrid = widgets.NewGridView(iter, a.im)
a.contr.ConnectAlbumGridActions(a.searchGrid)
} else {
a.searchGrid.Reset(widgets.NewGridViewAlbumIterator(a.lm.SearchIterWithFilter(query, a.filter)))
a.searchGrid.Reset(iter)
}
a.container.Objects[0] = a.searchGrid
a.Refresh()
@@ -200,7 +201,7 @@ func (a *AlbumsPage) doSearch(query string) {
func (a *AlbumsPage) onSortOrderChanged(order string) {
a.cfg.SortOrder = a.sortOrder.Selected
iter := a.lm.AlbumsIter(backend.AlbumSortOrder(order), a.filter)
iter := a.mp.IterateAlbums(order, "", a.filter)
a.grid.Reset(widgets.NewGridViewAlbumIterator(iter))
if a.searchText == "" {
a.container.Objects[0] = a.grid
@@ -215,11 +216,11 @@ func (a *AlbumsPage) CreateRenderer() fyne.WidgetRenderer {
type savedAlbumsPage struct {
searchText string
filter backend.AlbumFilter
filter mediaprovider.AlbumFilter
cfg *backend.AlbumsPageConfig
contr *controller.Controller
pm *backend.PlaybackManager
lm *backend.LibraryManager
mp mediaprovider.MediaProvider
im *backend.ImageManager
sortOrder string
gridState widgets.GridViewState