Mpd support

command.go

@@ -3,7 +3,6 @@ package main
 import (
 	"sync"
 
-	"github.com/issadarkthing/gomu/player"
 	"github.com/rivo/tview"
 	"github.com/ztrue/tracerr"
 )
@@ -223,7 +222,9 @@ func (c Command) defineCommands() {
 			gomu.queue.pushFront(a)
 
 			if gomu.player.IsRunning() {
-				gomu.player.Skip()
+				if err := gomu.player.Skip(); err != nil {
+					errorPopup(err)
+				}
 			} else {
 				gomu.queue.playQueue()
 			}
@@ -280,23 +281,26 @@ func (c Command) defineCommands() {
 	})
 
 	c.define("volume_up", func() {
-		v := player.VolToHuman(gomu.player.GetVolume())
+		v := gomu.player.VolToHuman(gomu.player.GetVolume())
 		if v < 100 {
 			vol := gomu.player.SetVolume(0.5)
 			volumePopup(vol)
 		}
 	})
 
 	c.define("volume_down", func() {
-		v := player.VolToHuman(gomu.player.GetVolume())
+		v := gomu.player.VolToHuman(gomu.player.GetVolume())
 		if v > 0 {
 			vol := gomu.player.SetVolume(-0.5)
 			volumePopup(vol)
 		}
 	})
 
 	c.define("skip", func() {
-		gomu.player.Skip()
+		gomu.playingBar.stop()
+		if err := gomu.player.Skip(); err != nil {
+			errorPopup(err)
+		}
 	})
 
 	c.define("toggle_help", func() {

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/disintegration/imaging v1.6.2
 	github.com/faiface/beep v1.0.2
+	github.com/fhs/gompd/v2 v2.2.0
 	github.com/gdamore/tcell/v2 v2.2.0
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gocolly/colly v1.2.0

go.sum

@@ -27,6 +27,8 @@ github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/faiface/beep v1.0.2 h1:UB5DiRNmA4erfUYnHbgU4UB6DlBOrsdEFRtcc8sCkdQ=
 github.com/faiface/beep v1.0.2/go.mod h1:1yLb5yRdHMsovYYWVqYLioXkVuziCSITW1oarTeduQM=
+github.com/fhs/gompd/v2 v2.2.0 h1:zdSYAAOzQ5cCCgYa5CoXkL0Vr0Cqb/b5JmTobirLc90=
+github.com/fhs/gompd/v2 v2.2.0/go.mod h1:nNdZtcpD5VpmzZbRl5rV6RhxeMmAWTxEsSIMBkmMIy4=
 github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/gdamore/tcell v1.1.1/go.mod h1:K1udHkiR3cOtlpKG5tZPD5XxrF7v2y7lDq7Whcj+xkQ=

gomu.go

@@ -20,7 +20,7 @@ type Gomu struct {
 	playingBar *PlayingBar
 	queue      *Queue
 	playlist   *Playlist
-	player     *player.Player
+	player     player.Player
 	pages      *tview.Pages
 	colors     *Colors
 	command    Command
@@ -49,11 +49,16 @@ func newGomu() *Gomu {
 // constructor function `newGomu` so that we can
 // test independently
 func (g *Gomu) initPanels(app *tview.Application, args Args) {
+	var err error
 	g.app = app
 	g.playingBar = newPlayingBar()
 	g.queue = newQueue()
 	g.playlist = newPlaylist(args)
-	g.player = player.New(g.anko.GetInt("General.volume"))
+	g.player, err = player.NewPlayer(g.anko.GetInt("General.volume"), g.anko.GetString("General.backend_server"), g.anko.GetString("General.mpd_port"))
+	if err != nil {
+		logError(err)
+	}
+
 	g.pages = tview.NewPages()
 	g.panels = []Panel{g.playlist, g.queue, g.playingBar}
 }
@@ -146,6 +151,17 @@ func (g *Gomu) quit(args Args) error {
 		}
 	}
 
+	err := gomu.player.Stop()
+	if err != nil {
+		return tracerr.Wrap(err)
+	}
+
+	if gomu.playingBar.albumPhoto != nil {
+		gomu.playingBar.albumPhoto.Clear()
+		gomu.playingBar.albumPhoto.Destroy()
+		gomu.playingBar.albumPhoto = nil
+	}
+
 	gomu.app.Stop()
 
 	return nil

lyric/lyric.go

@@ -25,6 +25,19 @@ type LyricFetcher interface {
 	LyricOptions(search string) ([]*SongTag, error)
 }
 
+func LyricLang(lang string) LyricFetcher {
+
+	switch lang {
+	case "en":
+		return LyricFetcherEn{}
+	case "zh-CN":
+		return LyricFetcherCn{}
+	default:
+		return LyricFetcherEn{}
+	}
+
+}
+
 // cleanHTML parses html text to valid utf-8 text
 func cleanHTML(input string) string {