optimize: loading

go-musicfox · Sep 2, 2023 · c80fb99 · c80fb99
1 parent df3a3aa
commit c80fb99
Show file tree

Hide file tree

Showing 14 changed files with 177 additions and 206 deletions.
diff --git a/go.mod b/go.mod
@@ -1,9 +1,11 @@
 module github.com/go-musicfox/go-musicfox
 
-go 1.18
+go 1.21
+
+toolchain go1.21.0
 
 require (
-	github.com/anhoder/foxful-cli v0.1.1
+	github.com/anhoder/foxful-cli v0.1.2
 	github.com/bogem/id3v2/v2 v2.1.4
 	github.com/buger/jsonparser v1.1.1
 	github.com/charmbracelet/bubbles v0.16.1

diff --git a/go.sum b/go.sum
@@ -1,6 +1,6 @@
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
-github.com/anhoder/foxful-cli v0.1.1 h1:9xxd09hdlYqLA1Q3b4a2DVB2iiL/9l2Yy9LzijPb3QU=
-github.com/anhoder/foxful-cli v0.1.1/go.mod h1:U03HgMRwkemXtB8dac2QorgJnDft0QdHP9b2qa4do8A=
+github.com/anhoder/foxful-cli v0.1.2 h1:oOpiiHkrF4yr6eiNBXHVuw2fpwIjnH02M09/GvfZuW0=
+github.com/anhoder/foxful-cli v0.1.2/go.mod h1:TyHexyRKpyb5iM9mMC1UVxe2RRkgr3StNwxxVBi5LDo=
 github.com/anhoder/gcli/v2 v2.3.5 h1:tiFK7xnZxNHIevEaRtfT4Cfhz4OYFcJaeB1S55dxxBU=
 github.com/anhoder/gcli/v2 v2.3.5/go.mod h1:AOxm27rFzNDLpBrwbW1pAh3ofebpXOQk/9x009qC9y8=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
@@ -97,6 +97,7 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jszwec/csvutil v1.5.1/go.mod h1:Rpu7Uu9giO9subDyMCIQfHVDuLrcaC36UA4YcJjGBkg=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
@@ -155,6 +156,7 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/telanflow/cookiejar v0.0.0-20190719062046-114449e86aa5 h1:gTQl5nPlc9B53vFOKM8aJHwxB2BW2kM49PVR5526GBg=
 github.com/telanflow/cookiejar v0.0.0-20190719062046-114449e86aa5/go.mod h1:qNgA5MKwTh103SxGTooqZMiKxZTaV9UV3KjN7I7Drig=
 github.com/tosone/minimp3 v1.0.2 h1:htFE2EbP7Y4CJ8KGW9c55tKWRpzv9kXkEmCYGxFzVjA=

diff --git a/pkg/ui/event_handler.go b/pkg/ui/event_handler.go
@@ -155,9 +155,9 @@ func (h *EventHandler) KeyMsgHandle(msg tea.KeyMsg, a *model.App) (bool, model.P
 }
 
 func (h *EventHandler) enterKeyHandle() (stopPropagation bool, newPage model.Page, cmd tea.Cmd) {
-	loading := NewLoading(h.netease)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(h.netease.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	var menu = h.netease.MustMain().CurMenu()
 	if _, ok := menu.(*AddToUserPlaylistMenu); ok {

diff --git a/pkg/ui/lastfm_auth.go b/pkg/ui/lastfm_auth.go
@@ -50,19 +50,19 @@ func (m *LastfmAuth) BeforeEnterMenuHook() model.Hook {
 func (m *LastfmAuth) SubMenu(mod_el *model.App, _ int) model.Menu {
 	var err error
 
-	loading := NewLoading(m.netease)
-	loading.start()
+	loading := model.NewLoading(m.netease.MustMain())
+	loading.Start()
 
 	if m.netease.lastfmUser == nil {
 		m.netease.lastfmUser = &storage.LastfmUser{}
 	}
 	m.netease.lastfmUser.SessionKey, err = m.netease.lastfm.GetSession(m.token)
 	if err != nil {
-		loading.complete()
+		loading.Complete()
 		return NewLastfmRes(m.baseMenu, "授权", err, 1)
 	}
 	user, err := m.netease.lastfm.GetUserInfo(map[string]interface{}{})
-	loading.complete()
+	loading.Complete()
 	if err != nil {
 		return NewLastfmRes(m.baseMenu, "授权", err, 1)
 	}

diff --git a/pkg/ui/loading.go b/pkg/ui/loading.go
diff --git a/pkg/ui/login_page.go b/pkg/ui/login_page.go
@@ -303,9 +303,9 @@ func (l *LoginPage) qrButtonTextByStep() string {
 }
 
 func (l *LoginPage) enterHandler() (model.Page, tea.Cmd) {
-	loading := NewLoading(l.netease, l.menuTitle)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(l.netease.MustMain(), l.menuTitle)
+	loading.Start()
+	defer loading.Complete()
 
 	switch l.index {
 	case submitIndex:

diff --git a/pkg/ui/operate.go b/pkg/ui/operate.go
@@ -22,9 +22,9 @@ import (
 
 // likePlayingSong like/unlike playing song
 func likePlayingSong(m *Netease, isLike bool) model.Page {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	if m.player.curSongIndex >= len(m.player.playlist) {
 		return nil
@@ -133,9 +133,9 @@ func logout() {
 
 // likeSelectedSong like/unlike selected song
 func likeSelectedSong(m *Netease, isLike bool) model.Page {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	var (
 		main = m.MustMain()
@@ -232,9 +232,9 @@ func likeSelectedSong(m *Netease, isLike bool) model.Page {
 
 // trashPlayingSong 标记为不喜欢
 func trashPlayingSong(m *Netease) model.Page {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	if m.player.curSongIndex >= len(m.player.playlist) {
 		return nil
@@ -264,9 +264,9 @@ func trashPlayingSong(m *Netease) model.Page {
 
 // trashSelectedSong 标记为不喜欢
 func trashSelectedSong(m *Netease) model.Page {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	var (
 		main = m.MustMain()
@@ -303,9 +303,9 @@ func trashSelectedSong(m *Netease) model.Page {
 
 // 下载当前音乐
 func downloadSelectedSong(m *Netease) {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	var (
 		main = m.MustMain()
@@ -321,9 +321,9 @@ func downloadSelectedSong(m *Netease) {
 }
 
 func downloadPlayingSong(m *Netease) {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	if m.player.curSongIndex >= len(m.player.playlist) {
 		return
@@ -333,9 +333,9 @@ func downloadPlayingSong(m *Netease) {
 }
 
 func albumOfPlayingSong(m *Netease) {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	var (
 		main = m.MustMain()
@@ -355,9 +355,9 @@ func albumOfPlayingSong(m *Netease) {
 }
 
 func albumOfSelectedSong(m *Netease) {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	var (
 		main = m.MustMain()
@@ -379,9 +379,9 @@ func albumOfSelectedSong(m *Netease) {
 }
 
 func artistOfPlayingSong(m *Netease) {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	var (
 		main = m.MustMain()
@@ -411,9 +411,9 @@ func artistOfPlayingSong(m *Netease) {
 }
 
 func artistOfSelectedSong(m *Netease) {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	var (
 		main = m.MustMain()
@@ -446,9 +446,9 @@ func artistOfSelectedSong(m *Netease) {
 }
 
 func openPlayingSongInWeb(m *Netease) {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	if m.player.curSongIndex >= len(m.player.playlist) {
 		return
@@ -459,9 +459,9 @@ func openPlayingSongInWeb(m *Netease) {
 }
 
 func openSelectedItemInWeb(m *Netease) {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	var (
 		main = m.MustMain()
@@ -496,9 +496,9 @@ func openSelectedItemInWeb(m *Netease) {
 
 // collectSelectedPlaylist 收藏选中歌单
 func collectSelectedPlaylist(m *Netease, isCollect bool) model.Page {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	if utils.CheckUserInfo(m.user) == utils.NeedLogin {
 		page, _ := m.ToLoginPage(func() model.Page {
@@ -560,9 +560,9 @@ func collectSelectedPlaylist(m *Netease, isCollect bool) model.Page {
 
 // addSongToPlaylist 添加歌曲到播放列表
 func addSongToPlaylist(m *Netease, addToNext bool) {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	var (
 		main = m.MustMain()
@@ -608,9 +608,9 @@ func addSongToPlaylist(m *Netease, addToNext bool) {
 
 // openAddSongToUserPlaylistMenu 打开添加歌曲到用户歌单菜单
 func openAddSongToUserPlaylistMenu(m *Netease, isSelected, isAdd bool) model.Page {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	if utils.CheckUserInfo(m.user) == utils.NeedLogin {
 		page, _ := m.ToLoginPage(func() model.Page {
@@ -656,9 +656,9 @@ func openAddSongToUserPlaylistMenu(m *Netease, isSelected, isAdd bool) model.Pag
 
 // addSongToUserPlaylist 添加歌曲到用户歌单
 func addSongToUserPlaylist(m *Netease, isAdd bool) model.Page {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	if utils.CheckUserInfo(m.user) == utils.NeedLogin {
 		page, _ := m.ToLoginPage(func() model.Page {
@@ -736,9 +736,9 @@ func addSongToUserPlaylist(m *Netease, isAdd bool) model.Page {
 
 // 从播放列表删除选中歌曲,仅在当前播放列表界面有效
 func delSongFromPlaylist(m *Netease) model.Page {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 
 	var (
 		main = m.MustMain()
@@ -798,9 +798,9 @@ func delSongFromPlaylist(m *Netease) model.Page {
 }
 
 func clearSongCache(m *Netease) {
-	loading := NewLoading(m)
-	loading.start()
-	defer loading.complete()
+	loading := model.NewLoading(m.MustMain())
+	loading.Start()
+	defer loading.Complete()
 	err := utils.ClearMusicCache()
 	if err != nil {
 		utils.Notify(utils.NotifyContent{