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

big refactor to prepare for removing server hard-coding

Browse Source
This commit is contained in:
Drew Weymouth
2022-12-19 19:28:19 -08:00
parent 8762fed9b3
commit 181554058a
9 changed files with 149 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/albumcard.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"image"
"log"
"gomuse/ui/layout"
"supersonic/ui/layout"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas"
ui/albumgrid.go
+48 -39
View File
@@ -2,7 +2,7 @@ package ui
import (
"context"
"gomuse/backend"
"supersonic/backend"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/widget"
@@ -12,18 +12,20 @@ import (
type AlbumGrid struct {
widget.BaseWidget
grid *widget.GridWrapList
albums []*subsonic.AlbumID3
iter backend.AlbumIterator
fetching bool
done bool
grid *widget.GridWrapList
albums []*subsonic.AlbumID3
iter backend.AlbumIterator
imageManager *backend.ImageManager
fetching bool
done bool
}
var _ fyne.Widget = (*AlbumGrid)(nil)
func NewAlbumGrid(iter backend.AlbumIterator, pm *backend.PlaybackManager, im *backend.ImageManager) *AlbumGrid {
ag := &AlbumGrid{
iter: iter,
iter: iter,
imageManager: im,
}
ag.ExtendBaseWidget(ag)
@@ -42,38 +44,7 @@ func NewAlbumGrid(iter backend.AlbumIterator, pm *backend.PlaybackManager, im *b
// update func
func(itemID int, obj fyne.CanvasObject) {
ac := obj.(*AlbumCard)
album := ag.albums[itemID]
if ac.PrevAlbumID == album.ID {
// nothing to do
return
}
ac.Update(album)
ac.PrevAlbumID = album.ID
// TODO: set image to a placeholder before spinning off async fetch
// cancel any previous image fetch
if ac.ImgLoadCancel != nil {
ac.ImgLoadCancel()
ac.ImgLoadCancel = nil
}
ctx, cancel := context.WithCancel(context.Background())
go func(ctx context.Context) {
i, err := im.GetAlbumThumbnail(album.ID)
select {
case <-ctx.Done():
return
default:
if err == nil {
ac.Cover.SetImage(i)
ac.Refresh()
}
}
}(ctx)
ac.ImgLoadCancel = cancel
// TODO: remove magic number 10
if !ag.done && !ag.fetching && itemID > len(ag.albums)-10 {
ag.fetchMoreAlbums(10)
}
ag.doUpdateAlbumCard(itemID, ac)
},
)
ag.grid = g
@@ -83,7 +54,45 @@ func NewAlbumGrid(iter backend.AlbumIterator, pm *backend.PlaybackManager, im *b
return ag
}
func (ag *AlbumGrid) doUpdateAlbumCard(albumIdx int, ac *AlbumCard) {
album := ag.albums[albumIdx]
if ac.PrevAlbumID == album.ID {
// nothing to do
return
}
ac.Update(album)
ac.PrevAlbumID = album.ID
// TODO: set image to a placeholder before spinning off async fetch
// cancel any previous image fetch
if ac.ImgLoadCancel != nil {
ac.ImgLoadCancel()
ac.ImgLoadCancel = nil
}
ctx, cancel := context.WithCancel(context.Background())
go func(ctx context.Context) {
i, err := ag.imageManager.GetAlbumThumbnail(album.ID)
select {
case <-ctx.Done():
return
default:
if err == nil {
ac.Cover.SetImage(i)
ac.Refresh()
}
}
}(ctx)
ac.ImgLoadCancel = cancel
// TODO: remove magic number 10
if !ag.done && !ag.fetching && albumIdx > len(ag.albums)-10 {
ag.fetchMoreAlbums(10)
}
}
func (a *AlbumGrid) fetchMoreAlbums(count int) {
if a.iter == nil {
a.done = true
}
i := 0
a.fetching = true
a.iter.NextN(count, func(al *subsonic.AlbumID3) {
ui/bottompanel.go
+49 -14
View File
@@ -1,13 +1,15 @@
package ui
import (
"gomuse/backend"
"gomuse/player"
"image"
"supersonic/backend"
"supersonic/player"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget"
"github.com/dweymouth/go-subsonic"
)
@@ -48,18 +50,51 @@ func (b *bottomPanelLayout) Layout(_ []fyne.CanvasObject, size fyne.Size) {
}
}
func NewBottomPanel(p *player.Player, pm *backend.PlaybackManager, im *backend.ImageManager) fyne.CanvasObject {
n := NewNowPlayingCard()
c := NewPlayerControls(p, pm)
type BottomPanel struct {
widget.BaseWidget
pm.OnSongChange(func(song *subsonic.Child) {
if song == nil {
n.Update("", "", "", nil)
} else {
im, _ := im.GetAlbumThumbnail(song.AlbumID)
n.Update(song.Title, song.Artist, song.Album, im)
}
})
ImageManager *backend.ImageManager
return container.New(newBottomPanelLayout(500, n, c, nil), n, c)
playbackManager *backend.PlaybackManager
nowPlaying *NowPlayingCard
controls *PlayerControls
container *fyne.Container
}
var _ fyne.Widget = (*BottomPanel)(nil)
func NewBottomPanel(p *player.Player) *BottomPanel {
bp := &BottomPanel{}
bp.ExtendBaseWidget(bp)
bp.nowPlaying = NewNowPlayingCard()
bp.controls = NewPlayerControls(p)
bp.container = container.New(newBottomPanelLayout(500, bp.nowPlaying, bp.controls, nil), bp.nowPlaying, bp.controls)
return bp
}
func (bp *BottomPanel) SetPlaybackManager(pm *backend.PlaybackManager) {
bp.playbackManager = pm
bp.controls.SetPlaybackManager(pm)
pm.OnSongChange(func(song *subsonic.Child) {
bp.onSongChange(song)
})
}
func (bp *BottomPanel) onSongChange(song *subsonic.Child) {
if song == nil {
bp.nowPlaying.Update("", "", "", nil)
} else {
var im image.Image
if bp.ImageManager != nil {
im, _ = bp.ImageManager.GetAlbumThumbnail(song.AlbumID)
}
bp.nowPlaying.Update(song.Title, song.Artist, song.Album, im)
}
}
func (bp *BottomPanel) CreateRenderer() fyne.WidgetRenderer {
return widget.NewSimpleRenderer(bp.container)
}
ui/nowplayingcard.go
+1 -1
View File
@@ -3,7 +3,7 @@ package ui
import (
"image"
"gomuse/ui/layout"
"supersonic/ui/layout"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas"
ui/playercontrols.go
+14 -8
View File
@@ -2,8 +2,8 @@ package ui
import (
"fmt"
"gomuse/backend"
"gomuse/player"
"supersonic/backend"
"supersonic/player"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/container"
@@ -67,14 +67,15 @@ type PlayerControls struct {
container *fyne.Container
totalTime float64
player *player.Player
playbackManager *backend.PlaybackManager
}
var _ fyne.Widget = (*PlayerControls)(nil)
// NewPlayerControls sets up the seek bar, and transport buttons, and returns the encompassing Container.
func NewPlayerControls(p *player.Player, pm *backend.PlaybackManager) *PlayerControls {
pc := &PlayerControls{playbackManager: pm}
func NewPlayerControls(p *player.Player) *PlayerControls {
pc := &PlayerControls{player: p}
pc.ExtendBaseWidget(pc)
pc.slider = NewTrackPosSlider()
@@ -115,14 +116,19 @@ func NewPlayerControls(p *player.Player, pm *backend.PlaybackManager) *PlayerCon
c := container.NewBorder(nil, nil, pc.curTimeLabel, pc.totalTimeLabel, pc.slider)
pc.container = container.NewVBox(c, b)
pm.OnPlayTimeUpdate(func(curTime float64, totalTime float64) {
pc.doPlayTimeUpdate(curTime, totalTime)
})
return pc
}
func (pc *PlayerControls) SetPlaybackManager(pm *backend.PlaybackManager) {
pc.playbackManager = pm
pm.OnPlayTimeUpdate(func(curTime float64, totalTime float64) {
pc.doPlayTimeUpdate(curTime, totalTime)
})
}
func (pc *PlayerControls) doPlayTimeUpdate(curTime, totalTime float64) {
// TODO: there is a bug with very long tracks (~20min) where the
// curtime label will bounce back and forth +- 1sec (rounding issue?)
pc.totalTime = totalTime
if !pc.playbackManager.IsSeeking() {
v := 0.0