Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 00:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

✨ 增加公共代码 js/css 片段 https://github.com/siyuan-note/siyuan/issues/6143

Browse source
This commit is contained in:
Liang Ding 2022-10-12 09:09:18 +08:00
parent 2ccc988fb9
commit 75a173a6fd
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 5 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

33
kernel/model/conf.go
View file

@ -666,42 +666,19 @@ var Snippets []*conf.Snippet // js/css 代码片段配置
func loadSnippets() {
Snippets = []*conf.Snippet{}
jsonPath := filepath.Join(util.DataDir, "snippets/js.json")
confPath := filepath.Join(util.DataDir, "snippets/conf.json")
var data []byte
var err error
if gulu.File.IsExist(jsonPath) {
data, err = filelock.ReadFile(jsonPath)
if gulu.File.IsExist(confPath) {
data, err = filelock.ReadFile(confPath)
if nil != err {
logging.LogErrorf("load js snippets failed: %s", err)
} else {
var jsSnippets []*conf.Snippet
if err = gulu.JSON.UnmarshalJSON(data, &jsSnippets); nil != err {
if err = gulu.JSON.UnmarshalJSON(data, &Snippets); nil != err {
logging.LogErrorf("unmarshal js snippets failed: %s", err)
} else {
if count := len(jsSnippets); 0 < count {
Snippets = append(Snippets, jsSnippets...)
logging.LogInfof("loaded js snippets [%d]", count)
}
}
}
}
jsonPath = filepath.Join(util.DataDir, "snippets/css.json")
if gulu.File.IsExist(jsonPath) {
data, err = filelock.ReadFile(jsonPath)
if nil != err {
logging.LogErrorf("load css snippets failed: %s", err)
} else {
var cssSnippets []*conf.Snippet
if err = gulu.JSON.UnmarshalJSON(data, &cssSnippets); nil != err {
logging.LogErrorf("unmarshal css snippets failed: %s", err)
} else {
if count := len(cssSnippets); 0 < count {
Snippets = append(Snippets, cssSnippets...)
logging.LogInfof("loaded css snippets [%d]", count)
}
logging.LogInfof("loaded js snippets [%d]", len(Snippets))
}
}
}