From e3eff40e5637fb184e6433b4645fdebebd85b2c9 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 27 Oct 2022 11:30:04 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=AF=E6=8C=81=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=AE=BE=E7=BD=AE=E4=BB=A3=E7=A0=81=E7=89=87?= =?UTF-8?q?=E6=AE=B5=20https://github.com/siyuan-note/siyuan/issues/6357?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/api/snippet.go | 6 ++++-- kernel/model/snippet.go | 11 ++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/kernel/api/snippet.go b/kernel/api/snippet.go index 90eb6b2a0..6a67b3ddb 100644 --- a/kernel/api/snippet.go +++ b/kernel/api/snippet.go @@ -126,9 +126,11 @@ func removeSnippet(c *gin.Context) { } id := arg["id"].(string) - if err := model.RemoveSnippet(id); nil != err { + snippet, err := model.RemoveSnippet(id) + if nil != err { ret.Code = -1 ret.Msg = "remove snippet failed: " + err.Error() return } -} \ No newline at end of file + ret.Data = snippet +} diff --git a/kernel/model/snippet.go b/kernel/model/snippet.go index 55987cded..d4f66ab06 100644 --- a/kernel/model/snippet.go +++ b/kernel/model/snippet.go @@ -29,7 +29,7 @@ import ( var snippetsLock = sync.Mutex{} -func RemoveSnippet(id string) (err error) { +func RemoveSnippet(id string) (ret *conf.Snippet, err error) { snippetsLock.Lock() defer snippetsLock.Unlock() @@ -40,6 +40,7 @@ func RemoveSnippet(id string) (err error) { for i, s := range snippets { if s.ID == id { + ret = s snippets = append(snippets[:i], snippets[i+1:]...) break } @@ -48,7 +49,7 @@ func RemoveSnippet(id string) (err error) { return } -func SetSnippet(id, name, typ, content string, enabled bool) (snippet *conf.Snippet, err error) { +func SetSnippet(id, name, typ, content string, enabled bool) (ret *conf.Snippet, err error) { snippetsLock.Lock() defer snippetsLock.Unlock() @@ -64,15 +65,15 @@ func SetSnippet(id, name, typ, content string, enabled bool) (snippet *conf.Snip s.Type = typ s.Content = content s.Enabled = enabled - snippet = s + ret = s isUpdate = true break } } if !isUpdate { - snippet = &conf.Snippet{ID: id, Name: name, Type: typ, Content: content, Enabled: enabled} - snippets = append(snippets, snippet) + ret = &conf.Snippet{ID: id, Name: name, Type: typ, Content: content, Enabled: enabled} + snippets = append(snippets, ret) } err = writeSnippetsConf(snippets) return