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

Merge pull request #169 from dweymouth/feature/multiple-servers

Browse Source 
Add multi-server support
This commit is contained in:
Drew Weymouth
2023-05-17 17:55:07 -07:00
committed by GitHub
parent 9c1a137cf5 c517c40c22
commit d7506ca630
11 changed files with 245 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/controller/controller.go
+57 -5
View File
@@ -1,6 +1,7 @@
package controller
import (
"fmt"
"image"
"log"
"time"
@@ -140,7 +141,7 @@ func (m *Controller) ConnectAlbumGridActions(grid *widgets.GridView) {
}
func (m *Controller) PromptForFirstServer() {
d := dialogs.NewAddEditServerDialog("Connect to Server", nil, m.MainWindow.Canvas().Focus)
d := dialogs.NewAddEditServerDialog("Connect to Server", false, nil, m.MainWindow.Canvas().Focus)
pop := widget.NewModalPopUp(d, m.MainWindow.Canvas())
d.OnSubmit = func() {
d.DisableSubmit()
@@ -155,7 +156,7 @@ func (m *Controller) PromptForFirstServer() {
Username: d.Username,
LegacyAuth: d.LegacyAuth,
}
server := m.App.Config.AddServer(d.Nickname, conn)
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())
}
@@ -250,7 +251,7 @@ func (m *Controller) DoEditPlaylistWorkflow(playlist *mediaprovider.Playlist) {
}
func (c *Controller) DoConnectToServerWorkflow(server *backend.ServerConfig) {
pass, err := c.App.ServerManager.GetServerPassword(server)
pass, err := c.App.ServerManager.GetServerPassword(server.ID)
if err != nil {
log.Printf("error getting password from keyring: %v", err)
c.PromptForLoginAndConnect()
@@ -269,7 +270,7 @@ func (c *Controller) DoConnectToServerWorkflow(server *backend.ServerConfig) {
func (m *Controller) PromptForLoginAndConnect() {
// TODO: this will need to be rewritten a bit when we support multi servers
// need to make sure the intended server is first in the list passed to NewLoginDialog
d := dialogs.NewLoginDialog(m.App.Config.Servers)
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()
@@ -290,7 +291,7 @@ func (m *Controller) PromptForLoginAndConnect() {
}
d.OnEditServer = func(server *backend.ServerConfig) {
pop.Hide()
editD := dialogs.NewAddEditServerDialog("Edit server", server, m.MainWindow.Canvas().Focus)
editD := dialogs.NewAddEditServerDialog("Edit server", true, server, m.MainWindow.Canvas().Focus)
editPop := widget.NewModalPopUp(editD, m.MainWindow.Canvas())
editD.OnSubmit = func() {
d.DisableSubmit()
@@ -309,8 +310,59 @@ func (m *Controller) PromptForLoginAndConnect() {
d.EnableSubmit()
}()
}
editD.OnCancel = func() {
editPop.Hide()
pop.Show()
}
editPop.Show()
}
d.OnNewServer = func() {
pop.Hide()
newD := dialogs.NewAddEditServerDialog("Add server", true, nil, m.MainWindow.Canvas().Focus)
newPop := widget.NewModalPopUp(newD, m.MainWindow.Canvas())
newD.OnSubmit = func() {
d.DisableSubmit()
go func() {
if m.testConnectionAndUpdateDialogText(newD) {
// connection is good
newPop.Hide()
conn := backend.ServerConnection{
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("Confirm delete server",
fmt.Sprintf("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()
}
ui/dialogs/addeditserverdialog.go
+24 -5
View File
@@ -21,6 +21,7 @@ type AddEditServerDialog struct {
Password string
LegacyAuth bool
OnSubmit func()
OnCancel func()
passField *widget.Entry
submitBtn *widget.Button
@@ -30,7 +31,7 @@ type AddEditServerDialog struct {
var _ fyne.Widget = (*AddEditServerDialog)(nil)
func NewAddEditServerDialog(title string, prefillServer *backend.ServerConfig, focusHandler func(fyne.Focusable)) *AddEditServerDialog {
func NewAddEditServerDialog(title string, cancelable bool, prefillServer *backend.ServerConfig, focusHandler func(fyne.Focusable)) *AddEditServerDialog {
a := &AddEditServerDialog{}
a.ExtendBaseWidget(a)
if prefillServer != nil {
@@ -57,11 +58,26 @@ func NewAddEditServerDialog(title string, prefillServer *backend.ServerConfig, f
nickField.SetPlaceHolder("My Server")
nickField.OnSubmitted = func(_ string) { focusHandler(hostField) }
a.submitBtn = widget.NewButton("Enter", a.doSubmit)
a.submitBtn.Importance = widget.HighImportance
a.promptText = widget.NewRichTextWithText("")
a.promptText.Hidden = true
legacyAuthCheck := widget.NewCheckWithData("Use legacy authentication", binding.BindBool(&a.LegacyAuth))
var bottomRow *fyne.Container
if cancelable {
bottomRow = container.NewHBox(
a.promptText,
layout.NewSpacer(),
widget.NewButton("Cancel", a.onCancel),
a.submitBtn)
} else {
bottomRow = container.NewHBox(
a.promptText,
layout.NewSpacer(),
a.submitBtn)
}
a.container = container.NewVBox(
container.NewHBox(layout.NewSpacer(), titleLabel, layout.NewSpacer()),
container.New(layout.NewFormLayout(),
@@ -78,10 +94,7 @@ func NewAddEditServerDialog(title string, prefillServer *backend.ServerConfig, f
),
container.NewHBox(layout.NewSpacer(), legacyAuthCheck),
widget.NewSeparator(),
container.NewHBox(
a.promptText,
layout.NewSpacer(),
a.submitBtn),
bottomRow,
)
return a
}
@@ -111,6 +124,12 @@ func (a *AddEditServerDialog) doSubmit() {
}
}
func (a *AddEditServerDialog) onCancel() {
if a.OnCancel != nil {
a.OnCancel()
}
}
func (a *AddEditServerDialog) doSetPromptText(text string, color fyne.ThemeColorName) {
ts := a.promptText.Segments[0].(*widget.TextSegment)
ts.Text = text
ui/dialogs/addtoplaylistdialog.go
+1
View File
@@ -48,6 +48,7 @@ func NewAddToPlaylistDialog(title string, existingPlaylistNames []string) *AddTo
a.newPlaylistLabel.Hidden = true
a.okBtn = widget.NewButton("OK", a.onOK)
a.okBtn.Importance = widget.HighImportance
a.okBtn.Disable()
cancelBtn := widget.NewButton("Cancel", a.onCancel)
ui/dialogs/editplaylistdialog.go
+1
View File
@@ -44,6 +44,7 @@ func NewEditPlaylistDialog(playlist *mediaprovider.Playlist) *EditPlaylistDialog
e.OnUpdateMetadata()
}
})
submitBtn.Importance = widget.HighImportance
cancelBtn := widget.NewButton("Cancel", func() {
if e.OnCanceled != nil {
e.OnCanceled()
ui/dialogs/logindialog.go
+50 -14
View File
@@ -2,6 +2,8 @@ package dialogs
import (
"github.com/dweymouth/supersonic/backend"
"github.com/dweymouth/supersonic/sharedutil"
"github.com/google/uuid"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/container"
@@ -10,13 +12,18 @@ import (
"fyne.io/fyne/v2/widget"
)
type PasswordFetchFunc func(serverID uuid.UUID) (string, error)
type LoginDialog struct {
widget.BaseWidget
OnSubmit func(server *backend.ServerConfig, password string)
OnEditServer func(server *backend.ServerConfig)
OnSubmit func(server *backend.ServerConfig, password string)
OnEditServer func(server *backend.ServerConfig)
OnDeleteServer func(server *backend.ServerConfig)
OnNewServer func()
servers []*backend.ServerConfig
servers []*backend.ServerConfig
serverSelect *widget.Select
passField *widget.Entry
promptText *widget.RichText
@@ -27,22 +34,31 @@ type LoginDialog struct {
var _ fyne.Widget = (*LoginDialog)(nil)
func NewLoginDialog(servers []*backend.ServerConfig) *LoginDialog {
func NewLoginDialog(servers []*backend.ServerConfig, pwFetch PasswordFetchFunc) *LoginDialog {
l := &LoginDialog{servers: servers}
l.ExtendBaseWidget(l)
titleLabel := widget.NewLabel("Login to Server")
titleLabel.TextStyle.Bold = true
serverNames := make([]string, len(servers))
for i, s := range servers {
serverNames[i] = s.Nickname
}
l.serverSelect = widget.NewSelect(serverNames, func(_ string) {})
l.serverSelect.SetSelectedIndex(0)
editBtn := widget.NewButtonWithIcon("", theme.DocumentCreateIcon(), l.onEditServer)
l.passField = widget.NewPasswordEntry()
l.passField.OnSubmitted = func(_ string) { l.onSubmit() }
l.submitBtn = widget.NewButton("OK", l.onSubmit)
serverNames := sharedutil.MapSlice(servers, func(s *backend.ServerConfig) string { return s.Nickname })
l.serverSelect = widget.NewSelect(serverNames, func(_ string) {
if pwFetch != nil {
if pw, err := pwFetch(servers[l.serverSelect.SelectedIndex()].ID); err == nil {
l.passField.SetText(pw)
return
}
}
l.passField.SetText("")
})
l.serverSelect.SetSelectedIndex(0)
editBtn := widget.NewButtonWithIcon("", theme.DocumentCreateIcon(), l.onEditServer)
newBtn := widget.NewButtonWithIcon("", theme.ContentAddIcon(), l.onNewServer)
deleteBtn := widget.NewButtonWithIcon("", theme.DeleteIcon(), func() { l.onDeleteServer(l.serverSelect.SelectedIndex()) })
l.submitBtn = widget.NewButton("OK", l.onSubmit)
l.submitBtn.Importance = widget.HighImportance
l.promptText = widget.NewRichTextWithText("")
l.promptText.Segments[0].(*widget.TextSegment).Style.ColorName = theme.ColorNameError
l.promptText.Hidden = true
@@ -51,7 +67,7 @@ func NewLoginDialog(servers []*backend.ServerConfig) *LoginDialog {
container.NewHBox(layout.NewSpacer(), titleLabel, layout.NewSpacer()),
container.New(layout.NewFormLayout(),
widget.NewLabel("Server"),
container.NewBorder(nil, nil, nil, editBtn, l.serverSelect),
container.NewBorder(nil, nil, nil, container.NewHBox(editBtn, newBtn, deleteBtn), l.serverSelect),
widget.NewLabel("Password"),
l.passField),
widget.NewSeparator(),
@@ -68,6 +84,14 @@ func (l *LoginDialog) SetErrorText(text string) {
l.doSetPromptText(text, theme.ColorNameError)
}
func (l *LoginDialog) SetServers(servers []*backend.ServerConfig) {
l.servers = servers
l.serverSelect.Options = sharedutil.MapSlice(servers, func(s *backend.ServerConfig) string { return s.Nickname })
if len(servers) > 0 {
l.serverSelect.SetSelectedIndex(0)
}
}
func (l *LoginDialog) EnableSubmit() {
l.submitBtn.Enable()
l.submitBtn.Refresh()
@@ -96,7 +120,7 @@ func (l *LoginDialog) CreateRenderer() fyne.WidgetRenderer {
func (l *LoginDialog) MinSize() fyne.Size {
l.ExtendBaseWidget(l)
return fyne.NewSize(300, l.container.MinSize().Height)
return fyne.NewSize(375, l.container.MinSize().Height)
}
func (l *LoginDialog) onSubmit() {
@@ -110,3 +134,15 @@ func (l *LoginDialog) onEditServer() {
l.OnEditServer(l.servers[l.serverSelect.SelectedIndex()])
}
}
func (l *LoginDialog) onNewServer() {
if l.OnNewServer != nil {
l.OnNewServer()
}
}
func (l *LoginDialog) onDeleteServer(idx int) {
if l.OnDeleteServer != nil {
l.OnDeleteServer(l.servers[idx])
}
}
ui/mainwindow.go
+2 -1
View File
@@ -113,7 +113,8 @@ func NewMainWindow(fyneApp fyne.App, appName, appVersion string, app *backend.Ap
m.BrowsingPane.ClearHistory()
m.Controller.PromptForLoginAndConnect()
})
m.BrowsingPane.AddSettingsMenuItem("Log Out", app.ServerManager.Logout)
m.BrowsingPane.AddSettingsMenuItem("Log Out", func() { app.ServerManager.Logout(true) })
m.BrowsingPane.AddSettingsMenuItem("Switch Servers", func() { app.ServerManager.Logout(false) })
m.BrowsingPane.AddSettingsMenuItem("Check for Updates", func() {
go func() {
if t := app.UpdateChecker.CheckLatestVersionTag(); t != "" && t != app.VersionTag() {