From b84c444c55b23ea08be5a7aed49f7e92fc7906d6 Mon Sep 17 00:00:00 2001 From: Jacky Date: Sat, 12 Apr 2025 01:51:28 +0000 Subject: [PATCH] fix(config): integrate SyncNodeIds and SyncOverwrite into Config struct --- api/config/get.go | 26 +++++++++----------------- api/config/modify.go | 2 ++ internal/config/config.go | 2 ++ 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/api/config/get.go b/api/config/get.go index cd1b0d94..6bf8d155 100644 --- a/api/config/get.go +++ b/api/config/get.go @@ -15,12 +15,6 @@ import ( "github.com/uozi-tech/cosy" ) -type APIConfigResp struct { - config.Config - SyncNodeIds []uint64 `json:"sync_node_ids" gorm:"serializer:json"` - SyncOverwrite bool `json:"sync_overwrite"` -} - func GetConfig(c *gin.Context) { relativePath := c.Param("path") @@ -74,16 +68,14 @@ func GetConfig(c *gin.Context) { return } - c.JSON(http.StatusOK, APIConfigResp{ - Config: config.Config{ - Name: stat.Name(), - Content: string(content), - ChatGPTMessages: chatgpt.Content, - FilePath: absPath, - ModifiedAt: stat.ModTime(), - Dir: filepath.Dir(relativePath), - }, - SyncNodeIds: cfg.SyncNodeIds, - SyncOverwrite: cfg.SyncOverwrite, + c.JSON(http.StatusOK, config.Config{ + Name: stat.Name(), + Content: string(content), + ChatGPTMessages: chatgpt.Content, + FilePath: absPath, + ModifiedAt: stat.ModTime(), + Dir: filepath.Dir(relativePath), + SyncNodeIds: cfg.SyncNodeIds, + SyncOverwrite: cfg.SyncOverwrite, }) } diff --git a/api/config/modify.go b/api/config/modify.go index 48ce1901..09987f26 100644 --- a/api/config/modify.go +++ b/api/config/modify.go @@ -101,5 +101,7 @@ func EditConfig(c *gin.Context) { FilePath: absPath, ModifiedAt: time.Now(), Dir: filepath.Dir(relativePath), + SyncNodeIds: cfg.SyncNodeIds, + SyncOverwrite: cfg.SyncOverwrite, }) } diff --git a/internal/config/config.go b/internal/config/config.go index b76d5cc0..f200ca3d 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -28,4 +28,6 @@ type Config struct { Status ConfigStatus `json:"status"` Dir string `json:"dir"` Urls []string `json:"urls,omitempty"` + SyncNodeIds []uint64 `json:"sync_node_ids,omitempty"` + SyncOverwrite bool `json:"sync_overwrite"` }