Core API update

Added mime unsupported error

core/track.go

@@ -55,6 +55,7 @@ type Track interface {
 	GetBitrate() int
 	GetChannels() int
 	GetCodec() string
+	GetDuration() time.Duration
 }
 
 // An interface for a track that can be seeked

go.mod

@@ -3,9 +3,9 @@ module lionplayer
 go 1.13
 
 require (
-	github.com/bwmarrin/discordgo v0.0.0-20191018135108-0364b15ee4ec
-	github.com/dondish/lionplayer/core v0.0.2-newname
-	github.com/dondish/lionplayer/youtube v0.0.3-newname
+	github.com/bwmarrin/discordgo v0.20.0
+	github.com/dondish/lionplayer/core v0.0.3
+	github.com/dondish/lionplayer/youtube v0.0.4
 	github.com/gorilla/websocket v1.4.1 // indirect
 	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
 	golang.org/x/sys v0.0.0-20191018095205-727590c5006e // indirect

main.go

@@ -52,7 +52,7 @@ func init() {
 var token string
 
 var ytsrc = youtube.NewSource()
-var track *core.PlaySeekable
+var track core.PlaySeekable
 var lastpacket core.Packet
 
 func main() {
@@ -240,6 +240,7 @@ func guildCreate(s *discordgo.Session, event *discordgo.GuildCreate) {
 
 // playSound plays the current buffer to the provided channel.
 func playSound(s *discordgo.Session, guildID, channelID, videoId, msgchannel string) (err error) {
+
 	// Join the provided voice channel.
 	vc, err := s.ChannelVoiceJoin(guildID, channelID, false, true)
 	if err != nil {
@@ -251,12 +252,28 @@ func playSound(s *discordgo.Session, guildID, channelID, videoId, msgchannel str
 
 	// Start speaking.
 	vc.Speaking(true)
+
+	defer func() {
+		// Stop speaking
+		vc.Speaking(false)
+
+		// Sleep for a specificed amount of time before ending.
+		time.Sleep(250 * time.Millisecond)
+
+		// Disconnect from the provided voice channel.
+		vc.Disconnect()
+	}()
+
 	trac, err := ytsrc.PlayVideo(videoId)
 	if err != nil {
 		return err
 	}
 
-	_, err = s.ChannelMessageSend(msgchannel, fmt.Sprintf("Now Playing - %s - %s [%s]", trac.Title, trac.Author, trac.Duration))
+	if trac.IsStream {
+		_, err = s.ChannelMessageSend(msgchannel, fmt.Sprintf("Now Playing - %s - %s [LIVE]", trac.Title, trac.Author))
+	} else {
+		_, err = s.ChannelMessageSend(msgchannel, fmt.Sprintf("Now Playing - %s - %s [%s]", trac.Title, trac.Author, trac.Duration))
+	}
 	if err != nil {
 		return err
 	}
@@ -283,14 +300,5 @@ func playSound(s *discordgo.Session, guildID, channelID, videoId, msgchannel str
 
 	track = nil
 
-	// Stop speaking
-	vc.Speaking(false)
-
-	// Sleep for a specificed amount of time before ending.
-	time.Sleep(250 * time.Millisecond)
-
-	// Disconnect from the provided voice channel.
-	vc.Disconnect()
-
 	return nil
 }

youtube/go.mod

@@ -2,7 +2,7 @@ module github.com/dondish/lionplayer/youtube
 
 go 1.13
 
-require github.com/dondish/lionplayer/core v0.0.2-newname
+require github.com/dondish/lionplayer/core v0.0.3
 
 require github.com/dondish/lionplayer/webm v0.0.5-newname
 

youtube/track.go

@@ -52,7 +52,11 @@ func (t Track) GetChannels() int {
 }
 
 func (t Track) GetCodec() string {
-	return strings.Split(t.Format.Type, "; ")[1]
+	return strings.Trim(strings.Split(t.Format.Type, "=")[1], "\"")
+}
+
+func (t Track) GetDuration() time.Duration {
+	return t.Duration
 }
 
 // Return a playable of this track that can be played.
@@ -75,13 +79,16 @@ func (t Track) GetPlaySeekable() (core.PlaySeekable, error) {
 	} else if size == 0 {
 		return nil, errors.New("got an empty request")
 	}
+	if strings.Split(t.Format.Type, ";")[0] == "audio/webm" {
+		parser, err := webm.NewParser(res)
 
-	parser, err := webm.NewParser(res)
+		if err != nil {
+			return nil, err
+		}
 
-	if err != nil {
-		return nil, err
+		file, err := parser.Parse()
+		return file, nil
+	} else {
+		return nil, errors.New("mime type not supported")
 	}
-
-	file, err := parser.Parse()
-	return file, nil
 }