feat: 动态加载歌曲

Author: 0neSe7en

README.md

@@ -14,10 +14,10 @@
 ## TODO
 
 - [x] 扫码登录(不登录无法获取超过一页的歌曲)
-- [ ] 支持动态添加更多音乐
+- [x] 支持动态添加更多音乐
 - [ ] 支持广场动态
 - [ ] 支持更多的Topic
-- [ ] 优化UI
+- [x] 优化UI
 - [ ] 支持除网易云音乐以外的更多歌曲
 
 ---

fm.go

@@ -7,14 +7,20 @@ import (
 	"github.com/faiface/beep"
 	"github.com/faiface/beep/speaker"
 	"github.com/gdamore/tcell"
+	"strconv"
 	"strings"
 	"time"
 	"unicode"
 )
 
-var topics = map[string]string{
-	"55483ddee4b03ccbae843925": "晚安电台",
-	"5a1ccf936e6e7c0011037480": "即友在听什么歌",
+type Topic struct {
+	id string
+	name string
+}
+
+var topics = []Topic{
+	{id: "55483ddee4b03ccbae843925", name: "晚安电台"},
+	{id: "5a1ccf936e6e7c0011037480", name: "即友在听什么歌"},
 }
 
 var CurrentSession *jike.Session
@@ -29,26 +35,50 @@ type JikeFm struct {
 	playlist     []jike.Message
 	player *Player
 	currentMusic Music
-	currentTopic string
+	currentTopicIndex int
 	nextMusicIndex int
 	skip         string
+	more chan bool
 }
 
 func newFm() *JikeFm {
 	p := &JikeFm{
-		currentTopic:"55483ddee4b03ccbae843925",
+		currentTopicIndex: 0,
+		more: make(chan bool, 1),
 	}
 	p.player = newPlayer(p.iter)
 	p.nextMusicIndex = 0
+	go p.fetchMore()
 	return p
 }
 
-func (p *JikeFm) feed() {
-	res, next, _ := jike.FetchMoreSelectedFM(CurrentSession, p.currentTopic, p.skip)
-	for _, msg := range res {
-		p.playlist = append(p.playlist, msg)
+func (p *JikeFm) fetchMore() {
+	for {
+		<- p.more
+		msgs := p.feed()
+
+		UI.app.QueueUpdateDraw(func() {
+			currentLen := len(p.playlist)
+			p.addToPlaylist(msgs)
+			updateTotalSong(len(p.playlist))
+			if p.nextMusicIndex == 0 {
+				p.nextMusicIndex = currentLen
+			}
+		})
 	}
+}
+
+func (p *JikeFm) feed() []jike.Message {
+	res, next, _ := jike.FetchMoreSelectedFM(CurrentSession, topics[p.currentTopicIndex].id, p.skip)
 	p.skip = next
+	return res
+}
+
+func (p *JikeFm) addToPlaylist(messages []jike.Message) {
+	for _, msg := range messages {
+		p.playlist = append(p.playlist, msg)
+		UI.side.AddItem(normalText(len(p.playlist), msg.GetTitle()), "", 0, nil)
+	}
 }
 
 func (p *JikeFm) play() {
@@ -82,6 +112,9 @@ func (p *JikeFm) onSelectChange(index int, _ string, _ string, _ rune) {
 	if index >= len(p.playlist) {
 		i = index - len(p.playlist)
 	}
+	if index == len(p.playlist) - 1 {
+		p.queueMore()
+	}
 	msg := p.playlist[i]
 	UI.main.SetText(msg.Content)
 	UI.mainAuthor.SetText("[green]@" + msg.User.ScreenName)
@@ -104,24 +137,34 @@ func (p *JikeFm) changeSong(from int, target int) {
 	if from >= 0 {
 		UI.side.SetItemText(
 			from,
-			normalText(from, p.playlist[from].GetTitle()),
+			normalText(from + 1, p.playlist[from].GetTitle()),
 			"",
 		)
 	}
 	UI.side.SetItemText(
 		target,
-		playingText(target, p.playlist[target].GetTitle()),
+		playingText(target + 1, p.playlist[target].GetTitle()),
 		"",
 	)
 }
 
+func (p *JikeFm) queueMore() {
+	select {
+	case p.more <- true:
+	default:
+	}
+}
+
 func (p *JikeFm) iter() beep.Streamer {
 	if len(p.playlist) == 0 {
 		return nil
 	}
 	stream := p.playIndex(p.nextMusicIndex)
-	var next int
-	if next = p.nextMusicIndex + 1; next >= len(p.playlist) {
+	next := p.nextMusicIndex + 1
+	if next > len(p.playlist) - 1 {
+		p.queueMore()
+	}
+	if next >= len(p.playlist) {
 		next = 0
 	}
 	p.nextMusicIndex = next
@@ -133,10 +176,17 @@ func (p *JikeFm) handle(event *tcell.EventKey) *tcell.EventKey {
 	switch event.Key() {
 	case tcell.KeyESC:
 		UI.app.Stop()
+	case tcell.KeyCtrlN:
+		return nil
+	case tcell.KeyCtrlP:
+		return nil
+	case tcell.KeyTab:
+		return nil
 	case tcell.KeyRune:
 		switch unicode.ToLower(event.Rune()) {
 		case ' ':
 			p.player.togglePlay()
+			return nil
 		}
 	}
 	return event
@@ -148,30 +198,23 @@ func main() {
 
 	defer fm.player.close()
 
-	for {
-		fm.feed()
-		if len(fm.playlist) > 20 {
-			break
-		}
-	}
+	fm.addToPlaylist(fm.feed())
+	updateTotalSong(len(fm.playlist))
 
 	fm.onSelectChange(0, "", "", 0)
 
-	for index, msg := range fm.playlist {
-		UI.side.AddItem(normalText(index, msg.GetTitle()), "", 0, nil)
-	}
-
 	UI.side.
 		SetChangedFunc(fm.onSelectChange).
 		SetSelectedFunc(fm.onEnterPlay).
 		ShowSecondaryText(false)
 	UI.app.SetInputCapture(fm.handle)
 
 	var s []string
-	for id, topicName := range topics {
-		s = append(s, fmt.Sprintf(`["%s"]%s[""]`, id, topicName))
+	for index, topic := range topics {
+		s = append(s, fmt.Sprintf(`["%d"]%s[""]`, index, topic.name))
 	}
 	UI.footerTopic.SetText("| " + strings.Join(s, " | ") + " |")
+	UI.footerTopic.Highlight(strconv.Itoa(fm.currentTopicIndex))
 
 	fm.play()
 

ui.go

@@ -6,7 +6,7 @@ import (
 	"github.com/rivo/tview"
 )
 
-var UI = struct {
+type Components struct {
 	app    *tview.Application
 	root   *tview.Flex
 	header *tview.TextView
@@ -15,19 +15,10 @@ var UI = struct {
 	mainAuthor   *tview.TextView
 	footerTopic *tview.TextView
 	footerHelp *tview.TextView
-}{
-	app:    tview.NewApplication(),
-	root:   tview.NewFlex().SetDirection(tview.FlexRow),
-	header: tview.NewTextView().SetDynamicColors(true),
-	main:   tview.NewTextView().SetDynamicColors(true),
-	mainAuthor: tview.NewTextView().SetDynamicColors(true).SetTextAlign(tview.AlignRight),
-	side:   tview.NewList(),
-	footerTopic: tview.NewTextView().
-		SetDynamicColors(true).SetRegions(true).SetWrap(false).SetTextAlign(tview.AlignCenter),
-	footerHelp: tview.NewTextView().
-		SetDynamicColors(true).SetRegions(true).SetWrap(false).SetTextAlign(tview.AlignRight),
 }
 
+var UI Components
+
 var headerTpl = `
     [red]♫  ♪ ♫  ♪ [yellow]%s
 
@@ -40,37 +31,56 @@ var normalTpl = "[yellow]% 3d) \t[-:-:-]%s"
 var playingTpl = "[purple]% 3d) \t->[::b] %s"
 
 func init() {
+	UI = Components{
+		app:    tview.NewApplication(),
+		root:   tview.NewFlex().SetDirection(tview.FlexRow),
+		header: tview.NewTextView().SetDynamicColors(true),
+		main:   tview.NewTextView().SetDynamicColors(true),
+		mainAuthor: tview.NewTextView().SetDynamicColors(true).SetTextAlign(tview.AlignRight),
+		side:   tview.NewList().SetSelectedBackgroundColor(tcell.ColorDimGray),
+		footerTopic: tview.NewTextView().
+			SetDynamicColors(true).SetRegions(true).SetWrap(false).SetTextAlign(tview.AlignCenter),
+		footerHelp: tview.NewTextView().
+			SetDynamicColors(true).SetRegions(true).SetWrap(false).SetTextAlign(tview.AlignRight).
+			SetText(footerTpl),
+	}
 	UI.root.SetRect(0, 0, 100, 40)
-	UI.header.SetBorder(true).SetTitle("JIKE FM")
+	UI.header.SetBorder(true).SetTitle("即刻电台 " + version)
 	UI.side.SetBorder(true).SetBorderPadding(1, 0, 0, 1)
 
 	mainContainer := tview.NewFlex().SetDirection(tview.FlexRow).
 		AddItem(UI.main, 0, 1, false).
 		AddItem(UI.mainAuthor, 2, 1, false)
 	mainContainer.SetBorder(true).SetBorderPadding(1, 0, 2, 2)
-	footer := tview.NewFlex().SetDirection(tview.FlexColumn)
-	footer.SetBackgroundColor(tcell.ColorGrey)
-	UI.footerHelp.SetText(footerTpl).SetBackgroundColor(tcell.ColorGrey)
-	UI.footerTopic.SetBackgroundColor(tcell.ColorGrey)
-	footer.
+
+	footerContainer := tview.NewFlex().SetDirection(tview.FlexColumn).
 		AddItem(UI.footerTopic, 40, 1, false).
 		AddItem(UI.footerHelp, 0, 1, false)
+
+	footerContainer.SetBackgroundColor(tcell.ColorGrey)
+	UI.footerHelp.SetBackgroundColor(tcell.ColorGrey)
+	UI.footerTopic.SetBackgroundColor(tcell.ColorGrey)
+
 	UI.root.
 		AddItem(UI.header, 7, 1, false).
 		AddItem(tview.NewFlex().SetDirection(tview.FlexColumn).
 			AddItem(UI.side, 40, 1, true).
 			AddItem(mainContainer, 0, 1, false),
 		0, 1, false).
-		AddItem(footer, 1, 1, false)
+		AddItem(footerContainer, 1, 1, false)
 	UI.app.SetRoot(UI.root, false).SetFocus(UI.side)
 }
 
 func normalText(index int, title string) string {
-	return fmt.Sprintf(normalTpl, index + 1, title)
+	return fmt.Sprintf(normalTpl, index, title)
 }
 
 func playingText(index int, title string) string {
-	return fmt.Sprintf(playingTpl, index + 1, title)
+	return fmt.Sprintf(playingTpl, index, title)
+}
+
+func updateTotalSong(count int) {
+	UI.side.SetTitle(fmt.Sprintf(" 歌曲数: %d", count))
 }
 
 func run() error {

version.go

@@ -0,0 +1,3 @@
+package main
+
+var version = "v0.1.0"