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

add album shuffle mode to Genre page

Browse Source
This commit is contained in:
Drew Weymouth
2025-02-13 13:46:29 -03:00
parent 4c0f936022
commit 99e48d6ff7
7 changed files with 181 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/config.go
+4 -1
View File
@@ -64,9 +64,11 @@ type AlbumPageConfig struct {
TracklistColumns []string
}
// shared between Albums and Genre pages
type AlbumsPageConfig struct {
SortOrder string
SortOrder string // only relevant for Albums page
ShowYears bool
ShuffleMode string // only relevant for genre page
}
type ArtistPageConfig struct {
@@ -194,6 +196,7 @@ func DefaultConfig(appVersionTag string) *Config {
AlbumsPage: AlbumsPageConfig{
SortOrder: string("Recently Added"),
ShowYears: false,
ShuffleMode: "Tracks",
},
ArtistPage: ArtistPageConfig{
InitialView: "Discography",
backend/playbackmanager.go
+28
View File
@@ -289,6 +289,34 @@ func (p *PlaybackManager) PlaySimilarSongs(id string) error {
})
}
func (p *PlaybackManager) PlayRandomAlbums(genreName string) error {
if p.engine.replayGainCfg.Mode == ReplayGainAuto {
p.SetReplayGainMode(player.ReplayGainAlbum)
}
mp := p.engine.sm.Server
var filter mediaprovider.AlbumFilter
if genreName != "" {
filter = mediaprovider.NewAlbumFilter(mediaprovider.AlbumFilterOptions{
Genres: []string{genreName},
})
}
iter := mp.IterateAlbums(mediaprovider.AlbumSortRandom, filter)
insertMode := Replace
for i := 0; i < 20; i++ {
al := iter.Next()
if al, err := mp.GetAlbum(al.ID); err == nil {
p.LoadTracks(al.Tracks, insertMode, false)
if i == 0 {
p.PlayFromBeginning()
insertMode = Append
}
}
}
return nil
}
func (p *PlaybackManager) LoadRadioStation(station *mediaprovider.RadioStation, queueMode InsertQueueMode) {
p.cmdQueue.LoadRadioStation(station, queueMode)
}
ui/browsing/albumspage.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"
@@ -64,7 +63,7 @@ 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 { return nil }
func (a *albumsPageAdapter) Iter(sortOrderIdx int, filter mediaprovider.AlbumFilter) widgets.GridViewIterator {
sortOrder := a.mp.AlbumSortOrders()[sortOrderIdx]
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
+1 -1
View File
@@ -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)
ui/widgets/optionbutton.go
+111
View File
@@ -0,0 +1,111 @@
package widgets
import (
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas"
"fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget"
)
type OptionButton struct {
widget.BaseWidget
Text string
Icon fyne.Resource
Menu *fyne.Menu
OnTapped func()
}
func NewOptionButton(text string, menu *fyne.Menu, onTapped func()) *OptionButton {
return NewOptionButtonWithIcon(text, nil, menu, onTapped)
}
func NewOptionButtonWithIcon(text string, icon fyne.Resource, menu *fyne.Menu, onTapped func()) *OptionButton {
o := &OptionButton{
Menu: menu,
Text: text,
Icon: icon,
OnTapped: onTapped,
}
o.ExtendBaseWidget(o)
return o
}
func (o *OptionButton) CreateRenderer() fyne.WidgetRenderer {
return newOptionButtonRenderer(o)
}
var _ fyne.WidgetRenderer = (*optionButtonRenderer)(nil)
type optionButtonRenderer struct {
wid *OptionButton
mainBtn *widget.Button
auxBtn *widget.Button
dividerLine *canvas.Rectangle
objects []fyne.CanvasObject
}
func newOptionButtonRenderer(o *OptionButton) *optionButtonRenderer {
render := &optionButtonRenderer{wid: o}
render.mainBtn = widget.NewButtonWithIcon(o.Text, o.Icon, render.onMainBtnTapped)
render.mainBtn.Alignment = widget.ButtonAlignLeading
render.auxBtn = widget.NewButtonWithIcon("", theme.MenuDropDownIcon(), render.showMenu)
render.auxBtn.Importance = widget.LowImportance
render.dividerLine = canvas.NewRectangle(o.Theme().Color(theme.ColorNameSeparator,
fyne.CurrentApp().Settings().ThemeVariant()))
render.dividerLine.SetMinSize(fyne.NewSquareSize(1))
divider := container.NewBorder(layout.NewSpacer(), layout.NewSpacer(), nil, nil, render.dividerLine)
render.objects = []fyne.CanvasObject{
container.NewStack(
render.mainBtn,
container.New(layout.NewCustomPaddedHBoxLayout(0),
layout.NewSpacer(), divider, render.auxBtn),
),
}
return render
}
func (o *optionButtonRenderer) showMenu() {
if o.wid.Menu == nil {
return
}
canv := fyne.CurrentApp().Driver().CanvasForObject(o.wid)
pop := widget.NewPopUpMenu(o.wid.Menu, canv)
pop.ShowAtRelativePosition(o.auxBtn.Position().Add(
fyne.NewPos(0, o.wid.Size().Height)),
o.wid,
)
}
func (o *optionButtonRenderer) MinSize() fyne.Size {
return o.mainBtn.MinSize().Add(fyne.NewSize(o.auxBtn.MinSize().Width, 0))
}
func (o *optionButtonRenderer) Layout(s fyne.Size) {
o.objects[0].(*fyne.Container).Resize(s)
}
func (o *optionButtonRenderer) Objects() []fyne.CanvasObject {
return o.objects
}
func (o *optionButtonRenderer) Refresh() {
o.mainBtn.Text = o.wid.Text
o.mainBtn.Icon = o.wid.Icon
o.dividerLine.FillColor = o.wid.Theme().Color(theme.ColorNameSeparator, fyne.CurrentApp().Settings().ThemeVariant())
o.objects[0].Refresh()
}
func (o *optionButtonRenderer) Destroy() {}
func (o *optionButtonRenderer) onMainBtnTapped() {
if o.wid.OnTapped != nil {
o.wid.OnTapped()
}
}