- Version 0.14.0 of Supersonic
+ Version 0.15.1 of Supersonic
-
- Added
-
-
- - New translations: Dutch
- - Media Key / SMTC support for Windows
- - Add an Autoplay mode to continually add related songs when nearing the end of queue
- - Shuffle button added to favorite songs view
- - Added toast notifications for certain UI actions
- - Add album shuffle modes to Albums and Genre pages
- - Caching added for LrcLib lyrics, custom LrcLib URL supported in config file
- - Use notify-send for notifications on Linux if available
- - Add setting to disable automatic scaling adjustment for detected DPI
- - New Advanced settings tab exposing more config file settings to the UI
- - Favorite/menu icon buttons added to grid cards when hovered
- - Show full dates from OpenSubsonic servers when available
- - Log to a file instead of stdout on Windows
-
-
Fixed
- - Persist repeat setting across restarts
- - Removing track from playlist when sorted removed wrong track
- - Fullscreen artist images not loading in full resolution
- - Fix volume slider scrolling too quickly with some mice
- - Loading dots not stopping if canceling a search before completion
- - Add list/grid debouncing to improve scrolling smoothness when scrolling very quickly
- - Image caching broken on some servers due to track IDs not being legal filenames
- - Migrate to Fyne 2.6 for improved stability and performance
- - Sometimes crashing on exit
+ - Fix crashing on playback on Windows
+ - Fix crashing when clicking on album filters button
diff --git a/res/metadata.go b/res/metadata.go
index 889d1be..2a4172e 100644
--- a/res/metadata.go
+++ b/res/metadata.go
@@ -3,7 +3,7 @@ package res
const (
AppName = "supersonic"
DisplayName = "Supersonic"
- AppVersion = "0.14.0"
+ AppVersion = "0.15.1"
AppVersionTag = "v" + AppVersion
ConfigFile = "config.toml"
GithubURL = "https://github.com/dweymouth/supersonic"
@@ -13,31 +13,10 @@ const (
)
var (
- WhatsAdded = `
-## Added
-* New translations: Dutch
-* Media Key / SMTC support for Windows
-* Add an Autoplay mode to continually add related songs when nearing the end of queue
-* Shuffle button added to favorite songs view
-* Added toast notifications for certain UI actions
-* Add album shuffle modes to Albums and Genre pages
-* Caching added for LrcLib lyrics, custom LrcLib URL supported in config file
-* Use notify-send for notifications on Linux if available
-* Add setting to disable automatic scaling adjustment for detected DPI
-* New Advanced settings tab exposing more config file settings to the UI
-* Favorite/menu icon buttons added to grid cards when hovered
-* Show full dates from OpenSubsonic servers when available
-* Log to a file instead of stdout on Windows`
+ WhatsAdded = ``
WhatsFixed = `
## Fixed
-* Persist repeat setting across restarts
-* Removing track from playlist when sorted removed wrong track
-* Fullscreen artist images not loading in full resolution
-* Fix volume slider scrolling too quickly with some mice
-* Loading dots not stopping if canceling a search before completion
-* Add list/grid debouncing to improve scrolling smoothness when scrolling very quickly
-* Image caching broken on some servers due to track IDs not being legal filenames
-* Migrate to Fyne 2.6 for improved stability and performance
-* Sometimes crashing on exit`
+* Fix crashing on playback on Windows
+* Fix crashing when clicking on album filters button`
)
diff --git a/res/translations/en.json b/res/translations/en.json
index fabadfc..262c0b5 100644
--- a/res/translations/en.json
+++ b/res/translations/en.json
@@ -41,6 +41,7 @@
"BPM": "BPM",
"Broadcast": "Broadcast",
"Cancel": "Cancel",
+ "Cast to device": "Cast to device",
"Check for Updates": "Check for Updates",
"Close": "Close",
"Close to system tray": "Close to system tray",
@@ -168,6 +169,7 @@
"Save play queue on exit": "Save play queue on exit",
"Saved at": "Saved at",
"Scrobble when": "Scrobble when",
+ "Search": "Search",
"Search Everywhere": "Search Everywhere",
"Search page": "Search page",
"Search playlists or new playlist name": "Search playlists or new playlist name",
@@ -206,6 +208,7 @@
"Testing connection": "Testing connection",
"The request timed out": "The request timed out",
"Theme": "Theme",
+ "This computer": "This computer",
"Time": "Time",
"Title": "Title",
"Title (A-Z)": "Title (A-Z)",
@@ -237,7 +240,6 @@
"You are running the latest version of": "You are running the latest version of",
"Quit": "Quit",
"Rescan Library": "Rescan Library",
- "Search": "Search",
"Owner": "Owner",
"To server": "To server",
"Fav.": "Fav.",
diff --git a/ui/bottompanel.go b/ui/bottompanel.go
index 80da01b..cdccac4 100644
--- a/ui/bottompanel.go
+++ b/ui/bottompanel.go
@@ -3,6 +3,7 @@ package ui
import (
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/backend/mediaprovider"
+ "github.com/dweymouth/supersonic/backend/player/mpv"
"github.com/dweymouth/supersonic/ui/controller"
"github.com/dweymouth/supersonic/ui/layouts"
"github.com/dweymouth/supersonic/ui/util"
@@ -111,6 +112,10 @@ func NewBottomPanel(pm *backend.PlaybackManager, im *backend.ImageManager, contr
pm.OnVolumeChange(func(vol int) {
fyne.Do(func() { bp.AuxControls.VolumeControl.SetVolume(vol) })
})
+ pm.OnPlayerChange(func() {
+ _, local := pm.CurrentPlayer().(*mpv.Player)
+ fyne.Do(func() { bp.AuxControls.SetIsRemotePlayer(!local) })
+ })
bp.AuxControls.VolumeControl.OnSetVolume = func(v int) {
pm.SetVolume(v)
}
@@ -121,6 +126,7 @@ func NewBottomPanel(pm *backend.PlaybackManager, im *backend.ImageManager, contr
pm.SetAutoplay(autoplay)
}
bp.AuxControls.OnShowPlayQueue(contr.ShowPopUpPlayQueue)
+ bp.AuxControls.OnShowCastMenu(contr.ShowCastMenu)
bp.imageLoader = util.NewThumbnailLoader(im, bp.NowPlaying.SetImage)
diff --git a/ui/browsing/artistpage.go b/ui/browsing/artistpage.go
index 6a45c98..5c827c6 100644
--- a/ui/browsing/artistpage.go
+++ b/ui/browsing/artistpage.go
@@ -471,7 +471,7 @@ func (a *ArtistPageHeader) Update(artist *mediaprovider.ArtistWithAlbums, im *ba
a.artistImageID = artist.CoverArtID
go func() {
if cover, err := im.GetCoverThumbnail(artist.CoverArtID); err == nil {
- a.artistImage.SetImage(cover, true)
+ fyne.Do(func() { a.artistImage.SetImage(cover, true) })
} else {
log.Printf("error fetching cover: %v", err)
}
diff --git a/ui/browsing/nowplayingpage.go b/ui/browsing/nowplayingpage.go
index 842f926..bbb0a7f 100644
--- a/ui/browsing/nowplayingpage.go
+++ b/ui/browsing/nowplayingpage.go
@@ -166,6 +166,18 @@ func NewNowPlayingPage(
a.relatedList.OnPlaySelectionNext = func(items []mediaprovider.MediaItem) {
a.pm.LoadItems(items, backend.InsertNext, false)
}
+ a.relatedList.OnPlaySongRadio = func(track *mediaprovider.Track) {
+ go func() {
+ if err := a.pm.PlaySimilarSongs(track.ID); err != nil {
+ fyne.Do(func() {
+ a.contr.ToastProvider.ShowErrorToast(lang.L("Unable to play song radio"))
+ })
+ }
+ }()
+ }
+ a.relatedList.OnShowTrackInfo = func(track *mediaprovider.Track) {
+ a.contr.ShowTrackInfoDialog(track)
+ }
a.lyricsViewer = widgets.NewLyricsViewer()
a.statusLabel = widget.NewLabel(lang.L("Stopped"))
@@ -431,7 +443,7 @@ func (a *NowPlayingPage) Reload() {
}
switch a.tabs.SelectedIndex() {
case 1: /*lyrics*/
- a.lastPlayPos = a.pm.CurrentPlayer().GetStatus().TimePos
+ a.lastPlayPos = a.pm.PlaybackStatus().TimePos
a.updateLyrics()
case 2: /*related*/
a.updateRelatedList()
@@ -515,7 +527,7 @@ func (a *NowPlayingPage) saveSelectedTab(tabNum int) {
func (a *NowPlayingPage) formatStatusLine() {
curPlayer := a.pm.CurrentPlayer()
- playerStats := curPlayer.GetStatus()
+ playerStats := a.pm.PlaybackStatus()
lastStatus := a.statusLabel.Text
stopped := lang.L("Stopped")
state := stopped
diff --git a/ui/browsing/playlistpage.go b/ui/browsing/playlistpage.go
index 01caba2..6319025 100644
--- a/ui/browsing/playlistpage.go
+++ b/ui/browsing/playlistpage.go
@@ -5,6 +5,8 @@ import (
"log"
"strings"
+ "github.com/deluan/sanitize"
+ ttwidget "github.com/dweymouth/fyne-tooltip/widget"
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/backend/mediaprovider"
"github.com/dweymouth/supersonic/sharedutil"
@@ -14,6 +16,7 @@ import (
"github.com/dweymouth/supersonic/ui/widgets"
"fyne.io/fyne/v2"
+ "fyne.io/fyne/v2/canvas"
"fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/lang"
"fyne.io/fyne/v2/layout"
@@ -240,6 +243,43 @@ func (a *PlaylistPage) onRemoveSelectedFromPlaylist() {
a.Reload()
}
+func (a *PlaylistPage) onSearched(query string) {
+ if query == "" {
+ // switch back to full playlist view
+
+ ids := a.tracklist.SelectedTrackIDs()
+ a.tracklist.Options.Reorderable = true
+ a.tracklist.SetSorting(a.trackSort) // restore old sort order
+ a.tracklist.SetTracks(a.tracks)
+ // if a track was selected in the searched view,
+ // scroll to it when switching back to full playlist
+ if len(ids) > 0 {
+ a.tracklist.SelectAndScrollToTrack(ids[0])
+ }
+ return
+ }
+
+ // search tracks within the playlist
+ searched := sharedutil.FilterSlice(a.tracks, func(t *mediaprovider.Track) bool {
+ sani := func(s string) string {
+ return strings.ToLower(sanitize.Accents(s))
+ }
+ qLower := strings.ToLower(query)
+ return strings.Contains(sani(t.Title), qLower) ||
+ strings.Contains(sani(strings.Join(t.ArtistNames, "")), qLower) ||
+ strings.Contains(sani(t.Album), qLower) ||
+ strings.Contains(sani(strings.Join(t.Genres, "")), qLower) ||
+ strings.Contains(sani(strings.Join(t.ComposerNames, "")), qLower) ||
+ strings.Contains(fmt.Sprintf("%d", t.Year), query) ||
+ strings.Contains(sani(t.Comment), qLower)
+ })
+
+ a.trackSort = a.tracklist.Sorting() // save old sort order
+ a.tracklist.Options.Reorderable = false
+ a.tracklist.SetSorting(widgets.TracklistSort{})
+ a.tracklist.SetTracks(searched)
+}
+
type PlaylistPageHeader struct {
widget.BaseWidget
@@ -275,6 +315,7 @@ func NewPlaylistPageHeader(page *PlaylistPage) *PlaylistPageHeader {
a.ownerLabel = util.NewTruncatingLabel()
a.createdAtLabel = widget.NewLabel("")
a.trackTimeLabel = widget.NewLabel("")
+
a.editButton = widget.NewButtonWithIcon(lang.L("Edit"), theme.DocumentCreateIcon(), func() {
if a.playlistInfo != nil {
a.page.contr.DoEditPlaylistWorkflow(&a.playlistInfo.Playlist)
@@ -289,6 +330,58 @@ func NewPlaylistPageHeader(page *PlaylistPage) *PlaylistPageHeader {
a.page.pm.LoadTracks(a.page.tracks, backend.Replace, true)
a.page.pm.PlayFromBeginning()
})
+
+ // set up search button / entry animation pair
+ // needs reference to containing HBox container (initialized later)
+ var buttonRow *fyne.Container
+ var searchBtn *ttwidget.Button
+ var searchEntry *widgets.SearchEntry
+ searchBtn = ttwidget.NewButtonWithIcon("", theme.SearchIcon(), func() {
+ minW := searchBtn.MinSize().Width
+ if searchEntry == nil {
+ searchEntry = widgets.NewSearchEntry()
+ searchEntry.PlaceHolder = ""
+ searchEntry.Scroll = container.ScrollNone
+ searchEntry.OnSearched = func(s string) {
+ // we can't assign a.page.onSearched directly,
+ // since widget reuse means a.page could change
+ a.page.onSearched(s)
+ }
+ searchEntry.OnFocusLost = func() {
+ if searchEntry.Text == "" {
+ // dismissal animation
+ searchEntry.Scroll = container.ScrollNone
+ searchEntry.SetPlaceHolder("")
+ fyne.NewAnimation(canvas.DurationShort, func(f float32) {
+ f = 1 - f
+ w := (200-minW)*f + minW
+ searchEntry.SetMinWidth(w)
+ if f == 0 {
+ buttonRow.Objects[3] = searchBtn
+ }
+ // re-layout container (without unneeded full refresh)
+ buttonRow.Layout.Layout(buttonRow.Objects, buttonRow.Layout.MinSize(buttonRow.Objects))
+ }).Start()
+ }
+ }
+ }
+ buttonRow.Objects[3] = searchEntry
+ searchEntry.SetMinWidth(minW)
+ fyne.CurrentApp().Driver().CanvasForObject(a).Focus(searchEntry)
+ fyne.NewAnimation(canvas.DurationShort, func(f float32) {
+ w := (200-minW)*f + minW
+ searchEntry.SetMinWidth(w)
+ // re-layout container (without unneeded full refresh)
+ buttonRow.Layout.Layout(buttonRow.Objects, buttonRow.Layout.MinSize(buttonRow.Objects))
+ if f == 1 {
+ searchEntry.Scroll = container.ScrollHorizontalOnly
+ searchEntry.Refresh() // needed to initialize widget's scroller
+ searchEntry.SetPlaceHolder(lang.L("Search"))
+ }
+ }).Start()
+ })
+ searchBtn.SetToolTip(lang.L("Search"))
+
var pop *widget.PopUpMenu
menuBtn := widget.NewButtonWithIcon("", theme.MoreHorizontalIcon(), nil)
menuBtn.OnTapped = func() {
@@ -317,13 +410,15 @@ func NewPlaylistPageHeader(page *PlaylistPage) *PlaylistPageHeader {
pop.ShowAtPosition(fyne.NewPos(pos.X, pos.Y+menuBtn.Size().Height))
}
+ buttonRow = container.NewHBox(a.editButton, playButton, shuffleBtn, searchBtn, menuBtn)
+
a.container = util.AddHeaderBackground(
container.NewBorder(nil, nil, a.image, nil,
container.NewVBox(a.titleLabel, container.New(layout.NewCustomPaddedVBoxLayout(theme.Padding()-10),
a.descriptionLabel,
a.ownerLabel,
a.trackTimeLabel),
- container.NewHBox(a.editButton, playButton, shuffleBtn, menuBtn),
+ buttonRow,
)))
return a
}
diff --git a/ui/controller/connectactions.go b/ui/controller/connectactions.go
index e6d08d7..fb284c4 100644
--- a/ui/controller/connectactions.go
+++ b/ui/controller/connectactions.go
@@ -9,6 +9,8 @@ import (
"github.com/dweymouth/supersonic/sharedutil"
"github.com/dweymouth/supersonic/ui/widgets"
+ "fyne.io/fyne/v2"
+ "fyne.io/fyne/v2/lang"
"fyne.io/fyne/v2/widget"
)
@@ -179,4 +181,14 @@ func (c *Controller) ConnectPlayQueuelistActions(list *widgets.PlayQueueList) {
}
list.OnSetRating = c.SetTrackRatings
list.OnSetFavorite = c.SetTrackFavorites
+ list.OnPlaySongRadio = func(track *mediaprovider.Track) {
+ go func() {
+ if err := c.App.PlaybackManager.PlaySimilarSongs(track.ID); err != nil {
+ fyne.Do(func() {
+ c.ToastProvider.ShowErrorToast(lang.L("Unable to play song radio"))
+ })
+ }
+ }()
+ }
+ list.OnShowTrackInfo = c.ShowTrackInfoDialog
}
diff --git a/ui/controller/controller.go b/ui/controller/controller.go
index b6ab0b2..91bd54a 100644
--- a/ui/controller/controller.go
+++ b/ui/controller/controller.go
@@ -2,7 +2,6 @@ package controller
import (
"archive/zip"
- "context"
"fmt"
"image"
"image/color"
@@ -11,7 +10,6 @@ import (
"net/url"
"os"
"path/filepath"
- "strconv"
"sync"
"time"
@@ -30,7 +28,6 @@ import (
"fyne.io/fyne/v2/container"
"fyne.io/fyne/v2/dialog"
"fyne.io/fyne/v2/lang"
- "fyne.io/fyne/v2/layout"
"fyne.io/fyne/v2/theme"
"fyne.io/fyne/v2/widget"
)
@@ -154,6 +151,50 @@ func (m *Controller) HaveModal() bool {
return m.haveModal
}
+func (m *Controller) ShowCastMenu(onPendingPlayerChange func()) {
+ rp := m.App.PlaybackManager.CurrentRemotePlayer()
+ devices := m.App.PlaybackManager.RemotePlayers()
+ local := fyne.NewMenuItem(lang.L("This computer"), func() {
+ if rp == nil {
+ return // no-op. already not casting
+ }
+ onPendingPlayerChange()
+ go func() {
+ if err := m.App.PlaybackManager.SetRemotePlayer(nil); err != nil {
+ fyne.Do(func() { m.ToastProvider.ShowErrorToast("Failed to disconnect from remote player") })
+ }
+ }()
+ })
+ local.Icon = theme.ComputerIcon()
+ local.Checked = rp == nil
+
+ menu := fyne.NewMenu("", local)
+ for _, d := range devices {
+ _d := d
+ isCurrent := rp != nil && _d.URL == rp.URL
+ item := fyne.NewMenuItem(d.Name, func() {
+ if isCurrent {
+ return // no-op.
+ }
+ onPendingPlayerChange()
+ go func() {
+ if err := m.App.PlaybackManager.SetRemotePlayer(&_d); err != nil {
+ fyne.Do(func() { m.ToastProvider.ShowErrorToast("Failed to connect to " + _d.Name) })
+ }
+ }()
+ })
+ item.Icon = myTheme.CastIcon
+ item.Checked = isCurrent
+ menu.Items = append(menu.Items, item)
+ }
+ pop := widget.NewPopUpMenu(menu, m.MainWindow.Canvas())
+ canvasSize := m.MainWindow.Canvas().Size()
+ pop.ShowAtPosition(fyne.NewPos(
+ canvasSize.Width-pop.MinSize().Width-10,
+ canvasSize.Height-pop.MinSize().Height-100,
+ ))
+}
+
func (m *Controller) ShowPopUpPlayQueue() {
m.popUpQueueMutex.Lock()
if m.popUpQueue == nil {
@@ -260,327 +301,6 @@ func (m *Controller) GetArtistTracks(artistID string) []*mediaprovider.Track {
return nil
}
-func (m *Controller) PromptForFirstServer() {
- d := dialogs.NewAddEditServerDialog(lang.L("Connect to Server"), false, nil, m.MainWindow.Canvas().Focus)
- pop := widget.NewModalPopUp(d, m.MainWindow.Canvas())
- d.OnSubmit = func() {
- d.DisableSubmit()
- go func() {
- if m.testConnectionAndUpdateDialogText(d) {
- // connection is good
- pop.Hide()
- m.doModalClosed()
- conn := backend.ServerConnection{
- ServerType: d.ServerType,
- Hostname: d.Host,
- AltHostname: d.AltHost,
- Username: d.Username,
- LegacyAuth: d.LegacyAuth,
- }
- server := m.App.ServerManager.AddServer(d.Nickname, conn)
- if err := m.trySetPasswordAndConnectToServer(server, d.Password); err != nil {
- log.Printf("error connecting to server: %s", err.Error())
- }
- }
- d.EnableSubmit()
- }()
- }
- m.haveModal = true
- pop.Show()
-}
-
-// Show dialog to select playlist.
-// Depending on the results of that dialog, potentially create a new playlist
-// Add tracks to the user-specified playlist
-func (m *Controller) DoAddTracksToPlaylistWorkflow(trackIDs []string) {
- sp := dialogs.NewSelectPlaylistDialog(m.App.ServerManager.Server, m.App.ImageManager,
- m.App.ServerManager.LoggedInUser, m.App.Config.Application.AddToPlaylistSkipDuplicates)
- pop := widget.NewModalPopUp(sp.SearchDialog, m.MainWindow.Canvas())
- sp.SetOnDismiss(func() {
- pop.Hide()
- m.doModalClosed()
- })
- sp.SetOnNavigateTo(func(contentType mediaprovider.ContentType, id string) {
- notifySuccess := func(n int) {
- fyne.Do(func() {
- msg := lang.LocalizePluralKey("playlist.addedtracks",
- "Added tracks to playlist", n, map[string]string{"trackCount": strconv.Itoa(n)})
- m.ToastProvider.ShowSuccessToast(msg)
- })
- }
- notifyError := func() {
- fyne.Do(func() {
- m.ToastProvider.ShowErrorToast(
- lang.L("An error occurred adding tracks to the playlist"),
- )
- })
- }
- pop.Hide()
- m.App.Config.Application.AddToPlaylistSkipDuplicates = sp.SkipDuplicates
- if id == "" /* creating new playlist */ {
- go func() {
- err := m.App.ServerManager.Server.CreatePlaylist(sp.SearchDialog.SearchQuery(), trackIDs)
- if err == nil {
- notifySuccess(len(trackIDs))
- } else {
- log.Printf("error adding tracks to playlist: %s", err.Error())
- notifyError()
- }
- }()
- } else {
- m.App.Config.Application.DefaultPlaylistID = id
- if sp.SkipDuplicates {
- go func() {
- currentTrackIDs := make(map[string]struct{})
- if selectedPlaylist, err := m.App.ServerManager.Server.GetPlaylist(id); err != nil {
- log.Printf("error getting playlist: %s", err.Error())
- notifyError()
- } else {
- for _, track := range selectedPlaylist.Tracks {
- currentTrackIDs[track.ID] = struct{}{}
- }
- filterTrackIDs := sharedutil.FilterSlice(trackIDs, func(trackID string) bool {
- _, ok := currentTrackIDs[trackID]
- return !ok
- })
- err := m.App.ServerManager.Server.AddPlaylistTracks(id, filterTrackIDs)
- if err == nil {
- notifySuccess(len(filterTrackIDs))
- } else {
- log.Printf("error adding tracks to playlist: %s", err.Error())
- notifyError()
- }
- }
- }()
- } else {
- go func() {
- err := m.App.ServerManager.Server.AddPlaylistTracks(id, trackIDs)
- if err == nil {
- notifySuccess(len(trackIDs))
- } else {
- log.Printf("error adding tracks to playlist: %s", err.Error())
- notifyError()
- }
- }()
- }
- }
-
- })
- m.ClosePopUpOnEscape(pop)
- m.haveModal = true
- min := sp.MinSize()
- height := fyne.Max(min.Height, fyne.Min(min.Height*1.5, m.MainWindow.Canvas().Size().Height*0.7))
- sp.SearchDialog.Show()
- pop.Resize(fyne.NewSize(min.Width, height))
- pop.Show()
- m.MainWindow.Canvas().Focus(sp.GetSearchEntry())
-}
-
-func (m *Controller) DoEditPlaylistWorkflow(playlist *mediaprovider.Playlist) {
- canMakePublic := m.App.ServerManager.Server.CanMakePublicPlaylist()
- dlg := dialogs.NewEditPlaylistDialog(playlist, canMakePublic)
- pop := widget.NewModalPopUp(dlg, m.MainWindow.Canvas())
- m.ClosePopUpOnEscape(pop)
- dlg.OnCanceled = func() {
- pop.Hide()
- m.doModalClosed()
- }
- dlg.OnDeletePlaylist = func() {
- pop.Hide()
- dialog.ShowCustomConfirm(lang.L("Confirm Delete Playlist"), lang.L("OK"), lang.L("Cancel"), layout.NewSpacer(), /*custom content*/
- func(ok bool) {
- if !ok {
- pop.Show()
- } else {
- m.doModalClosed()
- go func() {
- if err := m.App.ServerManager.Server.DeletePlaylist(playlist.ID); err != nil {
- log.Printf("error deleting playlist: %s", err.Error())
- } else if rte := m.CurPageFunc(); rte.Page == Playlist && rte.Arg == playlist.ID {
- // navigate to playlists page if user is still on the page of the deleted playlist
- fyne.Do(func() { m.NavigateTo(PlaylistsRoute()) })
- }
- }()
- }
- }, m.MainWindow)
- }
- dlg.OnUpdateMetadata = func() {
- pop.Hide()
- m.doModalClosed()
- go func() {
- err := m.App.ServerManager.Server.EditPlaylist(playlist.ID, dlg.Name, dlg.Description, dlg.IsPublic)
- if err != nil {
- log.Printf("error updating playlist: %s", err.Error())
- } else if rte := m.CurPageFunc(); rte.Page == Playlist && rte.Arg == playlist.ID {
- // if user is on playlist page, reload to get the updates
- fyne.Do(m.ReloadFunc)
- }
- }()
- }
- m.haveModal = true
- pop.Show()
-}
-
-// DoConnectToServerWorkflow does the workflow for connecting to the last active server on startup
-func (c *Controller) DoConnectToServerWorkflow(server *backend.ServerConfig) {
- pass, err := c.App.ServerManager.GetServerPassword(server.ID)
- if err != nil {
- log.Printf("error getting password from keyring: %v", err)
- c.PromptForLoginAndConnect()
- return
- }
-
- // try connecting to last used server - set up cancelable modal dialog
- canceled := false
- ctx, cancel := context.WithCancel(context.Background())
- dlg := dialog.NewCustom(lang.L("Connecting"), lang.L("Cancel"),
- widget.NewLabel(fmt.Sprintf(lang.L("Connecting to")+" %s", server.Nickname)), c.MainWindow)
- dlg.SetOnClosed(func() {
- canceled = true
- cancel()
- })
- c.haveModal = true
- dlg.Show()
-
- // try to connect
- go func() {
- defer cancel() // make sure to free up ctx resources if user does not cancel
-
- if err := c.tryConnectToServer(ctx, server, pass); err != nil {
- fyne.Do(func() {
- dlg.Hide()
- c.haveModal = false
- if canceled {
- c.PromptForLoginAndConnect()
- } else {
- // connection failure
- dlg := dialog.NewError(err, c.MainWindow)
- dlg.SetOnClosed(func() {
- c.PromptForLoginAndConnect()
- })
- c.haveModal = true
- dlg.Show()
- }
- })
- } else {
- fyne.Do(func() {
- dlg.Hide()
- c.haveModal = false
- })
- }
- }()
-}
-
-func (m *Controller) PromptForLoginAndConnect() {
- d := dialogs.NewLoginDialog(m.App.Config.Servers, m.App.ServerManager.GetServerPassword)
- pop := widget.NewModalPopUp(d, m.MainWindow.Canvas())
- d.OnSubmit = func(server *backend.ServerConfig, password string) {
- d.DisableSubmit()
- d.SetInfoText(lang.L("Testing connection") + "...")
- go func() {
- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
- defer cancel()
-
- err := m.App.ServerManager.TestConnectionAndAuth(ctx, server.ServerConnection, password)
- fyne.Do(func() {
- if err == backend.ErrUnreachable {
- d.SetErrorText(lang.L("Server unreachable"))
- } else if err != nil {
- d.SetErrorText(lang.L("Authentication failed"))
- } else {
- pop.Hide()
- m.trySetPasswordAndConnectToServer(server, password)
- m.doModalClosed()
- }
- d.EnableSubmit()
- })
- }()
- }
- d.OnEditServer = func(server *backend.ServerConfig) {
- pop.Hide()
- editD := dialogs.NewAddEditServerDialog(lang.L("Edit server"), true, server, m.MainWindow.Canvas().Focus)
- editPop := widget.NewModalPopUp(editD, m.MainWindow.Canvas())
- editD.OnSubmit = func() {
- d.DisableSubmit()
- go func() {
- success := m.testConnectionAndUpdateDialogText(editD)
- fyne.Do(func() {
- if success {
- // connection is good
- editPop.Hide()
- server.Hostname = editD.Host
- server.AltHostname = editD.AltHost
- server.Nickname = editD.Nickname
- server.Username = editD.Username
- server.LegacyAuth = editD.LegacyAuth
- m.trySetPasswordAndConnectToServer(server, editD.Password)
- m.doModalClosed()
- }
- d.EnableSubmit()
- })
- }()
- }
- editD.OnCancel = func() {
- editPop.Hide()
- pop.Show()
- }
- editPop.Show()
- }
- d.OnNewServer = func() {
- pop.Hide()
- newD := dialogs.NewAddEditServerDialog(lang.L("Add Server"), true, nil, m.MainWindow.Canvas().Focus)
- newPop := widget.NewModalPopUp(newD, m.MainWindow.Canvas())
- newD.OnSubmit = func() {
- d.DisableSubmit()
- go func() {
- success := m.testConnectionAndUpdateDialogText(newD)
- fyne.Do(func() {
- if success {
- // connection is good
- newPop.Hide()
- conn := backend.ServerConnection{
- ServerType: newD.ServerType,
- Hostname: newD.Host,
- AltHostname: newD.AltHost,
- Username: newD.Username,
- LegacyAuth: newD.LegacyAuth,
- }
- server := m.App.ServerManager.AddServer(newD.Nickname, conn)
- m.trySetPasswordAndConnectToServer(server, newD.Password)
- m.doModalClosed()
- }
- d.EnableSubmit()
- })
- }()
- }
- newD.OnCancel = func() {
- newPop.Hide()
- pop.Show()
- }
- newPop.Show()
- }
- d.OnDeleteServer = func(server *backend.ServerConfig) {
- pop.Hide()
- dialog.ShowConfirm(lang.L("Confirm Delete Server"),
- fmt.Sprintf(lang.L("Are you sure you want to delete the server")+" %q?", server.Nickname),
- func(ok bool) {
- if ok {
- m.App.ServerManager.DeleteServer(server.ID)
- m.App.DeleteServerCacheDir(server.ID)
- d.SetServers(m.App.Config.Servers)
- }
- if len(m.App.Config.Servers) == 0 {
- m.PromptForFirstServer()
- } else {
- pop.Show()
- }
- }, m.MainWindow)
-
- }
- m.haveModal = true
- pop.Show()
-}
-
func (c *Controller) ShowAboutDialog() {
dlg := dialogs.NewAboutDialog(c.AppVersion)
pop := widget.NewModalPopUp(dlg, c.MainWindow.Canvas())
@@ -594,6 +314,7 @@ func (c *Controller) ShowAboutDialog() {
}
func (c *Controller) ShowSettingsDialog(themeUpdateCallbk func(), themeFiles map[string]string) {
+
devs, err := c.App.LocalPlayer.ListAudioDevices()
if err != nil {
log.Printf("error listing audio devices: %v", err)
@@ -606,6 +327,7 @@ func (c *Controller) ShowSettingsDialog(themeUpdateCallbk func(), themeFiles map
_, canSavePlayQueue := c.App.ServerManager.Server.(mediaprovider.CanSavePlayQueue)
isLocalPlayer := isEqualizerPlayer
bands := c.App.LocalPlayer.Equalizer().BandFrequencies()
+
dlg := dialogs.NewSettingsDialog(c.App.Config,
devs, themeFiles, bands,
c.App.ServerManager.Server.ClientDecidesScrobble(),
@@ -641,91 +363,7 @@ func (c *Controller) ShowSettingsDialog(themeUpdateCallbk func(), themeFiles map
c.ClosePopUpOnEscape(pop)
c.haveModal = true
pop.Show()
-}
-func (c *Controller) ShowQuickSearch() {
- qs := dialogs.NewQuickSearch(c.App.ServerManager.Server, c.App.ImageManager)
- pop := widget.NewModalPopUp(qs.SearchDialog, c.MainWindow.Canvas())
- qs.SetOnDismiss(func() {
- pop.Hide()
- c.doModalClosed()
- })
- qs.SetOnNavigateTo(func(contentType mediaprovider.ContentType, id string) {
- pop.Hide()
- c.doModalClosed()
- switch contentType {
- case mediaprovider.ContentTypeAlbum:
- c.NavigateTo(AlbumRoute(id))
- case mediaprovider.ContentTypeArtist:
- c.NavigateTo(ArtistRoute(id))
- case mediaprovider.ContentTypeTrack:
- go c.App.PlaybackManager.PlayTrack(id)
- case mediaprovider.ContentTypePlaylist:
- c.NavigateTo(PlaylistRoute(id))
- case mediaprovider.ContentTypeGenre:
- c.NavigateTo(GenreRoute(id))
- case mediaprovider.ContentTypeRadioStation:
- if rp, ok := c.App.ServerManager.Server.(mediaprovider.RadioProvider); ok {
- if radio, err := rp.GetRadioStation(id); err == nil {
- go c.App.PlaybackManager.PlayRadioStation(radio)
- }
- }
- }
- })
- c.ClosePopUpOnEscape(pop)
- c.haveModal = true
- min := qs.MinSize()
- height := fyne.Max(min.Height, fyne.Min(min.Height*1.5, c.MainWindow.Canvas().Size().Height*0.7))
- qs.SearchDialog.Show()
- pop.Resize(fyne.NewSize(min.Width, height))
- pop.Show()
- c.MainWindow.Canvas().Focus(qs.GetSearchEntry())
-}
-
-func (c *Controller) trySetPasswordAndConnectToServer(server *backend.ServerConfig, password string) error {
- if err := c.App.ServerManager.SetServerPassword(server, password); err != nil {
- log.Printf("error setting keyring credentials: %v", err)
- // Don't return an error; fall back to just using the password in-memory
- // User will need to log in with the password on subsequent runs.
- }
- return c.tryConnectToServer(context.Background(), server, password)
-}
-
-// try to connect to the given server, with the configured timeout added to the context
-func (c *Controller) tryConnectToServer(ctx context.Context, server *backend.ServerConfig, password string) error {
- timeout := time.Duration(c.App.Config.Application.RequestTimeoutSeconds) * time.Second
- ctx, cancel := context.WithTimeout(ctx, timeout)
- defer cancel()
- if err := c.App.ServerManager.TestConnectionAndAuth(ctx, server.ServerConnection, password); err != nil {
- return err
- }
- if err := c.App.ServerManager.ConnectToServer(server, password); err != nil {
- log.Printf("error connecting to server: %v", err)
- return err
- }
- return nil
-}
-
-func (c *Controller) testConnectionAndUpdateDialogText(dlg *dialogs.AddEditServerDialog) bool {
- dlg.SetInfoText(lang.L("Testing connection") + "...")
- conn := backend.ServerConnection{
- ServerType: dlg.ServerType,
- Hostname: dlg.Host,
- AltHostname: dlg.AltHost,
- Username: dlg.Username,
- LegacyAuth: dlg.LegacyAuth,
- }
- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
- defer cancel()
- err := c.App.ServerManager.TestConnectionAndAuth(ctx, conn, dlg.Password)
- if err == backend.ErrUnreachable {
- dlg.SetErrorText(lang.L("Could not reach server") + fmt.Sprintf(" (%s?)", lang.L("wrong URL")))
- return false
- } else if err != nil {
- dlg.SetErrorText(lang.L("Authentication failed") + fmt.Sprintf(" (%s)", lang.L("wrong username/password")))
- return false
- }
- return true
}
func (c *Controller) doModalClosed() {
diff --git a/ui/controller/playlist.go b/ui/controller/playlist.go
new file mode 100644
index 0000000..1d666f2
--- /dev/null
+++ b/ui/controller/playlist.go
@@ -0,0 +1,147 @@
+package controller
+
+import (
+ "log"
+ "strconv"
+
+ "fyne.io/fyne/v2"
+ "fyne.io/fyne/v2/dialog"
+ "fyne.io/fyne/v2/lang"
+ "fyne.io/fyne/v2/layout"
+ "fyne.io/fyne/v2/widget"
+ "github.com/dweymouth/supersonic/backend/mediaprovider"
+ "github.com/dweymouth/supersonic/sharedutil"
+ "github.com/dweymouth/supersonic/ui/dialogs"
+)
+
+// Show dialog to select playlist.
+// Depending on the results of that dialog, potentially create a new playlist
+// Add tracks to the user-specified playlist
+func (m *Controller) DoAddTracksToPlaylistWorkflow(trackIDs []string) {
+ sp := dialogs.NewSelectPlaylistDialog(m.App.ServerManager.Server, m.App.ImageManager,
+ m.App.ServerManager.LoggedInUser, m.App.Config.Application.AddToPlaylistSkipDuplicates)
+ pop := widget.NewModalPopUp(sp.SearchDialog, m.MainWindow.Canvas())
+ sp.SetOnDismiss(func() {
+ pop.Hide()
+ m.doModalClosed()
+ })
+ sp.SetOnNavigateTo(func(contentType mediaprovider.ContentType, id string) {
+ notifySuccess := func(n int) {
+ fyne.Do(func() {
+ msg := lang.LocalizePluralKey("playlist.addedtracks",
+ "Added tracks to playlist", n, map[string]string{"trackCount": strconv.Itoa(n)})
+ m.ToastProvider.ShowSuccessToast(msg)
+ })
+ }
+ notifyError := func() {
+ fyne.Do(func() {
+ m.ToastProvider.ShowErrorToast(
+ lang.L("An error occurred adding tracks to the playlist"),
+ )
+ })
+ }
+ pop.Hide()
+ m.App.Config.Application.AddToPlaylistSkipDuplicates = sp.SkipDuplicates
+ if id == "" /* creating new playlist */ {
+ go func() {
+ err := m.App.ServerManager.Server.CreatePlaylist(sp.SearchDialog.SearchQuery(), trackIDs)
+ if err == nil {
+ notifySuccess(len(trackIDs))
+ } else {
+ log.Printf("error adding tracks to playlist: %s", err.Error())
+ notifyError()
+ }
+ }()
+ } else {
+ m.App.Config.Application.DefaultPlaylistID = id
+ if sp.SkipDuplicates {
+ go func() {
+ currentTrackIDs := make(map[string]struct{})
+ if selectedPlaylist, err := m.App.ServerManager.Server.GetPlaylist(id); err != nil {
+ log.Printf("error getting playlist: %s", err.Error())
+ notifyError()
+ } else {
+ for _, track := range selectedPlaylist.Tracks {
+ currentTrackIDs[track.ID] = struct{}{}
+ }
+ filterTrackIDs := sharedutil.FilterSlice(trackIDs, func(trackID string) bool {
+ _, ok := currentTrackIDs[trackID]
+ return !ok
+ })
+ err := m.App.ServerManager.Server.AddPlaylistTracks(id, filterTrackIDs)
+ if err == nil {
+ notifySuccess(len(filterTrackIDs))
+ } else {
+ log.Printf("error adding tracks to playlist: %s", err.Error())
+ notifyError()
+ }
+ }
+ }()
+ } else {
+ go func() {
+ err := m.App.ServerManager.Server.AddPlaylistTracks(id, trackIDs)
+ if err == nil {
+ notifySuccess(len(trackIDs))
+ } else {
+ log.Printf("error adding tracks to playlist: %s", err.Error())
+ notifyError()
+ }
+ }()
+ }
+ }
+
+ })
+ m.ClosePopUpOnEscape(pop)
+ m.haveModal = true
+ min := sp.MinSize()
+ height := fyne.Max(min.Height, fyne.Min(min.Height*1.5, m.MainWindow.Canvas().Size().Height*0.7))
+ sp.SearchDialog.Show()
+ pop.Resize(fyne.NewSize(min.Width, height))
+ pop.Show()
+ m.MainWindow.Canvas().Focus(sp.GetSearchEntry())
+}
+
+func (m *Controller) DoEditPlaylistWorkflow(playlist *mediaprovider.Playlist) {
+ canMakePublic := m.App.ServerManager.Server.CanMakePublicPlaylist()
+ dlg := dialogs.NewEditPlaylistDialog(playlist, canMakePublic)
+ pop := widget.NewModalPopUp(dlg, m.MainWindow.Canvas())
+ m.ClosePopUpOnEscape(pop)
+ dlg.OnCanceled = func() {
+ pop.Hide()
+ m.doModalClosed()
+ }
+ dlg.OnDeletePlaylist = func() {
+ pop.Hide()
+ dialog.ShowCustomConfirm(lang.L("Confirm Delete Playlist"), lang.L("OK"), lang.L("Cancel"), layout.NewSpacer(), /*custom content*/
+ func(ok bool) {
+ if !ok {
+ pop.Show()
+ } else {
+ m.doModalClosed()
+ go func() {
+ if err := m.App.ServerManager.Server.DeletePlaylist(playlist.ID); err != nil {
+ log.Printf("error deleting playlist: %s", err.Error())
+ } else if rte := m.CurPageFunc(); rte.Page == Playlist && rte.Arg == playlist.ID {
+ // navigate to playlists page if user is still on the page of the deleted playlist
+ fyne.Do(func() { m.NavigateTo(PlaylistsRoute()) })
+ }
+ }()
+ }
+ }, m.MainWindow)
+ }
+ dlg.OnUpdateMetadata = func() {
+ pop.Hide()
+ m.doModalClosed()
+ go func() {
+ err := m.App.ServerManager.Server.EditPlaylist(playlist.ID, dlg.Name, dlg.Description, dlg.IsPublic)
+ if err != nil {
+ log.Printf("error updating playlist: %s", err.Error())
+ } else if rte := m.CurPageFunc(); rte.Page == Playlist && rte.Arg == playlist.ID {
+ // if user is on playlist page, reload to get the updates
+ fyne.Do(m.ReloadFunc)
+ }
+ }()
+ }
+ m.haveModal = true
+ pop.Show()
+}
diff --git a/ui/controller/searchdialog.go b/ui/controller/searchdialog.go
new file mode 100644
index 0000000..b7c44d3
--- /dev/null
+++ b/ui/controller/searchdialog.go
@@ -0,0 +1,178 @@
+package controller
+
+import (
+ "log"
+
+ "fyne.io/fyne/v2"
+ "fyne.io/fyne/v2/widget"
+ "github.com/dweymouth/supersonic/backend"
+ "github.com/dweymouth/supersonic/backend/mediaprovider"
+ "github.com/dweymouth/supersonic/sharedutil"
+ "github.com/dweymouth/supersonic/ui/dialogs"
+)
+
+func (c *Controller) ShowQuickSearch() {
+ qs := dialogs.NewQuickSearch(c.App.ServerManager.Server, c.App.ImageManager)
+ pop := widget.NewModalPopUp(qs.SearchDialog, c.MainWindow.Canvas())
+ qs.SetOnDismiss(func() {
+ pop.Hide()
+ c.doModalClosed()
+ })
+
+ qs.SetOnNavigateTo(func(contentType mediaprovider.ContentType, id string) {
+ pop.Hide()
+ c.doModalClosed()
+ switch contentType {
+ case mediaprovider.ContentTypeAlbum:
+ c.NavigateTo(AlbumRoute(id))
+ case mediaprovider.ContentTypeArtist:
+ c.NavigateTo(ArtistRoute(id))
+ case mediaprovider.ContentTypeTrack:
+ go c.App.PlaybackManager.PlayTrack(id)
+ case mediaprovider.ContentTypePlaylist:
+ c.NavigateTo(PlaylistRoute(id))
+ case mediaprovider.ContentTypeGenre:
+ c.NavigateTo(GenreRoute(id))
+ case mediaprovider.ContentTypeRadioStation:
+ if rp, ok := c.App.ServerManager.Server.(mediaprovider.RadioProvider); ok {
+ if radio, err := rp.GetRadioStation(id); err == nil {
+ go c.App.PlaybackManager.PlayRadioStation(radio)
+ }
+ }
+ }
+ })
+ qs.OnPlay = func(t mediaprovider.ContentType, id string, item any, shuffle bool) {
+ switch t {
+ case mediaprovider.ContentTypeTrack:
+ c.App.PlaybackManager.LoadTracks(
+ []*mediaprovider.Track{item.(*mediaprovider.Track)},
+ backend.Replace, false /*shuffle*/)
+ c.App.PlaybackManager.PlayFromBeginning()
+ case mediaprovider.ContentTypeAlbum:
+ go c.App.PlaybackManager.PlayAlbum(id, 0, shuffle)
+ case mediaprovider.ContentTypeArtist:
+ go c.App.PlaybackManager.PlayArtistDiscography(id, shuffle)
+ case mediaprovider.ContentTypePlaylist:
+ go c.App.PlaybackManager.PlayPlaylist(id, 0, shuffle)
+ case mediaprovider.ContentTypeGenre:
+ go c.App.PlaybackManager.PlayRandomSongs(id /*genre name*/)
+ case mediaprovider.ContentTypeRadioStation:
+ go c.App.PlaybackManager.PlayRadioStation(item.(*mediaprovider.RadioStation))
+ }
+ }
+ qs.OnAddToQueue = c.handleSearchDialogOnAddToQueue
+ qs.OnAddToPlaylist = c.handleSearchDialogOnAddToPlaylist
+ qs.OnDownload = func(track *mediaprovider.Track) {
+ c.ShowDownloadDialog([]*mediaprovider.Track{track}, track.Metadata().Name)
+ }
+ qs.OnPlaySongRadio = func(track *mediaprovider.Track) {
+ go func() {
+ tracks, err := c.GetSongRadioTracks(track)
+ if err != nil {
+ c.App.PlaybackManager.LoadTracks(tracks, backend.Replace, false)
+ c.App.PlaybackManager.PlayFromBeginning()
+ }
+ }()
+ }
+ qs.OnSetFavorite = func(trackID string, fav bool) {
+ go c.SetTrackFavorites([]string{trackID}, fav)
+ }
+ qs.OnSetRating = func(trackID string, rating int) {
+ go c.SetTrackRatings([]string{trackID}, rating)
+ }
+ qs.OnShare = func(trackID string) {
+ c.ShowShareDialog(trackID)
+ }
+ qs.OnShowTrackInfo = func(track *mediaprovider.Track) {
+ c.ShowTrackInfoDialog(track)
+ }
+
+ c.ClosePopUpOnEscape(pop)
+ c.haveModal = true
+ min := qs.MinSize()
+ height := fyne.Max(min.Height, fyne.Min(min.Height*1.5, c.MainWindow.Canvas().Size().Height*0.7))
+ qs.SearchDialog.Show()
+ pop.Resize(fyne.NewSize(min.Width, height))
+ pop.Show()
+ c.MainWindow.Canvas().Focus(qs.GetSearchEntry())
+}
+
+func (c *Controller) handleSearchDialogOnAddToQueue(t mediaprovider.ContentType, id string, item any, next bool) {
+ insertMode := backend.Append
+ if next {
+ insertMode = backend.InsertNext
+ }
+ switch t {
+ case mediaprovider.ContentTypeTrack:
+ c.App.PlaybackManager.LoadTracks(
+ []*mediaprovider.Track{item.(*mediaprovider.Track)},
+ insertMode, false /*shuffle*/)
+ case mediaprovider.ContentTypeAlbum:
+ go c.App.PlaybackManager.LoadAlbum(id, insertMode, false)
+ case mediaprovider.ContentTypeArtist:
+ go func() {
+ tracks := c.GetArtistTracks(id)
+ c.App.PlaybackManager.LoadTracks(tracks, insertMode, false)
+ }()
+ case mediaprovider.ContentTypePlaylist:
+ go c.App.PlaybackManager.LoadPlaylist(id, insertMode, false)
+ case mediaprovider.ContentTypeGenre:
+ go func() {
+ tr, err := c.App.ServerManager.Server.GetRandomTracks(id /*genre name*/, c.App.Config.Application.EnqueueBatchSize)
+ if err != nil {
+ c.App.PlaybackManager.LoadTracks(tr, insertMode, false /*shuffle*/)
+ }
+ }()
+ case mediaprovider.ContentTypeRadioStation:
+ c.App.PlaybackManager.LoadRadioStation(item.(*mediaprovider.RadioStation), insertMode)
+ }
+}
+
+func (c *Controller) handleSearchDialogOnAddToPlaylist(t mediaprovider.ContentType, id string, item any) {
+ switch t {
+ case mediaprovider.ContentTypeTrack:
+ c.DoAddTracksToPlaylistWorkflow([]string{id})
+ case mediaprovider.ContentTypeAlbum:
+ go func() {
+ album, err := c.App.ServerManager.Server.GetAlbum(id)
+ if err == nil && len(album.Tracks) > 0 {
+ trackIDs := sharedutil.MapSlice(album.Tracks, func(t *mediaprovider.Track) string {
+ return t.ID
+ })
+ fyne.Do(func() { c.DoAddTracksToPlaylistWorkflow(trackIDs) })
+ }
+ }()
+ case mediaprovider.ContentTypeArtist:
+ go func() {
+ tracks := c.GetArtistTracks(id)
+ if len(tracks) > 0 {
+ trackIDs := sharedutil.MapSlice(tracks, func(t *mediaprovider.Track) string {
+ return t.ID
+ })
+ fyne.Do(func() { c.DoAddTracksToPlaylistWorkflow(trackIDs) })
+ }
+ }()
+ case mediaprovider.ContentTypePlaylist:
+ go func() {
+ playlist, err := c.App.ServerManager.Server.GetPlaylist(id)
+ if err == nil && len(playlist.Tracks) > 0 {
+ trackIDs := sharedutil.MapSlice(playlist.Tracks, func(t *mediaprovider.Track) string {
+ return t.ID
+ })
+ fyne.Do(func() { c.DoAddTracksToPlaylistWorkflow(trackIDs) })
+ }
+ }()
+ case mediaprovider.ContentTypeGenre:
+ go func() {
+ tracks, err := c.App.ServerManager.Server.GetRandomTracks(id /*genre name*/, c.App.Config.Application.EnqueueBatchSize)
+ if err == nil && len(tracks) > 0 {
+ trackIDs := sharedutil.MapSlice(tracks, func(t *mediaprovider.Track) string {
+ return t.ID
+ })
+ fyne.Do(func() { c.DoAddTracksToPlaylistWorkflow(trackIDs) })
+ }
+ }()
+ case mediaprovider.ContentTypeRadioStation:
+ log.Println("Cannot add radio station to playlist")
+ }
+}
diff --git a/ui/controller/serverconnection.go b/ui/controller/serverconnection.go
new file mode 100644
index 0000000..480ff90
--- /dev/null
+++ b/ui/controller/serverconnection.go
@@ -0,0 +1,250 @@
+package controller
+
+import (
+ "context"
+ "fmt"
+ "log"
+ "time"
+
+ "fyne.io/fyne/v2"
+ "fyne.io/fyne/v2/dialog"
+ "fyne.io/fyne/v2/lang"
+ "fyne.io/fyne/v2/widget"
+ "github.com/dweymouth/supersonic/backend"
+ "github.com/dweymouth/supersonic/ui/dialogs"
+)
+
+func (m *Controller) PromptForFirstServer() {
+ d := dialogs.NewAddEditServerDialog(lang.L("Connect to Server"), false, nil, m.MainWindow.Canvas().Focus)
+ pop := widget.NewModalPopUp(d, m.MainWindow.Canvas())
+ d.OnSubmit = func() {
+ d.DisableSubmit()
+ go func() {
+ if m.testConnectionAndUpdateDialogText(d) {
+ // connection is good
+ pop.Hide()
+ m.doModalClosed()
+ conn := backend.ServerConnection{
+ ServerType: d.ServerType,
+ Hostname: d.Host,
+ AltHostname: d.AltHost,
+ Username: d.Username,
+ LegacyAuth: d.LegacyAuth,
+ }
+ server := m.App.ServerManager.AddServer(d.Nickname, conn)
+ if err := m.trySetPasswordAndConnectToServer(server, d.Password); err != nil {
+ log.Printf("error connecting to server: %s", err.Error())
+ }
+ }
+ d.EnableSubmit()
+ }()
+ }
+ m.haveModal = true
+ pop.Show()
+}
+
+// DoConnectToServerWorkflow does the workflow for connecting to the last active server on startup
+func (c *Controller) DoConnectToServerWorkflow(server *backend.ServerConfig) {
+ pass, err := c.App.ServerManager.GetServerPassword(server.ID)
+ if err != nil {
+ log.Printf("error getting password from keyring: %v", err)
+ c.PromptForLoginAndConnect()
+ return
+ }
+
+ // try connecting to last used server - set up cancelable modal dialog
+ canceled := false
+ ctx, cancel := context.WithCancel(context.Background())
+ dlg := dialog.NewCustom(lang.L("Connecting"), lang.L("Cancel"),
+ widget.NewLabel(fmt.Sprintf(lang.L("Connecting to")+" %s", server.Nickname)), c.MainWindow)
+ dlg.SetOnClosed(func() {
+ canceled = true
+ cancel()
+ })
+ c.haveModal = true
+ dlg.Show()
+
+ // try to connect
+ go func() {
+ defer cancel() // make sure to free up ctx resources if user does not cancel
+
+ if err := c.tryConnectToServer(ctx, server, pass); err != nil {
+ fyne.Do(func() {
+ dlg.Hide()
+ c.haveModal = false
+ if canceled {
+ c.PromptForLoginAndConnect()
+ } else {
+ // connection failure
+ dlg := dialog.NewError(err, c.MainWindow)
+ dlg.SetOnClosed(func() {
+ c.PromptForLoginAndConnect()
+ })
+ c.haveModal = true
+ dlg.Show()
+ }
+ })
+ } else {
+ fyne.Do(func() {
+ dlg.Hide()
+ c.haveModal = false
+ })
+ }
+ }()
+}
+
+func (m *Controller) PromptForLoginAndConnect() {
+ d := dialogs.NewLoginDialog(m.App.Config.Servers, m.App.ServerManager.GetServerPassword)
+ pop := widget.NewModalPopUp(d, m.MainWindow.Canvas())
+ d.OnSubmit = func(server *backend.ServerConfig, password string) {
+ d.DisableSubmit()
+ d.SetInfoText(lang.L("Testing connection") + "...")
+ go func() {
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+
+ err := m.App.ServerManager.TestConnectionAndAuth(ctx, server.ServerConnection, password)
+ fyne.Do(func() {
+ if err == backend.ErrUnreachable {
+ d.SetErrorText(lang.L("Server unreachable"))
+ } else if err != nil {
+ d.SetErrorText(lang.L("Authentication failed"))
+ } else {
+ pop.Hide()
+ m.trySetPasswordAndConnectToServer(server, password)
+ m.doModalClosed()
+ }
+ d.EnableSubmit()
+ })
+ }()
+ }
+ d.OnEditServer = func(server *backend.ServerConfig) {
+ pop.Hide()
+ editD := dialogs.NewAddEditServerDialog(lang.L("Edit server"), true, server, m.MainWindow.Canvas().Focus)
+ editPop := widget.NewModalPopUp(editD, m.MainWindow.Canvas())
+ editD.OnSubmit = func() {
+ d.DisableSubmit()
+ go func() {
+ success := m.testConnectionAndUpdateDialogText(editD)
+ fyne.Do(func() {
+ if success {
+ // connection is good
+ editPop.Hide()
+ server.Hostname = editD.Host
+ server.AltHostname = editD.AltHost
+ server.Nickname = editD.Nickname
+ server.Username = editD.Username
+ server.LegacyAuth = editD.LegacyAuth
+ m.trySetPasswordAndConnectToServer(server, editD.Password)
+ m.doModalClosed()
+ }
+ d.EnableSubmit()
+ })
+ }()
+ }
+ editD.OnCancel = func() {
+ editPop.Hide()
+ pop.Show()
+ }
+ editPop.Show()
+ }
+ d.OnNewServer = func() {
+ pop.Hide()
+ newD := dialogs.NewAddEditServerDialog(lang.L("Add Server"), true, nil, m.MainWindow.Canvas().Focus)
+ newPop := widget.NewModalPopUp(newD, m.MainWindow.Canvas())
+ newD.OnSubmit = func() {
+ d.DisableSubmit()
+ go func() {
+ success := m.testConnectionAndUpdateDialogText(newD)
+ fyne.Do(func() {
+ if success {
+ // connection is good
+ newPop.Hide()
+ conn := backend.ServerConnection{
+ ServerType: newD.ServerType,
+ Hostname: newD.Host,
+ AltHostname: newD.AltHost,
+ Username: newD.Username,
+ LegacyAuth: newD.LegacyAuth,
+ }
+ server := m.App.ServerManager.AddServer(newD.Nickname, conn)
+ m.trySetPasswordAndConnectToServer(server, newD.Password)
+ m.doModalClosed()
+ }
+ d.EnableSubmit()
+ })
+ }()
+ }
+ newD.OnCancel = func() {
+ newPop.Hide()
+ pop.Show()
+ }
+ newPop.Show()
+ }
+ d.OnDeleteServer = func(server *backend.ServerConfig) {
+ pop.Hide()
+ dialog.ShowConfirm(lang.L("Confirm Delete Server"),
+ fmt.Sprintf(lang.L("Are you sure you want to delete the server")+" %q?", server.Nickname),
+ func(ok bool) {
+ if ok {
+ m.App.ServerManager.DeleteServer(server.ID)
+ m.App.DeleteServerCacheDir(server.ID)
+ d.SetServers(m.App.Config.Servers)
+ }
+ if len(m.App.Config.Servers) == 0 {
+ m.PromptForFirstServer()
+ } else {
+ pop.Show()
+ }
+ }, m.MainWindow)
+
+ }
+ m.haveModal = true
+ pop.Show()
+}
+
+func (c *Controller) trySetPasswordAndConnectToServer(server *backend.ServerConfig, password string) error {
+ if err := c.App.ServerManager.SetServerPassword(server, password); err != nil {
+ log.Printf("error setting keyring credentials: %v", err)
+ // Don't return an error; fall back to just using the password in-memory
+ // User will need to log in with the password on subsequent runs.
+ }
+ return c.tryConnectToServer(context.Background(), server, password)
+}
+
+// try to connect to the given server, with the configured timeout added to the context
+func (c *Controller) tryConnectToServer(ctx context.Context, server *backend.ServerConfig, password string) error {
+ timeout := time.Duration(c.App.Config.Application.RequestTimeoutSeconds) * time.Second
+ ctx, cancel := context.WithTimeout(ctx, timeout)
+ defer cancel()
+ if err := c.App.ServerManager.TestConnectionAndAuth(ctx, server.ServerConnection, password); err != nil {
+ return err
+ }
+ if err := c.App.ServerManager.ConnectToServer(server, password); err != nil {
+ log.Printf("error connecting to server: %v", err)
+ return err
+ }
+ return nil
+}
+
+func (c *Controller) testConnectionAndUpdateDialogText(dlg *dialogs.AddEditServerDialog) bool {
+ dlg.SetInfoText(lang.L("Testing connection") + "...")
+ conn := backend.ServerConnection{
+ ServerType: dlg.ServerType,
+ Hostname: dlg.Host,
+ AltHostname: dlg.AltHost,
+ Username: dlg.Username,
+ LegacyAuth: dlg.LegacyAuth,
+ }
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ err := c.App.ServerManager.TestConnectionAndAuth(ctx, conn, dlg.Password)
+ if err == backend.ErrUnreachable {
+ dlg.SetErrorText(lang.L("Could not reach server") + fmt.Sprintf(" (%s?)", lang.L("wrong URL")))
+ return false
+ } else if err != nil {
+ dlg.SetErrorText(lang.L("Authentication failed") + fmt.Sprintf(" (%s)", lang.L("wrong username/password")))
+ return false
+ }
+ return true
+}
diff --git a/ui/controller/visualizations.go b/ui/controller/visualizations.go
index b63cdf6..4fbfdae 100644
--- a/ui/controller/visualizations.go
+++ b/ui/controller/visualizations.go
@@ -7,6 +7,7 @@ import (
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/lang"
"github.com/dweymouth/supersonic/backend/player"
+ "github.com/dweymouth/supersonic/backend/player/mpv"
"github.com/dweymouth/supersonic/ui/shortcuts"
"github.com/dweymouth/supersonic/ui/util"
"github.com/dweymouth/supersonic/ui/visualizations"
@@ -21,11 +22,13 @@ type visualizationData struct {
}
func (c *Controller) initVisualizations() {
- c.App.LocalPlayer.OnStopped(c.stopVisualizationAnim)
- c.App.LocalPlayer.OnPaused(c.stopVisualizationAnim)
- c.App.LocalPlayer.OnPlaying(func() {
- if c.peakMeter != nil {
- c.startVisualizationAnim()
+ c.App.PlaybackManager.OnStopped(c.stopVisualizationAnim)
+ c.App.PlaybackManager.OnPaused(c.stopVisualizationAnim)
+ c.App.PlaybackManager.OnPlaying(func() {
+ if _, ok := c.App.PlaybackManager.CurrentPlayer().(*mpv.Player); ok {
+ if c.peakMeter != nil {
+ c.startVisualizationAnim()
+ }
}
})
}
@@ -71,13 +74,13 @@ func (c *Controller) stopVisualizationAnim() {
if c.visualizationAnim != nil {
c.visualizationAnim.Stop()
c.visualizationAnim = nil
- c.App.LocalPlayer.SetPeaksEnabled(false)
+ // c.App.LocalPlayer.SetPeaksEnabled(false)
}
}
func (c *Controller) startVisualizationAnim() {
if c.visualizationAnim == nil {
- c.App.LocalPlayer.SetPeaksEnabled(true)
+ //c.App.LocalPlayer.SetPeaksEnabled(true)
c.visualizationAnim = fyne.NewAnimation(
time.Duration(math.MaxInt64), /*until stopped*/
c.tickVisualizations)
@@ -86,8 +89,8 @@ func (c *Controller) startVisualizationAnim() {
}
func (c *Controller) tickVisualizations(_ float32) {
- lP, rP, lRMS, rRMS := c.App.LocalPlayer.GetPeaks()
+ //lP, rP, lRMS, rRMS := c.App.LocalPlayer.GetPeaks()
if c.visualizationData.peakMeter != nil {
- c.visualizationData.peakMeter.UpdatePeaks(lP, rP, lRMS, rRMS)
+ //c.visualizationData.peakMeter.UpdatePeaks(lP, rP, lRMS, rRMS)
}
}
diff --git a/ui/dialogs/quicksearch.go b/ui/dialogs/quicksearch.go
index 8a557e5..96113da 100644
--- a/ui/dialogs/quicksearch.go
+++ b/ui/dialogs/quicksearch.go
@@ -5,31 +5,115 @@ import (
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/lang"
+ "fyne.io/fyne/v2/theme"
+ "fyne.io/fyne/v2/widget"
"github.com/dweymouth/supersonic/backend/mediaprovider"
+ myTheme "github.com/dweymouth/supersonic/ui/theme"
"github.com/dweymouth/supersonic/ui/util"
)
type QuickSearch struct {
SearchDialog *SearchDialog
+ results []*mediaprovider.SearchResult
mp mediaprovider.MediaProvider
+
+ OnPlay func(t mediaprovider.ContentType, id string, item any, shuffle bool)
+ OnAddToQueue func(t mediaprovider.ContentType, id string, item any, next bool)
+ OnAddToPlaylist func(t mediaprovider.ContentType, id string, item any)
+ OnSetFavorite func(trackID string, fav bool)
+ OnSetRating func(trackID string, rating int)
+ OnDownload func(track *mediaprovider.Track)
+ OnShare func(trackID string)
+ OnPlaySongRadio func(track *mediaprovider.Track)
+ OnShowTrackInfo func(track *mediaprovider.Track)
}
func NewQuickSearch(mp mediaprovider.MediaProvider, im util.ImageFetcher) *QuickSearch {
q := &QuickSearch{mp: mp}
q.SearchDialog = NewSearchDialog(im, lang.L("Search Everywhere"), lang.L("Close"), q.onSearched)
+ q.SearchDialog.OnShowContextMenu = q.showMenu
return q
}
func (q *QuickSearch) onSearched(query string) []*mediaprovider.SearchResult {
- var results []*mediaprovider.SearchResult
if query != "" {
if res, err := q.mp.SearchAll(query, 20); err != nil {
+ q.results = nil
log.Printf("Error searching: %s", err.Error())
} else {
- results = res
+ q.results = res
}
}
- return results
+ return q.results
+}
+
+func (q *QuickSearch) showMenu(idx int, pos fyne.Position) {
+ cType := q.results[idx].Type
+ id := q.results[idx].ID
+ item := q.results[idx].Item
+
+ canvas := fyne.CurrentApp().Driver().CanvasForObject(q.SearchDialog)
+
+ switch cType {
+ case mediaprovider.ContentTypeTrack:
+ menu := util.NewTrackContextMenu(false, nil)
+ menu.OnPlay = func(shuffle bool) {
+ q.OnPlay(cType, id, item, shuffle)
+ }
+ menu.OnAddToQueue = func(next bool) {
+ q.OnAddToQueue(cType, id, item, next)
+ }
+ menu.OnAddToPlaylist = func() {
+ q.OnAddToPlaylist(cType, id, item)
+ }
+ menu.OnDownload = func() {
+ q.OnDownload(item.(*mediaprovider.Track))
+ }
+ menu.OnFavorite = func(fav bool) {
+ q.OnSetFavorite(id, fav)
+ }
+ menu.OnSetRating = func(rating int) {
+ q.OnSetRating(id, rating)
+ }
+ menu.OnPlaySongRadio = func() {
+ q.OnPlaySongRadio(item.(*mediaprovider.Track))
+ }
+ menu.OnShowInfo = func() {
+ q.OnShowTrackInfo(item.(*mediaprovider.Track))
+ }
+ menu.OnShare = func() {
+ q.OnShare(id)
+ }
+ menu.ShowAtPosition(pos, canvas)
+ default:
+ play := fyne.NewMenuItem(lang.L("Play"), func() {
+ q.OnPlay(cType, id, item, false)
+ })
+ play.Icon = theme.MediaPlayIcon()
+ shuffle := fyne.NewMenuItem(lang.L("Shuffle"), func() {
+ q.OnPlay(cType, id, item, true)
+ })
+ shuffle.Icon = myTheme.ShuffleIcon
+ playNext := fyne.NewMenuItem(lang.L("Play next"), func() {
+ q.OnAddToQueue(cType, id, item, true)
+ })
+ playNext.Icon = myTheme.PlayNextIcon
+ add := fyne.NewMenuItem(lang.L("Add to queue"), func() {
+ q.OnAddToQueue(cType, id, item, false)
+ })
+ add.Icon = theme.ContentAddIcon()
+ menu := fyne.NewMenu("", play, shuffle, playNext, add)
+
+ if cType != mediaprovider.ContentTypeRadioStation {
+ playlist := fyne.NewMenuItem(lang.L("Add to playlist")+"...", func() {
+ q.OnAddToPlaylist(cType, id, item)
+ })
+ playlist.Icon = myTheme.PlaylistIcon
+ menu.Items = append(menu.Items, playlist)
+ }
+
+ widget.ShowPopUpMenuAtPosition(menu, canvas, pos)
+ }
}
func (q *QuickSearch) SetOnDismiss(onDismiss func()) {
diff --git a/ui/dialogs/searchdialog.go b/ui/dialogs/searchdialog.go
index 58801c9..411c974 100644
--- a/ui/dialogs/searchdialog.go
+++ b/ui/dialogs/searchdialog.go
@@ -30,9 +30,10 @@ type SearchDialog struct {
// of the dismiss buttons
ActionItem fyne.CanvasObject
- OnDismiss func()
- OnNavigateTo func(mediaprovider.ContentType, string)
- OnSearched func(string) []*mediaprovider.SearchResult
+ OnDismiss func()
+ OnNavigateTo func(mediaprovider.ContentType, string)
+ OnShowContextMenu func(itemIdx int, pos fyne.Position)
+ OnSearched func(string) []*mediaprovider.SearchResult
imgSource util.ImageFetcher
resultsMutex sync.RWMutex
@@ -326,6 +327,12 @@ func (q *searchResult) Tapped(_ *fyne.PointEvent) {
q.parent.onSelected(q.index)
}
+func (q *searchResult) TappedSecondary(e *fyne.PointEvent) {
+ if q.parent.OnShowContextMenu != nil {
+ q.parent.OnShowContextMenu(q.index, e.AbsolutePosition)
+ }
+}
+
func (q *searchResult) CreateRenderer() fyne.WidgetRenderer {
if q.content == nil {
q.content = container.NewBorder(nil, nil, container.NewCenter(q.image), nil,
diff --git a/ui/theme/theme.go b/ui/theme/theme.go
index a9a1bcc..5df2935 100644
--- a/ui/theme/theme.go
+++ b/ui/theme/theme.go
@@ -39,6 +39,7 @@ var (
AlbumIcon fyne.Resource = theme.NewThemedResource(res.ResDiscSvg)
ArtistIcon fyne.Resource = theme.NewThemedResource(res.ResPeopleSvg)
AutoplayIcon fyne.Resource = theme.NewThemedResource(res.ResInfinitySvg)
+ CastIcon fyne.Resource = theme.NewThemedResource(res.ResCastSvg)
RadioIcon fyne.Resource = theme.NewThemedResource(res.ResBroadcastSvg)
FavoriteIcon fyne.Resource = theme.NewThemedResource(res.ResHeartFilledSvg)
NotFavoriteIcon fyne.Resource = theme.NewThemedResource(res.ResHeartOutlineSvg)
diff --git a/ui/util/trackcontextmenu.go b/ui/util/trackcontextmenu.go
new file mode 100644
index 0000000..b6e881f
--- /dev/null
+++ b/ui/util/trackcontextmenu.go
@@ -0,0 +1,137 @@
+package util
+
+import (
+ "fyne.io/fyne/v2"
+ "fyne.io/fyne/v2/lang"
+ "fyne.io/fyne/v2/theme"
+ "fyne.io/fyne/v2/widget"
+ myTheme "github.com/dweymouth/supersonic/ui/theme"
+)
+
+type TrackContextMenu struct {
+ ratingSubmenu *fyne.MenuItem
+ shareMenuItem *fyne.MenuItem
+ songRadioMenuItem *fyne.MenuItem
+ infoMenuItem *fyne.MenuItem
+
+ OnPlay func(shuffle bool)
+ OnAddToQueue func(next bool)
+ OnPlaySongRadio func()
+ OnDownload func()
+ OnAddToPlaylist func()
+ OnShowInfo func()
+ OnShare func()
+ OnFavorite func(fav bool)
+ OnSetRating func(rating int)
+
+ menu *fyne.Menu
+}
+
+func NewTrackContextMenu(disablePlaybackMenu bool, auxItems []*fyne.MenuItem) *TrackContextMenu {
+ tcm := &TrackContextMenu{}
+
+ tcm.menu = fyne.NewMenu("")
+ if !disablePlaybackMenu {
+ play := fyne.NewMenuItem(lang.L("Play"), func() {
+ if tcm.OnPlay != nil {
+ tcm.OnPlay(false)
+ }
+ })
+ play.Icon = theme.MediaPlayIcon()
+ shuffle := fyne.NewMenuItem(lang.L("Shuffle"), func() {
+ if tcm.OnPlay != nil {
+ tcm.OnPlay(true)
+ }
+ })
+ shuffle.Icon = myTheme.ShuffleIcon
+ playNext := fyne.NewMenuItem(lang.L("Play next"), func() {
+ if tcm.OnAddToQueue != nil {
+ tcm.OnAddToQueue(true)
+ }
+ })
+ playNext.Icon = myTheme.PlayNextIcon
+ add := fyne.NewMenuItem(lang.L("Add to queue"), func() {
+ if tcm.OnAddToQueue != nil {
+ tcm.OnAddToQueue(false)
+ }
+ })
+ add.Icon = theme.ContentAddIcon()
+ tcm.songRadioMenuItem = fyne.NewMenuItem(lang.L("Play song radio"), func() {
+ if tcm.OnPlaySongRadio != nil {
+ tcm.OnPlaySongRadio()
+ }
+ })
+ tcm.songRadioMenuItem.Icon = myTheme.RadioIcon
+ tcm.menu.Items = append(tcm.menu.Items,
+ play, shuffle, playNext, add, tcm.songRadioMenuItem)
+ }
+ playlist := fyne.NewMenuItem(lang.L("Add to playlist")+"...", func() {
+ if tcm.OnAddToPlaylist != nil {
+ tcm.OnAddToPlaylist()
+ }
+ })
+ playlist.Icon = myTheme.PlaylistIcon
+ download := fyne.NewMenuItem(lang.L("Download")+"...", func() {
+ if tcm.OnDownload != nil {
+ tcm.OnDownload()
+ }
+ })
+ download.Icon = theme.DownloadIcon()
+ tcm.infoMenuItem = fyne.NewMenuItem(lang.L("Show info")+"...", func() {
+ if tcm.OnShowInfo != nil {
+ tcm.OnShowInfo()
+ }
+ })
+ tcm.infoMenuItem.Icon = theme.InfoIcon()
+ favorite := fyne.NewMenuItem(lang.L("Set favorite"), func() {
+ if tcm.OnFavorite != nil {
+ tcm.OnFavorite(true)
+ }
+ })
+ favorite.Icon = myTheme.FavoriteIcon
+ unfavorite := fyne.NewMenuItem(lang.L("Unset favorite"), func() {
+ if tcm.OnFavorite != nil {
+ tcm.OnFavorite(false)
+ }
+ })
+ unfavorite.Icon = myTheme.NotFavoriteIcon
+ tcm.menu.Items = append(tcm.menu.Items, fyne.NewMenuItemSeparator(),
+ playlist, download, tcm.infoMenuItem)
+ tcm.shareMenuItem = fyne.NewMenuItem(lang.L("Share")+"...", func() {
+ if tcm.OnShare != nil {
+ tcm.OnShare()
+ }
+ })
+ tcm.shareMenuItem.Icon = myTheme.ShareIcon
+ tcm.menu.Items = append(tcm.menu.Items, tcm.shareMenuItem)
+ tcm.menu.Items = append(tcm.menu.Items, fyne.NewMenuItemSeparator())
+ tcm.menu.Items = append(tcm.menu.Items, favorite, unfavorite)
+ tcm.ratingSubmenu = NewRatingSubmenu(func(rating int) {
+ if tcm.OnSetRating != nil {
+ tcm.OnSetRating(rating)
+ }
+ })
+ tcm.menu.Items = append(tcm.menu.Items, tcm.ratingSubmenu)
+ if len(auxItems) > 0 {
+ tcm.menu.Items = append(tcm.menu.Items, fyne.NewMenuItemSeparator())
+ tcm.menu.Items = append(tcm.menu.Items, auxItems...)
+ }
+
+ return tcm
+}
+
+func (tcm *TrackContextMenu) SetRatingDisabled(disabled bool) {
+ tcm.ratingSubmenu.Disabled = disabled
+}
+
+func (tcm *TrackContextMenu) SetShareDisabled(disabled bool) {
+ tcm.shareMenuItem.Disabled = disabled
+}
+
+func (tcm *TrackContextMenu) SetInfoDisabled(disabled bool) {
+ tcm.infoMenuItem.Disabled = disabled
+}
+
+func (tcm *TrackContextMenu) ShowAtPosition(pos fyne.Position, canvas fyne.Canvas) {
+ widget.ShowPopUpMenuAtPosition(tcm.menu, canvas, pos)
+}
diff --git a/ui/util/tracklistutil.go b/ui/util/tracklistutil.go
index 68a35a0..1669517 100644
--- a/ui/util/tracklistutil.go
+++ b/ui/util/tracklistutil.go
@@ -52,12 +52,13 @@ func SelectedIndexes(items []*TrackListModel) []int {
return selected
}
-func SelectItem(items []*TrackListModel, idx int) {
+func SelectItem(items []*TrackListModel, idx int) bool {
if items[idx].Selected {
- return
+ return false
}
UnselectAllItems(items)
items[idx].Selected = true
+ return true
}
func SelectAllItems(items []*TrackListModel) {
diff --git a/ui/widgets/albumfilterbutton.go b/ui/widgets/albumfilterbutton.go
index 3562868..43cb30c 100644
--- a/ui/widgets/albumfilterbutton.go
+++ b/ui/widgets/albumfilterbutton.go
@@ -199,7 +199,10 @@ func NewAlbumFilterPopup(filter *AlbumFilterButton) *AlbumFilterPopup {
)
go func() {
- a.genreFilter.SetGenreList(<-a.filterBtn.genreListChan)
+ genres := <-a.filterBtn.genreListChan
+ fyne.Do(func() {
+ a.genreFilter.SetGenreList(genres)
+ })
}()
return a
diff --git a/ui/widgets/auxcontrols.go b/ui/widgets/auxcontrols.go
index ce17cd5..324bce1 100644
--- a/ui/widgets/auxcontrols.go
+++ b/ui/widgets/auxcontrols.go
@@ -2,6 +2,7 @@ package widgets
import (
"math"
+ "time"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/container"
@@ -25,6 +26,7 @@ type AuxControls struct {
VolumeControl *VolumeControl
autoplay *IconButton
loop *IconButton
+ cast *IconButton
showQueue *IconButton
container *fyne.Container
@@ -35,10 +37,17 @@ func NewAuxControls(initialVolume int, initialLoopMode backend.LoopMode, initial
VolumeControl: NewVolumeControl(initialVolume),
autoplay: NewIconButton(myTheme.AutoplayIcon, nil),
loop: NewIconButton(myTheme.RepeatIcon, nil),
+ cast: NewIconButton(myTheme.CastIcon, nil),
showQueue: NewIconButton(myTheme.PlayQueueIcon, nil),
}
+
a.loop.IconSize = IconButtonSizeSmaller
a.loop.SetToolTip(lang.L("Repeat"))
+ a.SetLoopMode(initialLoopMode)
+
+ a.cast.IconSize = IconButtonSizeSmaller
+ a.cast.SetToolTip(lang.L("Cast to device"))
+
a.autoplay.Highlighted = initialAutoplay
//a.autoplay.IconSize = IconButtonSizeSmaller
a.autoplay.SetToolTip(lang.L("Autoplay"))
@@ -48,9 +57,10 @@ func NewAuxControls(initialVolume int, initialLoopMode backend.LoopMode, initial
a.OnChangeAutoplay(a.autoplay.Highlighted)
}
}
- a.SetLoopMode(initialLoopMode)
+
a.showQueue.IconSize = IconButtonSizeSmaller
a.showQueue.SetToolTip(lang.L("Show play queue"))
+
a.container = container.NewHBox(
layout.NewSpacer(),
container.NewVBox(
@@ -58,7 +68,7 @@ func NewAuxControls(initialVolume int, initialLoopMode backend.LoopMode, initial
a.VolumeControl,
container.New(
layout.NewCustomPaddedHBoxLayout(theme.Padding()*1.5),
- layout.NewSpacer(), a.autoplay, a.loop, a.showQueue, util.NewHSpace(5)),
+ layout.NewSpacer(), a.autoplay, a.loop, a.cast, a.showQueue, util.NewHSpace(5)),
layout.NewSpacer(),
),
)
@@ -88,6 +98,16 @@ func (a *AuxControls) SetLoopMode(mode backend.LoopMode) {
}
}
+func (a *AuxControls) DisableCastButton() {
+ a.cast.Disable()
+}
+
+func (a *AuxControls) SetIsRemotePlayer(isRemote bool) {
+ a.cast.Enable()
+ a.cast.Highlighted = isRemote
+ a.cast.Refresh()
+}
+
func (a *AuxControls) SetAutoplay(autoplay bool) {
if autoplay == a.autoplay.Highlighted {
return
@@ -100,6 +120,12 @@ func (a *AuxControls) OnShowPlayQueue(f func()) {
a.showQueue.OnTapped = f
}
+func (a *AuxControls) OnShowCastMenu(f func(func())) {
+ a.cast.OnTapped = func() {
+ f(a.DisableCastButton)
+ }
+}
+
type volumeSlider struct {
widget.Slider
@@ -145,6 +171,10 @@ type VolumeControl struct {
muted bool
lastVol int
+ setVolDebouncer func()
+ delaySetVolume bool
+ pendingVolume int
+
container *fyne.Container
}
@@ -160,6 +190,15 @@ func NewVolumeControl(initialVol int) *VolumeControl {
v.slider.Orientation = widget.Horizontal
v.slider.Value = float64(v.lastVol)
v.slider.OnChanged = v.onChanged
+
+ // for players that are slow to respond to volume changes
+ // (e.g. DLNA), delay responding to the SetVolume call
+ // to avoid hiccuping from callback "echoes"
+ v.setVolDebouncer = util.NewDebouncer(100*time.Millisecond, func() {
+ v.delaySetVolume = false
+ v.SetVolume(v.pendingVolume)
+ })
+
v.container = container.NewHBox(container.NewCenter(v.icon), v.slider)
return v
}
@@ -167,6 +206,11 @@ func NewVolumeControl(initialVol int) *VolumeControl {
// Sets the volume that is displayed in the slider.
// Does not invoke OnSetVolume callback.
func (v *VolumeControl) SetVolume(vol int) {
+ if v.delaySetVolume {
+ v.pendingVolume = vol
+ return
+ }
+
if (vol == v.lastVol && !v.muted) || (v.muted && vol == 0) {
return
}
@@ -177,6 +221,8 @@ func (v *VolumeControl) SetVolume(vol int) {
func (v *VolumeControl) onChanged(volume float64) {
vol := int(volume)
+ v.delaySetVolume = true
+ v.setVolDebouncer()
v.lastVol = vol
v.muted = false
v.updateIconForVolume(vol)
diff --git a/ui/widgets/playqueuelist.go b/ui/widgets/playqueuelist.go
index 32a3f9e..f8532b2 100644
--- a/ui/widgets/playqueuelist.go
+++ b/ui/widgets/playqueuelist.go
@@ -42,6 +42,7 @@ type PlayQueueList struct {
OnPlayItemAt func(idx int)
OnPlaySelection func(items []mediaprovider.MediaItem, shuffle bool)
OnPlaySelectionNext func(items []mediaprovider.MediaItem)
+ OnPlaySongRadio func(track *mediaprovider.Track)
OnAddToQueue func(items []mediaprovider.MediaItem)
OnAddToPlaylist func(trackIDs []string)
OnSetFavorite func(trackIDs []string, fav bool)
@@ -54,11 +55,8 @@ type PlayQueueList struct {
OnReorderItems func(idxs []int, reorderTo int)
useNonQueueMenu bool
- menu *widget.PopUpMenu // ctx menu for when only tracks are selected
- radiosMenu *widget.PopUpMenu // ctx menu for when selection contains radios
- ratingSubmenu *fyne.MenuItem
- infoMenuItem *fyne.MenuItem
- shareMenuItem *fyne.MenuItem
+ menu *util.TrackContextMenu // ctx menu for when only tracks are selected
+ radiosMenu *widget.PopUpMenu // ctx menu for when selection contains radios
nowPlayingID string
@@ -256,82 +254,24 @@ func (p *PlayQueueList) onShowContextMenu(e *fyne.PointEvent, trackIdx int) {
}
}
- var menu *widget.PopUpMenu
if allTracks {
p.ensureTracksMenu()
- p.ratingSubmenu.Disabled = p.DisableRating
- p.infoMenuItem.Disabled = len(selected) != 1
- p.shareMenuItem.Disabled = p.DisableSharing || len(selected) != 1
- menu = p.menu
+ p.menu.SetRatingDisabled(p.DisableRating)
+ p.menu.SetInfoDisabled(len(selected) != 1)
+ p.menu.SetShareDisabled(p.DisableSharing || len(selected) != 1)
+ p.menu.ShowAtPosition(e.AbsolutePosition, fyne.CurrentApp().Driver().CanvasForObject(p))
} else {
p.ensureRadiosMenu()
- menu = p.radiosMenu
+ p.radiosMenu.ShowAtPosition(e.AbsolutePosition)
}
- menu.ShowAtPosition(e.AbsolutePosition)
+
}
func (p *PlayQueueList) ensureTracksMenu() {
if p.menu != nil {
return
}
- var menuItems []*fyne.MenuItem
- if p.useNonQueueMenu {
- menuItems = append(menuItems, p.createQueueActionMenuItems()...)
- menuItems = append(menuItems, fyne.NewMenuItemSeparator())
- }
-
- playlist := fyne.NewMenuItem(lang.L("Add to playlist")+"...", func() {
- if p.OnAddToPlaylist != nil {
- p.OnAddToPlaylist(p.selectedItemIDs())
- }
- })
- playlist.Icon = myTheme.PlaylistIcon
- download := fyne.NewMenuItem(lang.L("Download")+"...", func() {
- if p.OnDownload != nil {
- p.OnDownload(p.selectedTracks(), "Selected tracks")
- }
- })
- download.Icon = theme.DownloadIcon()
- p.infoMenuItem = fyne.NewMenuItem(lang.L("Show info")+"...", func() {
- if p.OnShowTrackInfo != nil {
- p.OnShowTrackInfo(p.selectedTracks()[0])
- }
- })
- p.infoMenuItem.Icon = theme.InfoIcon()
- p.shareMenuItem = fyne.NewMenuItem(lang.L("Share")+"...", func() {
- if p.OnShare != nil {
- p.OnShare(p.selectedTracks())
- }
- })
- p.shareMenuItem.Icon = myTheme.ShareIcon
- favorite := fyne.NewMenuItem(lang.L("Set favorite"), func() {
- if p.OnSetFavorite != nil {
- p.OnSetFavorite(p.selectedItemIDs(), true)
- }
- })
- favorite.Icon = myTheme.FavoriteIcon
- unfavorite := fyne.NewMenuItem(lang.L("Unset favorite"), func() {
- if p.OnSetFavorite != nil {
- p.OnSetFavorite(p.selectedItemIDs(), false)
- }
- })
- unfavorite.Icon = myTheme.NotFavoriteIcon
- p.ratingSubmenu = util.NewRatingSubmenu(func(rating int) {
- if p.OnSetRating != nil {
- p.OnSetRating(p.selectedItemIDs(), rating)
- }
- })
- menuItems = append(menuItems,
- playlist,
- download,
- p.infoMenuItem,
- p.shareMenuItem,
- fyne.NewMenuItemSeparator(),
- favorite,
- unfavorite,
- p.ratingSubmenu,
- )
-
+ var auxItems []*fyne.MenuItem
if !p.useNonQueueMenu {
remove := fyne.NewMenuItem(lang.L("Remove from queue"), func() {
if p.OnRemoveFromQueue != nil {
@@ -339,15 +279,40 @@ func (p *PlayQueueList) ensureTracksMenu() {
}
})
remove.Icon = theme.ContentRemoveIcon()
- menuItems = append(menuItems,
- fyne.NewMenuItemSeparator(),
- remove)
+ auxItems = append(auxItems, remove)
+ }
+ p.menu = util.NewTrackContextMenu(!p.useNonQueueMenu, auxItems)
+ p.menu.OnPlay = func(shuffle bool) {
+ p.OnPlaySelection(p.selectedItems(), shuffle)
+ }
+ p.menu.OnAddToQueue = func(next bool) {
+ if next {
+ p.OnPlaySelectionNext(p.selectedItems())
+ } else {
+ p.OnAddToQueue(p.selectedItems())
+ }
+ }
+ p.menu.OnPlaySongRadio = func() {
+ p.OnPlaySongRadio(p.selectedTracks()[0])
+ }
+ p.menu.OnDownload = func() {
+ p.OnDownload(p.selectedTracks(), "Selected tracks")
+ }
+ p.menu.OnAddToPlaylist = func() {
+ p.OnAddToPlaylist(p.selectedItemIDs())
+ }
+ p.menu.OnShowInfo = func() {
+ p.OnShowTrackInfo(p.selectedTracks()[0])
+ }
+ p.menu.OnShare = func() {
+ p.OnShare(p.selectedTracks())
+ }
+ p.menu.OnSetRating = func(rating int) {
+ p.OnSetRating(p.selectedItemIDs(), rating)
+ }
+ p.menu.OnFavorite = func(fav bool) {
+ p.OnSetFavorite(p.selectedItemIDs(), fav)
}
-
- p.menu = widget.NewPopUpMenu(
- fyne.NewMenu("", menuItems...),
- fyne.CurrentApp().Driver().CanvasForObject(p),
- )
}
func (p *PlayQueueList) ensureRadiosMenu() {
@@ -366,34 +331,6 @@ func (p *PlayQueueList) ensureRadiosMenu() {
)
}
-func (p *PlayQueueList) createQueueActionMenuItems() []*fyne.MenuItem {
- play := fyne.NewMenuItem(lang.L("Play"), func() {
- if p.OnPlaySelection != nil {
- p.OnPlaySelection(p.selectedItems(), false)
- }
- })
- play.Icon = theme.MediaPlayIcon()
- shuffle := fyne.NewMenuItem(lang.L("Shuffle"), func() {
- if p.OnPlaySelection != nil {
- p.OnPlaySelection(p.selectedItems(), true)
- }
- })
- shuffle.Icon = myTheme.ShuffleIcon
- playNext := fyne.NewMenuItem(lang.L("Play next"), func() {
- if p.OnPlaySelection != nil {
- p.OnPlaySelectionNext(p.selectedItems())
- }
- })
- playNext.Icon = myTheme.PlayNextIcon
- add := fyne.NewMenuItem(lang.L("Add to queue"), func() {
- if p.OnPlaySelection != nil {
- p.OnAddToQueue(p.selectedItems())
- }
- })
- add.Icon = theme.ContentAddIcon()
- return []*fyne.MenuItem{play, shuffle, playNext, add}
-}
-
func (t *PlayQueueList) selectedItems() []mediaprovider.MediaItem {
t.tracksMutex.RLock()
defer t.tracksMutex.RUnlock()
diff --git a/ui/widgets/searchentry.go b/ui/widgets/searchentry.go
index f998bc1..c71e4da 100644
--- a/ui/widgets/searchentry.go
+++ b/ui/widgets/searchentry.go
@@ -17,7 +17,9 @@ import (
type SearchEntry struct {
widget.Entry
- OnSearched func(string)
+ minWidth float32
+ OnSearched func(string)
+ OnFocusLost func()
}
func NewSearchEntry() *SearchEntry {
@@ -53,13 +55,28 @@ func (s *SearchEntry) TypedKey(e *fyne.KeyEvent) {
s.Entry.TypedKey(e)
}
+func (s *SearchEntry) FocusLost() {
+ s.Entry.FocusLost()
+ if s.OnFocusLost != nil {
+ s.OnFocusLost()
+ }
+}
+
func (s *SearchEntry) Refresh() {
s.updateActionButton()
s.Entry.Refresh()
}
+func (s *SearchEntry) SetMinWidth(w float32) {
+ s.minWidth = w
+}
+
func (s *SearchEntry) MinSize() fyne.Size {
- return fyne.NewSize(200, s.Entry.MinSize().Height)
+ w := s.minWidth
+ if w == 0 {
+ w = 200
+ }
+ return fyne.NewSize(w, s.Entry.MinSize().Height)
}
func (s *SearchEntry) updateActionButton() bool {
diff --git a/ui/widgets/tracklist.go b/ui/widgets/tracklist.go
index d06f279..7f1b27f 100644
--- a/ui/widgets/tracklist.go
+++ b/ui/widgets/tracklist.go
@@ -6,13 +6,10 @@ import (
"sort"
"strings"
- "fyne.io/fyne/v2/lang"
-
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/backend/mediaprovider"
"github.com/dweymouth/supersonic/sharedutil"
"github.com/dweymouth/supersonic/ui/layouts"
- myTheme "github.com/dweymouth/supersonic/ui/theme"
"github.com/dweymouth/supersonic/ui/util"
"fyne.io/fyne/v2"
@@ -93,17 +90,13 @@ type Tracklist struct {
tracks []*util.TrackListModel
tracksOrigOrder []*util.TrackListModel
- nowPlayingID string
- colLayout *layouts.ColumnsLayout
- hdr *ListHeader
- list *FocusList
- ctxMenu *fyne.Menu
- ratingSubmenu *fyne.MenuItem
- shareMenuItem *fyne.MenuItem
- songRadioMenuItem *fyne.MenuItem
- infoMenuItem *fyne.MenuItem
- loadingDots *LoadingDots
- container *fyne.Container
+ nowPlayingID string
+ colLayout *layouts.ColumnsLayout
+ hdr *ListHeader
+ list *FocusList
+ ctxMenu *util.TrackContextMenu
+ loadingDots *LoadingDots
+ container *fyne.Container
}
func NewTracklist(tracks []*mediaprovider.Track, im *backend.ImageManager, useCompactRows bool) *Tracklist {
@@ -342,7 +335,7 @@ func (t *Tracklist) GetTracks() []*mediaprovider.Track {
// Append more tracks to the tracklist.
func (t *Tracklist) AppendTracks(trs []*mediaprovider.Track) {
- t.tracksOrigOrder = append(t.tracks, util.ToTrackListModels(trs)...)
+ t.tracksOrigOrder = append(t.tracksOrigOrder, util.ToTrackListModels(trs)...)
t.doSortTracks()
t.list.Refresh()
}
@@ -491,8 +484,8 @@ func (t *Tracklist) selectAddOrRemove(idx int) {
t.tracks[idx].Selected = !t.tracks[idx].Selected
}
-func (t *Tracklist) selectTrack(idx int) {
- util.SelectItem(t.tracks, idx)
+func (t *Tracklist) selectTrack(idx int) bool {
+ return util.SelectItem(t.tracks, idx)
}
func (t *Tracklist) selectRange(idx int) {
@@ -500,88 +493,47 @@ func (t *Tracklist) selectRange(idx int) {
}
func (t *Tracklist) onShowContextMenu(e *fyne.PointEvent, trackIdx int) {
- t.selectTrack(trackIdx)
- t.list.Refresh()
+ if t.selectTrack(trackIdx) {
+ t.list.Refresh()
+ }
if t.ctxMenu == nil {
- t.ctxMenu = fyne.NewMenu("")
- if !t.Options.DisablePlaybackMenu {
- play := fyne.NewMenuItem(lang.L("Play"), func() {
- if t.OnPlaySelection != nil {
- t.OnPlaySelection(t.selectedTracks(), false)
- }
- })
- play.Icon = theme.MediaPlayIcon()
- shuffle := fyne.NewMenuItem(lang.L("Shuffle"), func() {
- if t.OnPlaySelection != nil {
- t.OnPlaySelection(t.selectedTracks(), true)
- }
- })
- shuffle.Icon = myTheme.ShuffleIcon
- playNext := fyne.NewMenuItem(lang.L("Play next"), func() {
- if t.OnPlaySelection != nil {
- t.OnPlaySelectionNext(t.selectedTracks())
- }
- })
- playNext.Icon = myTheme.PlayNextIcon
- add := fyne.NewMenuItem(lang.L("Add to queue"), func() {
- if t.OnPlaySelection != nil {
- t.OnAddToQueue(t.selectedTracks())
- }
- })
- add.Icon = theme.ContentAddIcon()
- t.songRadioMenuItem = fyne.NewMenuItem(lang.L("Play song radio"), func() {
- t.onPlaySongRadio(t.selectedTracks())
- })
- t.songRadioMenuItem.Icon = myTheme.RadioIcon
- t.ctxMenu.Items = append(t.ctxMenu.Items,
- play, shuffle, playNext, add, t.songRadioMenuItem)
+ t.ctxMenu = util.NewTrackContextMenu(t.Options.DisablePlaybackMenu, t.Options.AuxiliaryMenuItems)
+ t.ctxMenu.OnPlay = func(shuffle bool) {
+ t.OnPlaySelection(t.selectedTracks(), shuffle)
}
- playlist := fyne.NewMenuItem(lang.L("Add to playlist")+"...", func() {
- if t.OnAddToPlaylist != nil {
- t.OnAddToPlaylist(t.SelectedTrackIDs())
+ t.ctxMenu.OnAddToQueue = func(next bool) {
+ if next {
+ t.OnPlaySelectionNext(t.selectedTracks())
+ } else {
+ t.OnAddToQueue(t.selectedTracks())
}
- })
- playlist.Icon = myTheme.PlaylistIcon
- download := fyne.NewMenuItem(lang.L("Download")+"...", func() {
+ }
+ t.ctxMenu.OnPlaySongRadio = func() {
+ t.onPlaySongRadio(t.selectedTracks())
+ }
+ t.ctxMenu.OnAddToPlaylist = func() {
+ t.OnAddToPlaylist(t.SelectedTrackIDs())
+ }
+ t.ctxMenu.OnDownload = func() {
t.onDownload(t.selectedTracks(), "Selected tracks")
- })
- download.Icon = theme.DownloadIcon()
- t.infoMenuItem = fyne.NewMenuItem(lang.L("Show info")+"...", func() {
- if t.OnShowTrackInfo != nil {
- t.OnShowTrackInfo(t.selectedTracks()[0])
- }
- })
- t.infoMenuItem.Icon = theme.InfoIcon()
- favorite := fyne.NewMenuItem(lang.L("Set favorite"), func() {
- t.onSetFavorites(t.selectedTracks(), true, true)
- })
- favorite.Icon = myTheme.FavoriteIcon
- unfavorite := fyne.NewMenuItem(lang.L("Unset favorite"), func() {
- t.onSetFavorites(t.selectedTracks(), false, true)
- })
- unfavorite.Icon = myTheme.NotFavoriteIcon
- t.ctxMenu.Items = append(t.ctxMenu.Items, fyne.NewMenuItemSeparator(),
- playlist, download, t.infoMenuItem)
- t.shareMenuItem = fyne.NewMenuItem(lang.L("Share")+"...", func() {
+ }
+ t.ctxMenu.OnShowInfo = func() {
+ t.OnShowTrackInfo(t.selectedTracks()[0])
+ }
+ t.ctxMenu.OnFavorite = func(fav bool) {
+ t.onSetFavorites(t.selectedTracks(), fav, true /*needRefresh*/)
+ }
+ t.ctxMenu.OnShare = func() {
t.onShare(t.selectedTracks())
- })
- t.shareMenuItem.Icon = myTheme.ShareIcon
- t.ctxMenu.Items = append(t.ctxMenu.Items, t.shareMenuItem)
- t.ctxMenu.Items = append(t.ctxMenu.Items, fyne.NewMenuItemSeparator())
- t.ctxMenu.Items = append(t.ctxMenu.Items, favorite, unfavorite)
- t.ratingSubmenu = util.NewRatingSubmenu(func(rating int) {
- t.onSetRatings(t.selectedTracks(), rating, true)
- })
- t.ctxMenu.Items = append(t.ctxMenu.Items, t.ratingSubmenu)
- if len(t.Options.AuxiliaryMenuItems) > 0 {
- t.ctxMenu.Items = append(t.ctxMenu.Items, fyne.NewMenuItemSeparator())
- t.ctxMenu.Items = append(t.ctxMenu.Items, t.Options.AuxiliaryMenuItems...)
+ }
+ t.ctxMenu.OnSetRating = func(rating int) {
+ t.onSetRatings(t.selectedTracks(), rating, true /*needRefresh*/)
}
}
- t.ratingSubmenu.Disabled = t.Options.DisableRating
- t.shareMenuItem.Disabled = t.Options.DisableSharing || len(t.selectedTracks()) != 1
- t.infoMenuItem.Disabled = len(t.selectedTracks()) != 1
- widget.ShowPopUpMenuAtPosition(t.ctxMenu, fyne.CurrentApp().Driver().CanvasForObject(t), e.AbsolutePosition)
+ t.ctxMenu.SetRatingDisabled(t.Options.DisableRating)
+ t.ctxMenu.SetShareDisabled(t.Options.DisableSharing || len(t.selectedTracks()) != 1)
+ t.ctxMenu.SetInfoDisabled(len(t.selectedTracks()) != 1)
+ t.ctxMenu.ShowAtPosition(e.AbsolutePosition, fyne.CurrentApp().Driver().CanvasForObject(t))
}
func (t *Tracklist) onSetFavorite(trackID string, fav bool) {
diff --git a/ui/widgets/tracklistloader.go b/ui/widgets/tracklistloader.go
index 461c829..cc1a235 100644
--- a/ui/widgets/tracklistloader.go
+++ b/ui/widgets/tracklistloader.go
@@ -72,7 +72,7 @@ func (t *TracklistLoader) loadMoreTracks(num int) {
if t.disposed.Load() {
return
}
- fyne.Do(func() {
+ fyne.DoAndWait(func() {
t.tracklist.SetLoading(false)
t.tracklist.AppendTracks(t.trackBuffer)
t.len += len(t.trackBuffer)
diff --git a/win_inno_installscript.iss b/win_inno_installscript.iss
index 17d590d..705294f 100644
--- a/win_inno_installscript.iss
+++ b/win_inno_installscript.iss
@@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "Supersonic"
-#define MyAppVersion "0.14.0"
+#define MyAppVersion "0.15.1"
#define MyAppPublisher "Drew Weymouth"
#define MyAppURL "https://github.com/dweymouth/supersonic"
#define MyAppExeName "Supersonic.exe"