nemunaire/hathoris
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

mpv: Refactor the use of ipc socket
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details

Browse Source
This commit is contained in:
nemunaire 2023-11-27 13:02:08 +01:00
parent e224b6a986
commit a5e3452342
1 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sources/mpv/source.go
View File

@ -5,6 +5,7 @@ import (
"log" "log"
"os" "os"
"os/exec" "os/exec"
"path"
"time" "time"
"github.com/DexterLB/mpvipc" "github.com/DexterLB/mpvipc"
@ -14,23 +15,19 @@ import (
type MPVSource struct { type MPVSource struct {
process *exec.Cmd process *exec.Cmd
ipcSocket string ipcSocketDir string
Name string Name string
Options []string Options []string
File string File string
} }
func init() { func init() {
sources.SoundSources["mpv-1"] = &MPVSource{ sources.SoundSources["mpv-nig"] = &MPVSource{
Name: "Radio 1", Name: "Radio NIG",
ipcSocket: "/tmp/tmpmpv.radio-1",
Options: []string{"--no-video", "--no-terminal"},
File: "https://mediaserv38.live-streams.nl:18030/stream", File: "https://mediaserv38.live-streams.nl:18030/stream",
} }
sources.SoundSources["mpv-2"] = &MPVSource{ sources.SoundSources["mpv-synthfm"] = &MPVSource{
Name: "Radio 2", Name: "Radio Synthetic FM",
ipcSocket: "/tmp/tmpmpv.radio-2",
Options: []string{"--no-video", "--no-terminal"},
File: "https://mediaserv38.live-streams.nl:18040/live", File: "https://mediaserv38.live-streams.nl:18040/live",
} }
} }
@ -47,15 +44,20 @@ func (s *MPVSource) IsEnabled() bool {
return s.process != nil return s.process != nil
} }
func (s *MPVSource) ipcSocket() string {
return path.Join(s.ipcSocketDir, "mpv.socket")
}
func (s *MPVSource) Enable() (err error) { func (s *MPVSource) Enable() (err error) {
if s.process != nil { if s.process != nil {
return fmt.Errorf("Already running") return fmt.Errorf("Already running")
} }
var opts []string s.ipcSocketDir, err = os.MkdirTemp("", "hathoris")
opts = append(opts, s.Options...)
if s.ipcSocket != "" { opts := append([]string{"--no-video", "--no-terminal"}, s.Options...)
opts = append(opts, "--input-ipc-server="+s.ipcSocket, "--pause") if s.ipcSocketDir != "" {
opts = append(opts, "--input-ipc-server="+s.ipcSocket(), "--pause")
} }
opts = append(opts, s.File) opts = append(opts, s.File)
@ -70,18 +72,22 @@ func (s *MPVSource) Enable() (err error) {
s.process.Process.Kill() s.process.Process.Kill()
} }
if s.ipcSocketDir != "" {
os.RemoveAll(s.ipcSocketDir)
}
s.process = nil s.process = nil
}() }()
if s.ipcSocket != "" { if s.ipcSocketDir != "" {
_, err = os.Stat(s.ipcSocket) _, err = os.Stat(s.ipcSocket())
for i := 20; i >= 0 && err != nil; i-- { for i := 20; i >= 0 && err != nil; i-- {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
_, err = os.Stat(s.ipcSocket) _, err = os.Stat(s.ipcSocket())
} }
time.Sleep(200 * time.Millisecond) time.Sleep(200 * time.Millisecond)
conn := mpvipc.NewConnection(s.ipcSocket) conn := mpvipc.NewConnection(s.ipcSocket())
err = conn.Open() err = conn.Open()
for i := 20; i >= 0 && err != nil; i-- { for i := 20; i >= 0 && err != nil; i-- {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
@ -145,12 +151,14 @@ func (s *MPVSource) FadeOut(conn *mpvipc.Connection, speed int) {
func (s *MPVSource) Disable() error { func (s *MPVSource) Disable() error {
if s.process != nil { if s.process != nil {
if s.process.Process != nil { if s.process.Process != nil {
conn := mpvipc.NewConnection(s.ipcSocket) if s.ipcSocketDir != "" {
conn := mpvipc.NewConnection(s.ipcSocket())
err := conn.Open() err := conn.Open()
if err == nil { if err == nil {
s.FadeOut(conn, 3) s.FadeOut(conn, 3)
conn.Close() conn.Close()
} }
}
s.process.Process.Kill() s.process.Process.Kill()
} }
@ -160,8 +168,8 @@ func (s *MPVSource) Disable() error {
} }
func (s *MPVSource) CurrentlyPlaying() string { func (s *MPVSource) CurrentlyPlaying() string {
if s.ipcSocket != "" { if s.ipcSocketDir != "" {
conn := mpvipc.NewConnection(s.ipcSocket) conn := mpvipc.NewConnection(s.ipcSocket())
err := conn.Open() err := conn.Open()
if err != nil { if err != nil {
log.Println("Unable to open mpv socket:", err.Error()) log.Println("Unable to open mpv socket:", err.Error())
@ -181,11 +189,11 @@ func (s *MPVSource) CurrentlyPlaying() string {
} }
func (s *MPVSource) TogglePause(id string) error { func (s *MPVSource) TogglePause(id string) error {
if s.ipcSocket == "" { if s.ipcSocketDir == "" {
return fmt.Errorf("Not supported") return fmt.Errorf("Not supported")
} }
conn := mpvipc.NewConnection(s.ipcSocket) conn := mpvipc.NewConnection(s.ipcSocket())
err := conn.Open() err := conn.Open()
if err != nil { if err != nil {
return err return err