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

reactivate works through ipc now, at least on Mac

Browse Source
This commit is contained in:
Drew Weymouth
2024-06-12 09:07:15 -07:00
parent e0974fdb03
commit 8e815c644a
6 changed files with 67 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app.go
+28 -73
View File
@@ -17,7 +17,6 @@ import (
"github.com/dweymouth/supersonic/backend/player"
"github.com/dweymouth/supersonic/backend/player/mpv"
"github.com/dweymouth/supersonic/backend/util"
"github.com/fsnotify/fsnotify"
"github.com/google/uuid"
"github.com/20after4/configdir"
@@ -25,13 +24,10 @@ import (
)
const (
configFile = "config.toml"
portableDir = "supersonic_portable"
sessionDir = "session"
sessionLockFile = ".lock"
sessionActivateFile = ".activate"
savedQueueFile = "saved_queue.json"
themesDir = "themes"
configFile = "config.toml"
portableDir = "supersonic_portable"
savedQueueFile = "saved_queue.json"
themesDir = "themes"
)
var (
@@ -47,6 +43,7 @@ type App struct {
LocalPlayer *mpv.Player
UpdateChecker UpdateChecker
MPRISHandler *MPRISHandler
ipcServer ipc.IPCServer
// UI callbacks to be set in main
OnReactivate func()
@@ -91,24 +88,6 @@ func StartupApp(appName, displayAppName, appVersionTag, latestReleaseURL string)
return nil, ErrAnotherInstance
}
/*
sessionPath := path.Join(confDir, sessionDir)
if _, err := os.Stat(path.Join(sessionPath, sessionLockFile)); err == nil {
log.Println("Another instance is running. Reactivating it...")
reactivateFile := path.Join(sessionPath, sessionActivateFile)
if f, err := os.Create(reactivateFile); err == nil {
f.Close()
}
time.Sleep(750 * time.Millisecond)
if _, err := os.Stat(reactivateFile); err == nil {
log.Println("No other instance responded. Starting as normal...")
os.RemoveAll(sessionPath)
} else {
return nil, ErrAnotherInstance
}
}
*/
log.Printf("Starting %s...", appName)
log.Printf("Using config dir: %s", confDir)
log.Printf("Using cache dir: %s", cacheDir)
@@ -124,19 +103,6 @@ func StartupApp(appName, displayAppName, appVersionTag, latestReleaseURL string)
a.readConfig()
a.startConfigWriter(a.bgrndCtx)
/*
if !a.Config.Application.AllowMultiInstance {
log.Println("Creating session lock file")
os.MkdirAll(sessionPath, 0770)
if f, err := os.Create(path.Join(sessionPath, sessionLockFile)); err == nil {
f.Close()
} else {
log.Printf("error creating session file: %s", err.Error())
}
a.startSessionWatcher(sessionPath)
}
*/
a.UpdateChecker = NewUpdateChecker(appVersionTag, latestReleaseURL, &a.Config.Application.LastCheckedVersion)
a.UpdateChecker.Start(a.bgrndCtx, 24*time.Hour)
@@ -155,9 +121,14 @@ func StartupApp(appName, displayAppName, appVersionTag, latestReleaseURL string)
a.ServerManager.SetPrefetchAlbumCoverCallback(func(coverID string) {
_, _ = a.ImageManager.GetCoverThumbnail(coverID)
})
listener, _ := ipc.Listen()
server := ipc.NewServer(a.PlaybackManager, nil)
go server.Serve(listener)
// Start IPC server
listener, err := ipc.Listen()
if err == nil {
a.ipcServer = ipc.NewServer(a.PlaybackManager, a.callOnReactivate,
func() { _ = a.callOnExit() })
go a.ipcServer.Serve(listener)
}
// OS media center integrations
a.setupMPRIS(displayAppName)
@@ -211,26 +182,6 @@ func (a *App) readConfig() {
a.Config = cfg
}
func (a *App) startSessionWatcher(sessionPath string) {
if sessionWatch, err := fsnotify.NewWatcher(); err == nil {
sessionWatch.Add(sessionPath)
go func() {
for {
select {
case <-a.bgrndCtx.Done():
return
case <-sessionWatch.Events:
activatePath := path.Join(sessionPath, sessionActivateFile)
if _, err := os.Stat(activatePath); err == nil {
os.Remove(path.Join(sessionPath, sessionActivateFile))
a.callOnReactivate()
}
}
}
}()
}
}
// periodically save config file so abnormal exit won't lose settings
func (a *App) startConfigWriter(ctx context.Context) {
tick := time.NewTicker(2 * time.Minute)
@@ -254,6 +205,17 @@ func (a *App) callOnReactivate() {
}
}
func (a *App) callOnExit() error {
if a.OnExit == nil {
return errors.New("no quit handler registered")
}
go func() {
time.Sleep(10 * time.Millisecond)
a.OnExit()
}()
return nil
}
func (a *App) initMPV() error {
p := mpv.NewWithClientName(a.appName)
c := a.Config.LocalPlayback
@@ -329,16 +291,7 @@ func (a *App) setupMPRIS(mprisAppName string) {
return a.ImageManager.GetCoverArtUrl(id)
}
a.MPRISHandler.OnRaise = func() error { a.callOnReactivate(); return nil }
a.MPRISHandler.OnQuit = func() error {
if a.OnExit == nil {
return errors.New("no quit handler registered")
}
go func() {
time.Sleep(10 * time.Millisecond)
a.OnExit()
}()
return nil
}
a.MPRISHandler.OnQuit = a.callOnExit
a.MPRISHandler.Start()
}
@@ -361,6 +314,9 @@ func (a *App) DeleteServerCacheDir(serverID uuid.UUID) error {
}
func (a *App) Shutdown() {
if a.ipcServer != nil {
a.ipcServer.Shutdown(a.bgrndCtx)
}
a.MPRISHandler.Shutdown()
a.PlaybackManager.DisableCallbacks()
if a.Config.Application.SavePlayQueue {
@@ -377,7 +333,6 @@ func (a *App) Shutdown() {
a.cancel()
a.LocalPlayer.Destroy()
a.Config.WriteConfigFile(a.configFilePath())
os.RemoveAll(path.Join(a.configDir, sessionDir))
}
func (a *App) LoadSavedPlayQueue() error {
backend/ipc/client.go
+1 -6
View File
@@ -17,15 +17,10 @@ type Client struct {
// Connect attempts to connect to the IPC socket as client.
func Connect() (*Client, error) {
conn, err := Dial()
if err != nil {
log.Println("dial error")
return nil, err
}
client := &Client{httpC: http.Client{
Transport: &http.Transport{
DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
return conn, nil
return Dial()
},
},
}}
backend/ipc/conn_other.go
+8 -1
View File
@@ -2,7 +2,10 @@
package ipc
import "net"
import (
"net"
"os"
)
func Dial() (net.Conn, error) {
// TODO - use XDG runtime dir, also handle portable mode
@@ -12,3 +15,7 @@ func Dial() (net.Conn, error) {
func Listen() (net.Listener, error) {
return net.Listen("unix", "/tmp/supersonic.sock")
}
func DestroyConn() error {
return os.Remove("/tmp/supersonic.sock")
}
backend/ipc/conn_windows.go
+5
View File
@@ -17,3 +17,8 @@ func Dial() (net.Conn, error) {
func Listen() (net.Listener, error) {
return winio.ListenPipe("supersonic", nil)
}
func DestroyConn() error {
// Windows named pipes automatically clean up
return nil
}
backend/ipc/server.go
+24 -9
View File
@@ -1,7 +1,9 @@
package ipc
import (
"context"
"encoding/json"
"net"
"net/http"
)
@@ -17,21 +19,34 @@ type PlaybackHandler interface {
SetVolume(int) error
}
type WindowHandler interface {
Show()
Quit()
type IPCServer interface {
Serve(net.Listener) error
Shutdown(context.Context) error
}
type serverImpl struct {
server *http.Server
pbHandler PlaybackHandler
wdHandler WindowHandler
showFn func()
quitFn func()
}
func NewServer(pbHandler PlaybackHandler, wdHandler WindowHandler) *http.Server {
s := serverImpl{pbHandler: pbHandler, wdHandler: wdHandler}
return &http.Server{
func NewServer(pbHandler PlaybackHandler, showFn, quitFn func()) IPCServer {
s := &serverImpl{pbHandler: pbHandler, showFn: showFn, quitFn: quitFn}
s.server = &http.Server{
Handler: s.createHandler(),
}
return s
}
func (s *serverImpl) Serve(listener net.Listener) error {
return s.server.Serve(listener)
}
func (s *serverImpl) Shutdown(ctx context.Context) error {
err := s.server.Shutdown(ctx)
DestroyConn()
return err
}
func (s *serverImpl) createHandler() http.Handler {
@@ -42,11 +57,11 @@ func (s *serverImpl) createHandler() http.Handler {
})
m.HandleFunc(PingPath, s.makeSimpleEndpointHandler(func() error { return nil }))
m.HandleFunc(ShowPath, s.makeSimpleEndpointHandler(func() error {
s.wdHandler.Show()
s.showFn()
return nil
}))
m.HandleFunc(QuitPath, s.makeSimpleEndpointHandler(func() error {
go s.wdHandler.Quit()
s.quitFn()
return nil
}))
m.HandleFunc(PlayPath, s.makeSimpleEndpointHandler(s.pbHandler.Continue))