fix player exit statuses

cleanup
keshon · Dec 7, 2024 · 32163e4 · 32163e4
1 parent 41dda9a
commit 32163e4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/cmd/melodix/melodix.go b/cmd/melodix/melodix.go
@@ -417,6 +417,8 @@ func (b *Bot) onPlayback(s *discordgo.Session, m *discordgo.MessageCreate) {
 			s.ChannelMessageSendEmbed(m.ChannelID, embed.NewEmbed().SetColor(embedColor).SetDescription("No song is currently playing.").MessageEmbed)
 		case player.StatusResuming:
 			s.ChannelMessageSendEmbed(m.ChannelID, embed.NewEmbed().SetColor(embedColor).SetDescription("Oopsie! There was a network issue.\nTrying to continue playback...").MessageEmbed)
+		case player.StatusError:
+			s.ChannelMessageSendEmbed(m.ChannelID, embed.NewEmbed().SetColor(embedColor).SetDescription("Error detected...").MessageEmbed)
 		case player.StatusAdded:
 			desc := fmt.Sprintf("Song(s) added to queue\n\nUse `%slist` to see the current queue.", b.prefixCache[m.GuildID])
 			s.ChannelMessageSendEmbed(m.ChannelID, embed.NewEmbed().SetColor(embedColor).SetDescription(desc).MessageEmbed)

diff --git a/player/player.go b/player/player.go
@@ -206,11 +206,13 @@ PLAYBACK_LOOP:
 				close(done)
 				// stop if there is an error
 				if err != nil && err != io.EOF {
+					p.StatusSignals <- StatusError
 					return err
 				}
 				// restart if there is an interrupt
 				duration, position, err := p.getPlaybackDuration(encoding, streaming, p.Song)
 				if err != nil {
+					p.StatusSignals <- StatusError
 					return err
 				}
 				if encoding.Stats().Duration.Seconds() > 0 && position.Seconds() > 0 && position < duration {
@@ -236,6 +238,7 @@ PLAYBACK_LOOP:
 				fmt.Println("Switching to cached playback")
 				_, position, err := p.getPlaybackDuration(encoding, streaming, p.Song)
 				if err != nil {
+					p.StatusSignals <- StatusError
 					return err
 				}
 				isCached = true
@@ -256,6 +259,7 @@ PLAYBACK_LOOP:
 					}
 					p.ActionSignals <- ActionStop
 				case ActionStop:
+					p.StatusSignals <- StatusResting
 					return p.leaveVoiceChannel(vc)
 				case ActionSwap:
 					encoding.Stop()

diff --git a/song/song.go b/song/song.go
@@ -35,20 +35,12 @@ const (
 )
 
 var platformURLs = map[Platform][]string{
-	YouTube:      {"youtube.com", "youtu.be"},
-	Soundcloud:   {"soundcloud.com"},
-	Bandcamp:     {"bandcamp.com"},
-	FiftySixCom:  {"56.com"},
-	DailyMotion:  {"dailymotion.com"},
-	Vimeo:        {"vimeo.com"},
-	TikTok:       {"tiktok.com"},
-	Facebook:     {"facebook.com"},
-	Instagram:    {"instagram.com"},
-	Vevo:         {"vevo.com"},
-	AudioMack:    {"audiomack.com"},
-	Chaturbate:   {"chaturbate.com"},
-	Pornhub:      {"pornhub.com"},
-	ReverbNation: {"reverbnation.com"},
+	YouTube:     {"youtube.com", "youtu.be"},
+	Soundcloud:  {"soundcloud.com"},
+	Bandcamp:    {"bandcamp.com"},
+	FiftySixCom: {"56.com"},
+	DailyMotion: {"dailymotion.com"},
+	Vimeo:       {"vimeo.com"},
 }
 
 var (