Merge pull request #8 from seth-shi/feature/more

add: 加载配置

Author: seth-shi

commands/config.go

@@ -18,16 +18,18 @@ func LoadConfig() tea.Cmd {
 		bf, err := os.ReadFile(model.ConfigPath())
 		if err != nil {
 			if !errors.Is(err, os.ErrNotExist) {
-				return err
+				return messages.LoadConfigResult{Result: cfg, Err: err}
 			}
 		}
 
-		err = json.Unmarshal(bf, &cfg)
-		if err != nil {
-			return err
+		if bf != nil {
+			err = json.Unmarshal(bf, &cfg)
+			if err != nil {
+				return messages.LoadConfigResult{Result: cfg, Err: err}
+			}
+			g.Config.Set(cfg)
 		}
 
-		// TODO 保存配置生效
 		return messages.LoadConfigResult{Result: cfg}
 	}
 }

messages/config.go

@@ -6,4 +6,5 @@ import (
 
 type LoadConfigResult struct {
 	Result *model.FileConfig
+	Err    error
 }

model/safe.go

@@ -24,6 +24,12 @@ func (s *Safe[T]) Get() T {
 	return s.data
 }
 
+func (s *Safe[T]) Set(v T) {
+	s.locker.Lock()
+	s.locker.Unlock()
+	s.data = v
+}
+
 func (s *Safe[T]) Update(fn func(T)) {
 	s.locker.Lock()
 	s.locker.Unlock()

pages/splash.go

@@ -7,7 +7,6 @@ import (
 	"github.com/seth-shi/go-v2ex/api"
 	"github.com/seth-shi/go-v2ex/commands"
 	"github.com/seth-shi/go-v2ex/messages"
-	"github.com/seth-shi/go-v2ex/model"
 	"github.com/seth-shi/go-v2ex/pkg"
 )
 
@@ -29,21 +28,23 @@ func (m splashPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	switch msg := msg.(type) {
 	case messages.LoadConfigResult:
-		return m.onConfigResult(msg.Result)
+		return m.onConfigResult(msg)
 	}
 
 	return m, nil
 }
 
-func (m splashPage) onConfigResult(conf *model.FileConfig) (tea.Model, tea.Cmd) {
+func (m splashPage) onConfigResult(msg messages.LoadConfigResult) (tea.Model, tea.Cmd) {
 
+	conf := msg.Result
 	pkg.SetupLogger(conf)
 	api.SetUpHttpClient(conf)
 	pkg.SetUpImageHttpClient(conf)
 
 	// 把配置注入到其他页面
 	var cmds = []tea.Cmd{
 		// 检查版本更新
+		commands.AlertError(msg.Err),
 		commands.Post(messages.CheckUpgradeAppRequest{}),
 	}