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

multi servers part 3: switch servers menu action + some refactoring

Browse Source
This commit is contained in:
Drew Weymouth
2023-05-17 17:46:26 -07:00
parent 4d4b14e4de
commit 2bc7680361
5 changed files with 94 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/servermanager.go
+83 -30
View File
@@ -73,6 +73,89 @@ func (s *ServerManager) TestConnectionAndAuth(
}
}
func (s *ServerManager) GetDefaultServer() *ServerConfig {
for _, s := range s.config.Servers {
if s.Default {
return s
}
}
if len(s.config.Servers) > 0 {
return s.config.Servers[0]
}
return nil
}
func (s *ServerManager) SetDefaultServer(serverID uuid.UUID) {
var found bool
for _, s := range s.config.Servers {
f := s.ID == serverID
if f {
found = true
}
s.Default = f
}
if !found && len(s.config.Servers) > 0 {
s.config.Servers[0].Default = true
}
}
func (s *ServerManager) AddServer(nickname string, connection ServerConnection) *ServerConfig {
sc := &ServerConfig{
ID: uuid.New(),
Nickname: nickname,
ServerConnection: connection,
}
s.config.Servers = append(s.config.Servers, sc)
return sc
}
func (s *ServerManager) DeleteServer(serverID uuid.UUID) {
s.deleteServerPassword(serverID)
newServers := make([]*ServerConfig, 0, len(s.config.Servers)-1)
for _, s := range s.config.Servers {
if s.ID != serverID {
newServers = append(newServers, s)
}
}
s.config.Servers = newServers
}
func (s *ServerManager) Logout(deletePassword bool) {
if s.Server != nil {
if deletePassword {
s.deleteServerPassword(s.ServerID)
}
for _, cb := range s.onLogout {
cb()
}
s.Server = nil
s.LoggedInUser = ""
s.ServerID = uuid.UUID{}
}
}
func (s *ServerManager) deleteServerPassword(serverID uuid.UUID) {
keyring.Delete(s.appName, s.ServerID.String())
}
// Sets a callback that is invoked when a server is connected to.
func (s *ServerManager) OnServerConnected(cb func()) {
s.onServerConnected = append(s.onServerConnected, cb)
}
// Sets a callback that is invoked when the user logs out of a server.
func (s *ServerManager) OnLogout(cb func()) {
s.onLogout = append(s.onLogout, cb)
}
func (s *ServerManager) GetServerPassword(serverID uuid.UUID) (string, error) {
return keyring.Get(s.appName, serverID.String())
}
func (s *ServerManager) SetServerPassword(server *ServerConfig, password string) error {
return keyring.Set(s.appName, server.ID.String(), password)
}
func (s *ServerManager) testConnectionAndCreateClient(connection ServerConnection, password string) (*subsonic.Client, error) {
cli, err := s.connect(connection, password)
if err != nil {
@@ -123,33 +206,3 @@ func (s *ServerManager) connect(connection ServerConnection, password string) (*
return cli, nil
}
}
func (s *ServerManager) Logout() {
if s.Server != nil {
keyring.Delete(s.appName, s.ServerID.String())
for _, cb := range s.onLogout {
cb()
}
s.Server = nil
s.LoggedInUser = ""
s.ServerID = uuid.UUID{}
}
}
// Sets a callback that is invoked when a server is connected to.
func (s *ServerManager) OnServerConnected(cb func()) {
s.onServerConnected = append(s.onServerConnected, cb)
}
// Sets a callback that is invoked when the user logs out of a server.
func (s *ServerManager) OnLogout(cb func()) {
s.onLogout = append(s.onLogout, cb)
}
func (s *ServerManager) GetServerPassword(serverID uuid.UUID) (string, error) {
return keyring.Get(s.appName, serverID.String())
}
func (s *ServerManager) SetServerPassword(server *ServerConfig, password string) error {
return keyring.Set(s.appName, server.ID.String(), password)
}
main.go
+1 -1
View File
@@ -48,7 +48,7 @@ func main() {
if runtime.GOOS == "linux" {
time.Sleep(250 * time.Millisecond)
}
defaultServer := myApp.Config.GetDefaultServer()
defaultServer := myApp.ServerManager.GetDefaultServer()
if defaultServer == nil {
mainWindow.Controller.PromptForFirstServer()
} else {
ui/controller/controller.go
+3 -3
View File
@@ -156,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())
}
@@ -332,7 +332,7 @@ func (m *Controller) PromptForLoginAndConnect() {
Username: newD.Username,
LegacyAuth: newD.LegacyAuth,
}
server := m.App.Config.AddServer(newD.Nickname, conn)
server := m.App.ServerManager.AddServer(newD.Nickname, conn)
m.trySetPasswordAndConnectToServer(server, newD.Password)
m.doModalClosed()
}
@@ -351,7 +351,7 @@ func (m *Controller) PromptForLoginAndConnect() {
fmt.Sprintf("Are you sure you want to delete the server %q?", server.Nickname),
func(ok bool) {
if ok {
m.App.Config.DeleteServer(server.ID)
m.App.ServerManager.DeleteServer(server.ID)
m.App.DeleteServerCacheDir(server.ID)
d.SetServers(m.App.Config.Servers)
}
ui/dialogs/logindialog.go
+5 -6
View File
@@ -39,27 +39,26 @@ func NewLoginDialog(servers []*backend.ServerConfig, pwFetch PasswordFetchFunc)
l.ExtendBaseWidget(l)
titleLabel := widget.NewLabel("Login to Server")
titleLabel.TextStyle.Bold = true
l.passField = widget.NewPasswordEntry()
l.passField.OnSubmitted = func(_ string) { l.onSubmit() }
serverNames := sharedutil.MapSlice(servers, func(s *backend.ServerConfig) string { return s.Nickname })
l.serverSelect = widget.NewSelect(serverNames, func(_ string) {
if l.passField == nil {
return
}
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.passField = widget.NewPasswordEntry()
l.passField.OnSubmitted = func(_ string) { l.onSubmit() }
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
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() {