From ee413a6352e6fbac146bdf34f470e480d69640fe Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 12 Oct 2022 09:10:39 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=A2=9E=E5=8A=A0=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E4=BB=A3=E7=A0=81=20js/css=20=E7=89=87=E6=AE=B5=20htt?= =?UTF-8?q?ps://github.com/siyuan-note/siyuan/issues/6143?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/conf.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/kernel/model/conf.go b/kernel/model/conf.go index 8c2997e07..af83ea920 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -667,20 +667,20 @@ func loadSnippets() { Snippets = []*conf.Snippet{} confPath := filepath.Join(util.DataDir, "snippets/conf.json") - var data []byte - var err error - - if gulu.File.IsExist(confPath) { - data, err = filelock.ReadFile(confPath) - if nil != err { - logging.LogErrorf("load js snippets failed: %s", err) - } else { - if err = gulu.JSON.UnmarshalJSON(data, &Snippets); nil != err { - logging.LogErrorf("unmarshal js snippets failed: %s", err) - } else { - logging.LogInfof("loaded js snippets [%d]", len(Snippets)) - } - } + if !gulu.File.IsExist(confPath) { + return } + + data, err := filelock.ReadFile(confPath) + if nil != err { + logging.LogErrorf("load js snippets failed: %s", err) + return + } + + if err = gulu.JSON.UnmarshalJSON(data, &Snippets); nil != err { + logging.LogErrorf("unmarshal js snippets failed: %s", err) + return + } + logging.LogInfof("loaded js snippets [%d]", len(Snippets)) return }