Skip to content

Commit

Permalink
optimize: login callback
Browse files Browse the repository at this point in the history
  • Loading branch information
@anhoder
anhoder committed Sep 1, 2023
1 parent b959aa4 commit 8765c96
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 26 deletions.
11 changes: 11 additions & 0 deletions pkg/ui/login_callback.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package ui

import "github.com/anhoder/foxful-cli/model"

type LoginCallback func() model.Page

func EnterMenuCallback(m *model.Main) LoginCallback {
return func() model.Page {
return m.EnterMenu(nil, nil)
}
}
8 changes: 0 additions & 8 deletions pkg/ui/login_page.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,11 +452,3 @@ func (l *LoginPage) loginSuccessHandle(n *Netease, userInfo []byte) model.Page {
}
return newPage
}

type LoginCallback func() model.Page

func EnterMenuLoginCallback(main *model.Main) LoginCallback {
return func() model.Page {
return main.EnterMenu(nil, nil)
}
}
4 changes: 2 additions & 2 deletions pkg/ui/menu_add_to_user_playlist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (m *AddToUserPlaylistMenu) BeforeEnterMenuHook() model.Hook {
return func(main *model.Main) (bool, model.Page) {
// 等于0，获取当前用户歌单
if m.userId == CurUser && utils.CheckUserInfo(m.netease.user) == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
}

Expand All @@ -77,7 +77,7 @@ func (m *AddToUserPlaylistMenu) BeforeEnterMenuHook() model.Hook {
code, response := userPlaylists.UserPlaylist()
codeType := utils.CheckCode(code)
if codeType == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
} else if codeType != utils.Success {
return false, nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/menu_album_detail.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (m *AlbumDetailMenu) BeforeEnterMenuHook() model.Hook {
code, response := albumService.Album()
codeType := utils.CheckCode(code)
if codeType == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
} else if codeType != utils.Success {
return false, nil
Expand Down
4 changes: 2 additions & 2 deletions pkg/ui/menu_cloud.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (m *CloudMenu) MenuViews() []model.MenuItem {
func (m *CloudMenu) BeforeEnterMenuHook() model.Hook {
return func(main *model.Main) (bool, model.Page) {
if utils.CheckUserInfo(m.netease.user) == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
}

Expand All @@ -63,7 +63,7 @@ func (m *CloudMenu) BeforeEnterMenuHook() model.Hook {
code, response := cloudService.UserCloud()
codeType := utils.CheckCode(code)
if codeType == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
} else if codeType != utils.Success {
return false, nil
Expand Down
4 changes: 2 additions & 2 deletions pkg/ui/menu_daily_recommend_playlists.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (m *DailyRecommendPlaylistsMenu) SubMenu(_ *model.App, index int) model.Men
func (m *DailyRecommendPlaylistsMenu) BeforeEnterMenuHook() model.Hook {
return func(main *model.Main) (bool, model.Page) {
if utils.CheckUserInfo(m.netease.user) == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
}

Expand All @@ -59,7 +59,7 @@ func (m *DailyRecommendPlaylistsMenu) BeforeEnterMenuHook() model.Hook {
code, response := recommendPlaylists.RecommendResource()
codeType := utils.CheckCode(code)
if codeType == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
} else if codeType != utils.Success {
return false, nil
Expand Down
4 changes: 2 additions & 2 deletions pkg/ui/menu_daily_recommend_songs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func (m *DailyRecommendSongsMenu) MenuViews() []model.MenuItem {
func (m *DailyRecommendSongsMenu) BeforeEnterMenuHook() model.Hook {
return func(main *model.Main) (bool, model.Page) {
if utils.CheckUserInfo(m.netease.user) == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
}

Expand All @@ -54,7 +54,7 @@ func (m *DailyRecommendSongsMenu) BeforeEnterMenuHook() model.Hook {
code, response := recommendSongs.RecommendSongs()
codeType := utils.CheckCode(code)
if codeType == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
} else if codeType != utils.Success {
return false, nil
Expand Down
8 changes: 4 additions & 4 deletions pkg/ui/menu_dj_sub_list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (m *DjSubListMenu) BeforeEnterMenuHook() model.Hook {
return func(main *model.Main) (bool, model.Page) {

if utils.CheckUserInfo(m.netease.user) == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
}

Expand All @@ -69,7 +69,7 @@ func (m *DjSubListMenu) BeforeEnterMenuHook() model.Hook {
code, response := djSublistService.DjSublist()
codeType := utils.CheckCode(code)
if codeType == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
} else if codeType != utils.Success {
return false, nil
Expand All @@ -95,7 +95,7 @@ func (m *DjSubListMenu) BottomOutHook() model.Hook {
m.offset += m.limit

if utils.CheckUserInfo(m.netease.user) == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
}

Expand All @@ -106,7 +106,7 @@ func (m *DjSubListMenu) BottomOutHook() model.Hook {
code, response := djSublistService.DjSublist()
codeType := utils.CheckCode(code)
if codeType == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
} else if codeType != utils.Success {
return false, nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/ui/menu_playlist_detail.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func (m *PlaylistDetailMenu) BeforeEnterMenuHook() model.Hook {
return func(main *model.Main) (bool, model.Page) {
codeType, songs := getSongsInPlaylist(m.playlistId, configs.ConfigRegistry.MainShowAllSongsOfPlaylist)
if codeType == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
} else if codeType != utils.Success {
return false, nil
Expand Down
4 changes: 2 additions & 2 deletions pkg/ui/menu_recent_songs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ func (m *RecentSongsMenu) MenuViews() []model.MenuItem {
func (m *RecentSongsMenu) BeforeEnterMenuHook() model.Hook {
return func(main *model.Main) (bool, model.Page) {
if utils.CheckUserInfo(m.netease.user) == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
}

recentSongService := service.RecordRecentSongsService{}
code, response := recentSongService.RecordRecentSongs()
codeType := utils.CheckCode(code)
if codeType == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
} else if codeType != utils.Success {
return false, nil
Expand Down
4 changes: 2 additions & 2 deletions pkg/ui/menu_user_playlist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (m *UserPlaylistMenu) BeforeEnterMenuHook() model.Hook {
return func(main *model.Main) (bool, model.Page) {
// 等于0，获取当前用户歌单
if m.userId == CurUser && utils.CheckUserInfo(m.netease.user) == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
}

Expand All @@ -100,7 +100,7 @@ func (m *UserPlaylistMenu) BeforeEnterMenuHook() model.Hook {

codeType, playlists, hasMore := getUserPlaylists(userId, m.limit, m.offset)
if codeType == utils.NeedLogin {
page, _ := m.netease.ToLoginPage(EnterMenuLoginCallback(main))
page, _ := m.netease.ToLoginPage(EnterMenuCallback(main))
return false, page
} else if codeType != utils.Success {
return false, nil
Expand Down

0 comments on commit 8765c96

Please sign in to comment.