Checkpoint

This commit is contained in:
maze authored and maze committed 2026-10-29 17:29:41 +01:00
1 parent 0295eb1ad2
commit b8a493b93d
138 files changed
+1898 -57607

No files matched your search

+4 -4
View File
@@ -2,8 +2,8 @@
package all
import (
_ "git.maze.io/go/bragi/player/moode"
_ "git.maze.io/go/bragi/player/mpd"
_ "git.maze.io/go/bragi/player/runeaudio"
_ "git.maze.io/go/bragi/player/volumio"
_ "go.maze.io/harmon/player/moode"
_ "go.maze.io/harmon/player/mpd"
_ "go.maze.io/harmon/player/runeaudio"
_ "go.maze.io/harmon/player/volumio"
)
+8 -8
View File
@@ -8,10 +8,10 @@ import (
"strings"
"time"
"git.maze.io/go/bragi/config"
"git.maze.io/go/bragi/player"
"git.maze.io/go/bragi/player/mpd"
"git.maze.io/go/bragi/util"
"go.maze.io/harmon/config"
"go.maze.io/harmon/internal/util"
"go.maze.io/harmon/player"
"go.maze.io/harmon/player/mpd"
)
const (
@@ -27,7 +27,7 @@ type Player struct {
isLocal bool
}
func New(config *config.Player) (player.Player, error) {
func New(config config.Player) (player.Player, error) {
addr := util.MakeAddr(config.Host, DefaultAddr)
return &Player{
@@ -35,9 +35,9 @@ func New(config *config.Player) (player.Player, error) {
}, nil
}
func (p *Player) Name() string {
return "moOde"
}
func (p *Player) Halt() error { return p.mpd.Halt() }
func (Player) Type() string { return "moode" }
func (p *Player) Name() string { return "moOde" }
func (p *Player) Events() (<-chan player.Event, error) {
return nil, nil
+2 -1
View File
@@ -3,8 +3,9 @@ package moode
import (
"testing"
"git.maze.io/go/bragi/player"
"periph.io/x/conn/v3/physic"
"go.maze.io/harmon/player"
)
func TestParseAudioFormat(t *testing.T) {
+10 -8
View File
@@ -8,15 +8,16 @@ import (
"strings"
"time"
"git.maze.io/go/bragi/config"
"git.maze.io/go/bragi/player"
"git.maze.io/go/bragi/util"
"github.com/sirupsen/logrus"
"go.maze.io/harmon/config"
"go.maze.io/harmon/internal/util"
"go.maze.io/harmon/player"
)
func init() {
player.Register("mpd", func(config *config.Player) (player.Player, error) {
return New(config.Host, config.Password, config.Name)
player.Register("mpd", func(config config.Player) (player.Player, error) {
return New(config.Host, config.Password)
}, Detect, 10)
}
@@ -87,13 +88,12 @@ func ParseVersion(s string) (Version, error) {
return v, nil
}
func New(addr, password, name string) (*Player, error) {
func New(addr, password string) (*Player, error) {
addr = util.MakeAddr(addr, DefaultAddr)
if _, err := net.ResolveTCPAddr("tcp", addr); err != nil {
return nil, err
}
p := &Player{
name: name,
addr: addr,
commands: make(chan *Command, 16),
errors: make(chan error, 1),
@@ -160,7 +160,9 @@ func newConn(addr, password, kind, name string) (*clientConn, *Version, error) {
return &clientConn{conn, kind}, &version, nil
}
func (p *Player) Close() error {
func (Player) Type() string { return "mpd" }
func (p *Player) Halt() error {
for i := 0; i < 2; i++ {
select {
case p.quit <- struct{}{}:
+5 -2
View File
@@ -7,12 +7,15 @@ import (
"strings"
"time"
"git.maze.io/go/bragi/util"
"periph.io/x/conn/v3/physic"
"go.maze.io/harmon/hardware"
)
// Player controls music playback.
type Player interface {
hardware.Driver
// Name returns the name of the source.
Name() string
@@ -50,7 +53,7 @@ func ParseMPDAudioFormat(s string) (f AudioFormat, err error) {
var i int
if i = strings.IndexByte(s, ':'); i == -1 {
return f, fmt.Errorf("player: malformed MPD audio format %q", s)
} else if f.SampleRate, err = util.ParseFrequency(s[:i]); err != nil {
} else if err = f.SampleRate.Set(s[:i]); err != nil {
return
}
s = s[i+1:]
+2 -1
View File
@@ -3,8 +3,9 @@ package player_test
import (
"testing"
"git.maze.io/go/bragi/player"
"periph.io/x/conn/v3/physic"
"go.maze.io/harmon/player"
)
func TestParseMPDAudioFormat(t *testing.T) {
-99
View File
@@ -1,99 +0,0 @@
package player
import (
"fmt"
"sort"
"sync"
"git.maze.io/go/bragi/config"
)
// NotFound signals the player can not be found.
type NotFound struct {
Name string
}
func (err NotFound) Error() string {
return fmt.Sprintf("player: %q can not be found", err.Name)
}
// Factory is a function that can instantiate a new Player.
type Factory func(*config.Player) (Player, error)
// Detector checks if this player is available.
type Detector func() bool
type detector struct {
Name string
New Factory
Detect Detector
Priority int
}
var (
// protocols holds the per protocol factories
protocols = new(sync.Map)
detectors []detector
// instances holds the named players
instances = new(sync.Map)
)
// Register a new protocol factory.
func Register(name string, f Factory, d Detector, priority int) {
if _, loaded := protocols.LoadOrStore(name, f); loaded {
panic(fmt.Sprintf("player type %q already registered", name))
}
if d != nil {
detectors = append(detectors, detector{
Name: name,
New: f,
Detect: d,
Priority: priority,
})
sort.Slice(detectors, func(i, j int) bool {
return detectors[i].Priority < detectors[j].Priority
})
}
}
// New returns a player factory for the requested type.
func New(config *config.Player) (Player, error) {
f, ok := protocols.Load(config.Protocol)
if !ok {
return nil, NotFound{Name: config.Protocol}
}
p, err := f.(Factory)(config)
if err != nil {
return nil, err
}
instances.Store(config.Name, p)
return p, nil
}
// RegisterInstance registers a new player instance by name.
func RegisterInstance(name string, p Player) {
if _, loaded := instances.LoadOrStore(name, p); loaded {
panic(fmt.Sprintf("player instance %q already registered", name))
}
}
// Lookup a previously registered instance.
func Lookup(name string) (Player, error) {
f, ok := instances.Load(name)
if ok {
return f.(Player), nil
}
return nil, NotFound{Name: name}
}
// Detect what player is available.
func Detect() (name string, factory Factory) {
for _, d := range detectors {
if d.Detect() {
return d.Name, d.New
}
}
return "", nil
}
+126
View File
@@ -0,0 +1,126 @@
package player
import (
"errors"
"fmt"
"sort"
"sync"
"github.com/sirupsen/logrus"
"go.maze.io/harmon/config"
)
// ErrNotFound indicates no instance was saved.
var ErrNotFound = errors.New("player not registered")
// NotFound signals the player type can not be found.
type NotFound struct {
Type string
}
func (err NotFound) Error() string {
return fmt.Sprintf("player %q can not be found", err.Type)
}
// Factory is a function that can instantiate a new Player.
type Factory func(config.Player) (Player, error)
// Detector checks if this player is available.
type Detector func() bool
type detector struct {
Name string
New Factory
Detect Detector
Priority int
}
var (
// protocols holds the per protocol factories
protocols = new(sync.Map)
detectors []detector
// instance holds the current player instance
instance Player
)
// Register a new protocol factory.
func Register(name string, f Factory, d Detector, priority int) {
logrus.WithField("type", name).Debug("register player type")
if _, loaded := protocols.LoadOrStore(name, f); loaded {
panic(fmt.Sprintf("player type %q already registered", name))
}
if d != nil {
detectors = append(detectors, detector{
Name: name,
New: f,
Detect: d,
Priority: priority,
})
sort.Slice(detectors, func(i, j int) bool {
return detectors[i].Priority < detectors[j].Priority
})
}
}
// New returns a player factory for the requested type.
func New(config config.Player) (Player, error) {
log := logrus.WithField("type", config.Type)
log.Trace("create new player")
f, ok := protocols.Load(config.Type)
if !ok {
log.Warn("player type not found")
return nil, NotFound{Type: config.Type}
}
log.Trace("create new player instance")
p, err := f.(Factory)(config)
if err != nil {
log.WithError(err).Warn("player instance failed")
return nil, err
}
if config.Type == "" || config.Type == "auto" {
log = log.WithField("type", p.Type())
}
log.Trace("store player instance")
instance = p
return p, nil
}
// Get a previously registered instance.
func Get() (Player, error) {
if instance != nil {
return instance, nil
}
return nil, ErrNotFound
}
// Detect what player is available.
func Detect() (name string, factory Factory) {
logrus.Trace("auto detecting player type")
for _, d := range detectors {
if d.Detect() {
logrus.WithField("type", d.Name).Debug("auto detected player type")
return d.Name, d.New
}
}
logrus.Warn("auto detecting player type failed")
return "", nil
}
func autoDetect(config config.Player) (Player, error) {
if _, f := Detect(); f != nil {
return f(config)
}
return nil, ErrNotFound
}
func init() {
Register("auto", autoDetect, nil, 0)
Register("", autoDetect, nil, 0)
}
+9 -7
View File
@@ -3,9 +3,9 @@ package volumio
import (
"time"
"git.maze.io/go/bragi/config"
"git.maze.io/go/bragi/player"
"git.maze.io/go/bragi/player/mpd"
"go.maze.io/harmon/config"
"go.maze.io/harmon/player"
"go.maze.io/harmon/player/mpd"
)
const (
@@ -13,7 +13,7 @@ const (
)
func init() {
player.Register("volumio", func(config *config.Player) (player.Player, error) {
player.Register("volumio", func(config config.Player) (player.Player, error) {
return New(config)
}, Detect, 1)
}
@@ -22,9 +22,9 @@ type Player struct {
mpd *mpd.Player
}
func New(config *config.Player) (player.Player, error) {
func New(config config.Player) (player.Player, error) {
//return new(Player), nil
m, err := mpd.New(config.Host, config.Password, config.Name)
m, err := mpd.New(config.Host, config.Password)
if err != nil {
return nil, err
}
@@ -34,7 +34,9 @@ func New(config *config.Player) (player.Player, error) {
}, nil
}
func (Player) Name() string { return "volumio" }
func (p *Player) Halt() error { return p.mpd.Halt() }
func (Player) Type() string { return "volumio" }
func (Player) Name() string { return "Volumio" }
func (p *Player) Status() *player.Status { return p.mpd.Status() }
func (p *Player) Next() error { return p.mpd.Next() }
func (p *Player) Previous() error { return p.mpd.Previous() }