Merge pull request #18 from seth-shi/feature/decode-content

add: 增加 base64 替换

Author: seth-shi

api/api_v2_replies.go

@@ -22,9 +22,9 @@ func (cli *v2exClient) GetReply(ctx context.Context, id int64, page int) tea.Cmd
 			return errorWrapper("回复", err)
 		}
 
+		res.Pagination.CurrPage = page
 		return messages.GetReplyResponse{
-			Data:     res,
-			CurrPage: page,
+			Data: res,
 		}
 	}
 }

api/internal/api_topics/api_v2.go

@@ -212,6 +212,7 @@ func (api *V2TopicApi) requestV2Topics(
 	// 如果返回了最大页数, 那么返回给前端, 方便后续缓存获取
 	api.cursorPageState.Store(nodeKey, apiPage)
 	// 存储分页信息
+	v2Res.Pagination.CurrPage = apiPage
 	api.nodePageInfoState.Store(nodeKey, v2Res.Pagination)
 
 	res := &v2Resp{

commands/loading.go

@@ -0,0 +1,63 @@
+package commands
+
+import (
+	"fmt"
+	"sync/atomic"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/seth-shi/go-v2ex/v2/messages"
+)
+
+var (
+	lastLoadingId        int64
+	LoadingGetToken      = newLoadingKey("token 获取中...")
+	LoadingMe            = newLoadingKey("个人信息获取中...")
+	LoadingRequestTopics = newLoadingKey("主题请求中...")
+	LoadingRequestDetail = newLoadingKey("内容获取中...")
+	LoadingRequestReply  = newLoadingKey("评论获取中...")
+	LoadingDecodeContent = newLoadingKey("内容解码中...")
+)
+
+type loadingManager struct {
+	start   messages.StartLoading
+	end     messages.EndLoading
+	loading atomic.Bool
+}
+
+func newLoadingKey(text string) loadingManager {
+	id := nextLoadingId()
+	return loadingManager{
+		start: messages.StartLoading{Text: text, ID: id},
+		end: messages.EndLoading{
+			ID: id,
+		},
+		loading: atomic.Bool{},
+	}
+}
+
+func (s *loadingManager) Run(cmd tea.Cmd) tea.Cmd {
+
+	// 加载中的时候, 发出错误
+	if s.loading.Load() {
+		return Post(fmt.Errorf("[%s]加载中", s.start.Text))
+	}
+
+	// 开始加载中
+	return tea.Sequence(
+		// 标记开始
+		func() tea.Msg {
+			s.loading.Store(true)
+			return s.start
+		},
+		cmd,
+		// 标记结束
+		func() tea.Msg {
+			s.loading.Store(false)
+			return s.end
+		},
+	)
+}
+
+func nextLoadingId() int {
+	return int(atomic.AddInt64(&lastLoadingId, 1))
+}

consts/keymap.go

@@ -1,7 +1,10 @@
 package consts
 
 import (
+	"fmt"
+
 	"github.com/charmbracelet/bubbles/key"
+	"github.com/seth-shi/go-v2ex/v2/styles"
 )
 
 type KeyMap struct {
@@ -34,7 +37,7 @@ func (k KeyMap) FullHelp() [][]key.Binding {
 		{
 			k.Up, k.Down, k.Left, k.Right,
 			k.Tab, k.ShiftTab,
-			k.KeyE, k.KeyQ, k.KeyR,
+			k.KeyQ, k.KeyE, k.KeyR,
 		}, // first column
 		{
 			k.CtrlQuit, k.HelpPage, k.SettingPage,
@@ -44,6 +47,13 @@ func (k KeyMap) FullHelp() [][]key.Binding {
 	}
 }
 
+var (
+	topicPageTitle   = styles.Active.Bold(true).Render("[主题页]")
+	allPageTitle     = styles.Active.Underline(true).Render("[任意页]")
+	detailPageTitle  = styles.Err.Bold(true).Render("[详情页]")
+	settingPageTitle = styles.Err.Underline(true).Render("[配置页]")
+)
+
 // AppKeyMap
 // vim key bind style : https://github.com/philc/vimium#keyboard-bindings
 // ?       show the help dialog for a list of all available keys
@@ -54,66 +64,66 @@ func (k KeyMap) FullHelp() [][]key.Binding {
 var AppKeyMap = KeyMap{
 	Up: key.NewBinding(
 		key.WithKeys("w", "up", "k"),
-		key.WithHelp("w/↑", "[主题页]列表上一个"),
+		key.WithHelp("w/↑", fmt.Sprintf("%s列表上一个", topicPageTitle)),
 	),
 	Down: key.NewBinding(
 		key.WithKeys("s", "down", "j"),
-		key.WithHelp("s/↓", "[主题页]列表下一个"),
+		key.WithHelp("s/↓", fmt.Sprintf("%s列表下一个", topicPageTitle)),
 	),
 	Left: key.NewBinding(
 		key.WithKeys("a", "left", "h"),
-		key.WithHelp("a/←", "[主题页]上一页"),
+		key.WithHelp("a/←", fmt.Sprintf("%s上一页", topicPageTitle)),
 	),
 	Right: key.NewBinding(
 		key.WithKeys("d", "right", "l"),
-		key.WithHelp("d/→", "[主题页]下一页"),
+		key.WithHelp("d/→", fmt.Sprintf("%s下一页", topicPageTitle)),
 	),
 	KeyQ: key.NewBinding(
 		key.WithKeys("q", "H"),
-		key.WithHelp("q", "返回上一页"),
+		key.WithHelp("q", fmt.Sprintf("%s返回上一页", allPageTitle)),
 	),
 	HelpPage: key.NewBinding(
 		key.WithKeys("?"),
-		key.WithHelp("?", "查看帮助页面(再按一次返回首页)"),
+		key.WithHelp("?", fmt.Sprintf("%s查看帮助页面(再按一次返回首页)", allPageTitle)),
 	),
 	SettingPage: key.NewBinding(
 		key.WithKeys("`"),
-		key.WithHelp("`", "[反引号]进入配置页面(再按一次返回首页)"),
+		key.WithHelp("`", fmt.Sprintf("%s反引号:查看帮助页面(再按一次返回首页)", allPageTitle)),
 	),
 	Tab: key.NewBinding(
 		key.WithKeys("tab"),
-		key.WithHelp("tab", "[主题页]下一个节点"),
-	),
-	Space: key.NewBinding(
-		key.WithKeys(" "),
-		key.WithHelp("空格", "老板键"),
+		key.WithHelp("tab", fmt.Sprintf("%s下一个节点", topicPageTitle)),
 	),
 	ShiftTab: key.NewBinding(
 		key.WithKeys("shift+tab"),
-		key.WithHelp("shift+tab", "[主题页]上一个切点"),
+		key.WithHelp("shift+tab", fmt.Sprintf("%s上一个切点", topicPageTitle)),
+	),
+	Space: key.NewBinding(
+		key.WithKeys(" "),
+		key.WithHelp("空格", fmt.Sprintf("%s老板键", allPageTitle)),
 	),
 	CtrlQuit: key.NewBinding(
 		key.WithKeys("esc", "ctrl+c"),
-		key.WithHelp("esc", "退出程序"),
-	),
-	KeyE: key.NewBinding(
-		key.WithKeys("e", "enter", "o"),
-		key.WithHelp("e/enter", "[主题页]查看主题详情 / [详情页]加载评论"),
+		key.WithHelp("esc", fmt.Sprintf("%s退出程序", allPageTitle)),
 	),
 	SwitchShowMode: key.NewBinding(
 		key.WithKeys("="),
-		key.WithHelp("=", "[等于号]切换底部显示隐藏"),
+		key.WithHelp("=", fmt.Sprintf("%s等于号:切换底部显示隐藏", allPageTitle)),
+	),
+	KeyE: key.NewBinding(
+		key.WithKeys("e", "enter", "o"),
+		key.WithHelp("e/enter", fmt.Sprintf("%s查看主题详情 / %s加载评论", topicPageTitle, detailPageTitle)),
 	),
 	KeyR: key.NewBinding(
 		key.WithKeys("r"),
-		key.WithHelp("r", "[主题页]切换接口版本 / [详情页]加载图片"),
+		key.WithHelp("r", fmt.Sprintf("%s切换接口版本 / %s解码内容(图片/base64)", topicPageTitle, detailPageTitle)),
 	),
 	UpgradeApp: key.NewBinding(
-		key.WithKeys("ctrl+u"),
-		key.WithHelp("ctrl+u", "更新应用(需要网络可以访问 github)"),
+		key.WithKeys("u"),
+		key.WithHelp("u", fmt.Sprintf("%s更新应用", allPageTitle)),
 	),
 	F1: key.NewBinding(
 		key.WithKeys("f1"),
-		key.WithHelp("f1", "[详情页]打开链接 / [配置页]打开配置文件"),
+		key.WithHelp("f1", fmt.Sprintf("%s浏览器打开 / %s打开配置文件", topicPageTitle, settingPageTitle)),
 	),
 }

messages/detail.go

@@ -13,14 +13,13 @@ type GetDetailResponse struct {
 }
 
 type GetReplyResponse struct {
-	Data     response.V2ReplyResponse
-	CurrPage int
+	Data response.V2ReplyResponse
 }
 
-type GetImageRequest struct {
-	URL []string
+type DecodeDetailContentResult struct {
+	Result map[string]string
 }
 
-type GetImageResult struct {
-	Result map[string]string
+type RenderDetailContentResult struct {
+	Content string
 }

messages/loading.go

@@ -1,32 +1,5 @@
 package messages
 
-import (
-	"sync/atomic"
-
-	tea "github.com/charmbracelet/bubbletea"
-)
-
-var (
-	lastLoadingId        int64
-	LoadingGetToken      = newLoadingKey("获取 token 信息中")
-	LoadingMe            = newLoadingKey("获取个人信息中")
-	LoadingRequestTopics = newLoadingKey("获取主题中")
-	LoadingRequestDetail = newLoadingKey("获取内容中")
-	LoadingRequestReply  = newLoadingKey("获取评论中")
-	LoadingRequestImage  = newLoadingKey("获取图片中")
-)
-
-func newLoadingKey(text string) loadingManager {
-	id := nextLoadingId()
-	return loadingManager{
-		start: StartLoading{Text: text, ID: id},
-		end: EndLoading{
-			ID: id,
-		},
-		loading: atomic.Bool{},
-	}
-}
-
 type StartLoading struct {
 	Text string
 	ID   int
@@ -35,36 +8,3 @@ type StartLoading struct {
 type EndLoading struct {
 	ID int
 }
-
-func (s *loadingManager) PostStart() tea.Cmd {
-
-	if s.loading.Load() {
-		return nil
-	}
-
-	return func() tea.Msg {
-		s.loading.Store(true)
-		return s.start
-	}
-}
-
-func (s *loadingManager) Loading() bool {
-	return s.loading.Load()
-}
-
-func (s *loadingManager) PostEnd() tea.Cmd {
-	return func() tea.Msg {
-		s.loading.Store(false)
-		return s.end
-	}
-}
-
-type loadingManager struct {
-	start   StartLoading
-	end     EndLoading
-	loading atomic.Bool
-}
-
-func nextLoadingId() int {
-	return int(atomic.AddInt64(&lastLoadingId, 1))
-}

pages/boss.go

@@ -65,8 +65,6 @@ func (m bossPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
 		switch {
-		case key.Matches(msg, consts.AppKeyMap.KeyQ):
-			return m, commands.RedirectPop()
 		case key.Matches(msg, consts.AppKeyMap.F1):
 			return m, func() tea.Msg {
 				return g.Config.Save(