Checkpoint
This commit is contained in:
223 files changed
+14770
-18352
No files matched your search
@@ -36,8 +36,11 @@ func New(config config.Player) (player.Player, error) {
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (p *Player) String() string {
|
||||
return "moOde@" + p.mpd.String()
|
||||
}
|
||||
|
||||
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) Next() error { return p.mpd.Next() }
|
||||
func (p *Player) Previous() error { return p.mpd.Previous() }
|
||||
|
||||
+4
-3
@@ -6,8 +6,9 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/BeatGlow/beatglow/player"
|
||||
"github.com/sirupsen/logrus"
|
||||
|
||||
"github.com/BeatGlow/beatglow/player"
|
||||
)
|
||||
|
||||
// Version number.
|
||||
@@ -63,8 +64,8 @@ func parseStatus(p player.Player, status, track map[string]string) *player.Statu
|
||||
s.Playing = true
|
||||
s.Paused = false
|
||||
case "pause":
|
||||
s.Playing = true
|
||||
s.Paused = false
|
||||
s.Playing = false
|
||||
s.Paused = true
|
||||
}
|
||||
s.Repeat = status["repeat"] == "1"
|
||||
s.Shuffle = status["shuffle"] == "1"
|
||||
|
||||
@@ -18,7 +18,7 @@ import (
|
||||
)
|
||||
|
||||
func init() {
|
||||
player.Register("mpd", func(config config.Player) (player.Player, error) {
|
||||
player.Register("mpd", func(config *config.Player) (player.Player, error) {
|
||||
return New(config.Host, config.Password)
|
||||
}, Detect, 10)
|
||||
}
|
||||
@@ -150,7 +150,9 @@ func newConn(addr, password, kind, name string) (*clientConn, *Version, error) {
|
||||
return &clientConn{conn, kind}, &version, nil
|
||||
}
|
||||
|
||||
func (*Player) Type() string { return "mpd" }
|
||||
func (p *Player) String() string {
|
||||
return "mpd@" + p.addr
|
||||
}
|
||||
|
||||
func (p *Player) Halt() error {
|
||||
for i := 0; i < 2; i++ {
|
||||
|
||||
+4
-4
@@ -24,7 +24,7 @@ func (err NotFound) Error() string {
|
||||
}
|
||||
|
||||
// Factory is a function that can instantiate a new Player.
|
||||
type Factory func(config.Player) (Player, error)
|
||||
type Factory func(*config.Player) (Player, error)
|
||||
|
||||
// Detector checks if this player is available.
|
||||
type Detector func() bool
|
||||
@@ -65,7 +65,7 @@ func Register(name string, f Factory, d Detector, priority int) {
|
||||
}
|
||||
|
||||
// New returns a player factory for the requested type.
|
||||
func New(config config.Player) (Player, error) {
|
||||
func New(config *config.Player) (Player, error) {
|
||||
log := logrus.WithField("type", config.Type)
|
||||
log.Trace("create new player")
|
||||
|
||||
@@ -83,7 +83,7 @@ func New(config config.Player) (Player, error) {
|
||||
}
|
||||
|
||||
if config.Type == "" || config.Type == "auto" {
|
||||
log = log.WithField("type", p.Type())
|
||||
log = log.WithField("type", p.Name())
|
||||
}
|
||||
|
||||
log.Trace("store player instance")
|
||||
@@ -113,7 +113,7 @@ func Detect() (name string, factory Factory) {
|
||||
return "", nil
|
||||
}
|
||||
|
||||
func autoDetect(config config.Player) (Player, error) {
|
||||
func autoDetect(config *config.Player) (Player, error) {
|
||||
if _, f := Detect(); f != nil {
|
||||
return f(config)
|
||||
}
|
||||
|
||||
@@ -2,11 +2,19 @@ package volumio
|
||||
|
||||
import (
|
||||
"image"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"path/filepath"
|
||||
"time"
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
|
||||
"github.com/BeatGlow/beatglow/config"
|
||||
"github.com/BeatGlow/beatglow/player"
|
||||
"github.com/BeatGlow/beatglow/player/mpd"
|
||||
|
||||
_ "image/jpeg"
|
||||
_ "image/png"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -14,7 +22,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)
|
||||
}
|
||||
@@ -23,7 +31,7 @@ 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)
|
||||
if err != nil {
|
||||
@@ -35,8 +43,15 @@ func New(config config.Player) (player.Player, error) {
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (p *Player) log() *logrus.Entry {
|
||||
return logrus.WithField("player", "volumio")
|
||||
}
|
||||
|
||||
func (p *Player) String() string {
|
||||
return "volumio@" + p.mpd.String()
|
||||
}
|
||||
|
||||
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() }
|
||||
@@ -53,6 +68,26 @@ func (p *Player) Events() (<-chan player.Event, error) {
|
||||
}
|
||||
|
||||
func (p *Player) AlbumArt(t *player.Track) (image.Image, bool) {
|
||||
log := p.log()
|
||||
|
||||
u, err := url.Parse("http://127.0.0.1/albumart?path=x&metadata=false")
|
||||
if err == nil {
|
||||
u.Query().Set("path", filepath.Dir(t.Path))
|
||||
log = log.WithField("url", u.String())
|
||||
log.Debug("request album art")
|
||||
r, err := http.Get(u.String())
|
||||
if err != nil {
|
||||
log.WithError(err).Warn("album art request failed")
|
||||
} else {
|
||||
defer r.Body.Close()
|
||||
i, _, err := image.Decode(r.Body)
|
||||
if err != nil {
|
||||
log.WithError(err).Warn("album art decode failed")
|
||||
} else {
|
||||
return i, true
|
||||
}
|
||||
}
|
||||
}
|
||||
return p.mpd.AlbumArt(t)
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user