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

Merge pull request #557 from dweymouth/feature/album-shuffle

Browse Source 
Add ability to shuffle by albums (to Albums page and Genre page)
This commit is contained in:
Drew Weymouth
2025-02-20 16:21:59 -08:00
committed by GitHub
parent 3a3774f5b6 568e380a51
commit 0a6826b1aa
10 changed files with 346 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/browsing/albumspage.go
+15 -1
View File
@@ -1,6 +1,7 @@
package browsing
import (
"log"
"slices"
"fyne.io/fyne/v2"
@@ -64,7 +65,20 @@ func (a *albumsPageAdapter) SaveSortOrder(orderIdx int) {
a.cfg.SortOrder = a.mp.AlbumSortOrders()[orderIdx]
}
func (a *albumsPageAdapter) ActionButton() *widget.Button { return nil }
func (a *albumsPageAdapter) ActionButton() fyne.CanvasObject {
fn := func() {
go func() {
if err := a.pm.PlayRandomAlbums(""); err != nil {
log.Printf("error playing random albums: %v", err)
fyne.Do(func() {
a.contr.ToastProvider.ShowErrorToast(lang.L("Unable to play random albums"))
})
}
}()
}
return widget.NewButtonWithIcon(lang.L("Play random"), myTheme.ShuffleIcon, fn)
}
func (a *albumsPageAdapter) Iter(sortOrderIdx int, filter mediaprovider.AlbumFilter) widgets.GridViewIterator {
sortOrder := a.mp.AlbumSortOrders()[sortOrderIdx]
ui/browsing/artistpage.go
+11 -28
View File
@@ -51,7 +51,7 @@ type ArtistPage struct {
albumGrid *widgets.GridView
tracklistCtr *fyne.Container
sortButton *widgets.IconButton
sortButton *widgets.SortChooserButton
nowPlayingID string
header *ArtistPageHeader
container *fyne.Container
@@ -96,8 +96,16 @@ func newArtistPage(artistID string, cfg *backend.ArtistPageConfig, pool *util.Wi
viewToggle := widgets.NewToggleText(0, []string{lang.L("Discography"), lang.L("Top Tracks")})
viewToggle.SetActivatedLabel(a.activeView)
viewToggle.OnChanged = a.onViewChange
a.sortButton = widgets.NewIconButton(myTheme.SortIcon, a.showAlbumSortMenu)
a.sortButton.SetToolTip(lang.L("Sort"))
a.sortButton = widgets.NewSortChooserButton(util.LocalizeSlice(discographySorts), func(selIdx int) {
a.cfg.DiscographySort = discographySorts[selIdx]
a.showAlbumGrid(true /*reSort*/)
})
a.sortButton.AlignLeft = true
for i, sort := range discographySorts {
if sort == a.cfg.DiscographySort {
a.sortButton.SetSelectedIndex(i)
}
}
viewToggleRow := container.NewBorder(nil, nil,
container.NewHBox(util.NewHSpace(5), viewToggle),
container.NewHBox(a.sortButton, util.NewHSpace(10)),
@@ -182,31 +190,6 @@ func (a *ArtistPage) playArtistRadio() {
}()
}
func (a *ArtistPage) showAlbumSortMenu() {
m := fyne.NewMenu("")
oneChecked := false
for i, s := range util.LocalizeSlice(discographySorts) {
_i := i
item := fyne.NewMenuItem(s, func() {
a.cfg.DiscographySort = discographySorts[_i]
a.showAlbumGrid(true /*reSort*/)
})
if discographySorts[i] == a.cfg.DiscographySort {
item.Checked = true
oneChecked = true
}
m.Items = append(m.Items, item)
}
if !oneChecked {
m.Items[0].Checked = true
}
btnPos := fyne.CurrentApp().Driver().AbsolutePositionForObject(a.sortButton)
btnSize := a.sortButton.Size()
pop := widget.NewPopUpMenu(m, fyne.CurrentApp().Driver().CanvasForObject(a))
menuW := pop.MinSize().Width
pop.ShowAtPosition(fyne.NewPos(btnPos.X+btnSize.Width-menuW, btnPos.Y+btnSize.Height))
}
func (a *ArtistPage) getGridViewAlbumsModel() []widgets.GridViewItemModel {
if a.artistInfo == nil {
return nil
ui/browsing/artistspage.go
+1 -2
View File
@@ -5,7 +5,6 @@ import (
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/lang"
"fyne.io/fyne/v2/widget"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/backend/mediaprovider"
"github.com/dweymouth/supersonic/ui/controller"
@@ -60,7 +59,7 @@ func (a *artistsPageAdapter) SaveSortOrder(orderIdx int) {
a.cfg.SortOrder = a.mp.ArtistSortOrders()[orderIdx]
}
func (a *artistsPageAdapter) ActionButton() *widget.Button { return nil }
func (a *artistsPageAdapter) ActionButton() fyne.CanvasObject { return nil }
func (a *artistsPageAdapter) Iter(sortOrderIdx int, filter mediaprovider.ArtistFilter) widgets.GridViewIterator {
sortOrder := a.mp.ArtistSortOrders()[sortOrderIdx]
ui/browsing/genrepage.go
+32 -5
View File
@@ -12,7 +12,6 @@ import (
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/lang"
"fyne.io/fyne/v2/widget"
)
type genrePageAdapter struct {
@@ -59,19 +58,47 @@ func (g *genrePageAdapter) Route() controller.Route {
return controller.GenreRoute(g.genre)
}
func (g *genrePageAdapter) ActionButton() *widget.Button {
func (g *genrePageAdapter) ActionButton() fyne.CanvasObject {
fn := func() {
go func() {
err := g.pm.PlayRandomSongs(g.genre)
var err error
if g.cfg.ShuffleMode == "Albums" {
err = g.pm.PlayRandomAlbums(g.genre)
} else {
err = g.pm.PlayRandomSongs(g.genre)
}
if err != nil {
log.Println("error playing random tracks: %v", err)
log.Printf("error playing random tracks: %v", err)
fyne.Do(func() {
g.contr.ToastProvider.ShowErrorToast(lang.L("Unable to play random tracks"))
})
}
}()
}
return widget.NewButtonWithIcon(lang.L("Play random"), myTheme.ShuffleIcon, fn)
var tracks, albums *fyne.MenuItem
setShuffleMode := func(isAlbums bool) {
if isAlbums {
g.cfg.ShuffleMode = "Albums"
} else {
g.cfg.ShuffleMode = "Tracks"
}
albums.Checked = isAlbums
tracks.Checked = !isAlbums
}
tracks = fyne.NewMenuItem(lang.L("Tracks"), func() { setShuffleMode(false) })
tracks.Icon = myTheme.TracksIcon
albums = fyne.NewMenuItem(lang.L("Albums"), func() { setShuffleMode(true) })
albums.Icon = myTheme.AlbumIcon
isAlbums := g.cfg.ShuffleMode == "Albums"
albums.Checked = isAlbums
tracks.Checked = !isAlbums
menu := fyne.NewMenu("", tracks, albums)
return widgets.NewOptionButtonWithIcon(lang.L("Play random"), myTheme.ShuffleIcon, menu, fn)
}
func (a *genrePageAdapter) Iter(sortOrderIdx int, filter mediaprovider.AlbumFilter) widgets.GridViewIterator {
ui/browsing/gridviewpage.go
+5 -13
View File
@@ -29,7 +29,7 @@ type GridViewPage[M, F any] struct {
searchGridState *widgets.GridViewState
title *widget.RichText
sortOrder *widget.Select
sortOrder *widgets.SortChooserButton
filterBtn widgets.FilterButton[M, F]
filter mediaprovider.MediaFilter[M, F]
searcher *widgets.SearchEntry
@@ -58,7 +58,7 @@ type GridViewPageAdapter[M, F any] interface {
Route() controller.Route
// Returns the ActionButton for this page, if any
ActionButton() *widget.Button
ActionButton() fyne.CanvasObject
// Returns the iterator for the given sortOrder and filter.
// (Non-media pages can ignore the filter argument)
@@ -125,15 +125,7 @@ func (g *GridViewPage[M, F]) createTitleAndSort() {
})
if s, ok := g.adapter.(SortableGridViewPageAdapter); ok {
sorts, selected := s.SortOrders()
g.sortOrder = widget.NewSelect(sorts, g.onSortOrderChanged)
// find longest string
l := ""
for _, s := range sorts {
if len(s) > len(l) {
l = s
}
}
g.sortOrder.PlaceHolder = l // props up MinSize.Width
g.sortOrder = widgets.NewSortChooserButton(sorts, g.onSortOrderChanged)
g.sortOrder.SetSelectedIndex(selected)
}
}
@@ -213,13 +205,13 @@ func (g *GridViewPage[M, F]) doSearch(query string) {
g.grid.Reset(g.adapter.SearchIter(query, g.getFilter()))
}
func (g *GridViewPage[M, F]) onSortOrderChanged(_ string) {
func (g *GridViewPage[M, F]) onSortOrderChanged(idx int) {
if g.grid == nil {
return // callback from initializing
}
g.adapter.(SortableGridViewPageAdapter).SaveSortOrder(g.getSortOrderIdx())
g.grid.Reset(g.adapter.Iter(g.getSortOrderIdx(), g.getFilter()))
g.grid.Reset(g.adapter.Iter(idx, g.getFilter()))
}
func (g *GridViewPage[M, F]) getFilter() mediaprovider.MediaFilter[M, F] {