mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-06 11:11:35 +08:00

* 🎨 bazaar resource directories support symlink * 🎨 bazaar resource directories support symlink * Squashed commit of the following: commita335101d49
Author: Liang Ding <d@b3log.org> Date: Tue May 16 12:53:33 2023 +0800 🔖 Release v2.8.8 commit6a6dec05f3
Author: Liang Ding <d@b3log.org> Date: Tue May 16 11:30:33 2023 +0800 📝 Update changelogs commita819656c0a
Author: Liang Ding <d@b3log.org> Date: Tue May 16 11:15:53 2023 +0800 📝 Update changelogs commit56a2c368d9
Author: Liang Ding <d@b3log.org> Date: Tue May 16 11:11:54 2023 +0800 🐛 Remove inconsistent scroll IAL commit8b6abec8e9
Author: Liang Ding <d@b3log.org> Date: Tue May 16 10:39:48 2023 +0800 🎨 Bazaar resource directories support symlink https://github.com/siyuan-note/siyuan/pull/8263 commit9455086820
Author: Liang Ding <d@b3log.org> Date: Tue May 16 10:35:46 2023 +0800 📝 Update changelogs commitfdbfe6b848
Author: 颖逸 <49649786+Zuoqiu-Yingyi@users.noreply.github.com> Date: Tue May 16 10:34:38 2023 +0800 Bazaar resource directories support symlink (#8263) * 🎨 bazaar resource directories support symlink * 🎨 bazaar resource directories support symlink commit85496345ef
Author: Vanessa <lly219@gmail.com> Date: Tue May 16 10:31:01 2023 +0800 ✨ enable plugin commitf3d1acd166
Author: Liang Ding <d@b3log.org> Date: Tue May 16 09:39:01 2023 +0800 📝 Update changelogs commitbf4b88a007
Author: Liang Ding <d@b3log.org> Date: Tue May 16 09:38:50 2023 +0800 🎨 Plugin hot load commit516276db49
Author: Liang Ding <d@b3log.org> Date: Tue May 16 09:09:31 2023 +0800 🎨 Data sync connectivity check supports redirection Fix https://github.com/siyuan-note/siyuan/issues/8264 commitd24f5ae3cf
Author: Vanessa <lly219@gmail.com> Date: Tue May 16 00:05:18 2023 +0800 🚨 commit1ac623ebb1
Author: Vanessa <lly219@gmail.com> Date: Tue May 16 00:04:25 2023 +0800 🎨 fix https://github.com/siyuan-note/siyuan/issues/8258 commitfdf9f0d9e4
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 22:33:36 2023 +0800 🎨 https://github.com/siyuan-note/siyuan/issues/5066 removeData commit7c7f3db0b8
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 22:26:11 2023 +0800 🐛 fix https://github.com/siyuan-note/siyuan/issues/8259 commitba4e5e8eed
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 19:59:13 2023 +0800 💄 fix https://github.com/siyuan-note/siyuan/issues/8260 commit4f099bd990
Merge:b892fadd
856c7e09
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 19:35:33 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commitb892fadd19
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 19:35:19 2023 +0800 💄 commit856c7e0973
Author: Liang Ding <d@b3log.org> Date: Mon May 15 18:48:33 2023 +0800 📝 Improve initialization data sync interaction https://github.com/siyuan-note/siyuan/issues/8220 commitab6cb335e4
Author: Liang Ding <d@b3log.org> Date: Mon May 15 18:41:51 2023 +0800 📝 Improve initialization data sync interaction https://github.com/siyuan-note/siyuan/issues/8220 commita759936208
Author: Liang Ding <d@b3log.org> Date: Mon May 15 16:02:58 2023 +0800 📝 Improve initialization data sync interaction https://github.com/siyuan-note/siyuan/issues/8220 commit2513cbc31d
Author: Liang Ding <d@b3log.org> Date: Mon May 15 15:53:46 2023 +0800 📝 Improve initialization data sync interaction https://github.com/siyuan-note/siyuan/issues/8220 commit9a03f1e736
Author: Liang Ding <d@b3log.org> Date: Mon May 15 15:52:00 2023 +0800 📝 Update changelogs commit4cb952361e
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 15:51:31 2023 +0800 🎨 https://github.com/siyuan-note/siyuan/issues/8220 commit7d58ab0607
Merge:6ca68174
0a102851
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 15:43:33 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit6ca6817465
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 15:43:16 2023 +0800 🎨 https://github.com/siyuan-note/siyuan/issues/8220 commit0a10285167
Author: Liang Ding <d@b3log.org> Date: Mon May 15 14:56:12 2023 +0800 🎨 Escape the notification message https://github.com/siyuan-note/siyuan/issues/7811 commit7dbfa43de4
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 13:59:50 2023 +0800 🎨 https://github.com/siyuan-note/siyuan/issues/8220 commit15141dde1f
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 13:54:30 2023 +0800 🎨 https://github.com/siyuan-note/siyuan/issues/8220 commitdc1941da3c
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 12:11:45 2023 +0800 🎨 catch plugin load commite7288185be
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 12:04:22 2023 +0800 🎨 catch plugin load commit6690084caa
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 11:46:51 2023 +0800 🎨 fix https://github.com/siyuan-note/siyuan/issues/8256 commit53a95ffbf7
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 00:27:27 2023 +0800 💄 account commit4c7fe248e4
Merge:3674e834
2cf8a819
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 00:11:08 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit3674e83428
Author: Vanessa <lly219@gmail.com> Date: Mon May 15 00:10:46 2023 +0800 💄 account commit2cf8a8191a
Author: Liang Ding <d@b3log.org> Date: Sun May 14 23:21:32 2023 +0800 🎨 Improve images render in the marketplace package https://github.com/siyuan-note/bazaar/issues/1119 commit7572db4012
Author: Vanessa <lly219@gmail.com> Date: Sun May 14 12:10:47 2023 +0800 🎨 fix https://github.com/siyuan-note/siyuan/issues/8216 commit18071638cf
Author: Vanessa <lly219@gmail.com> Date: Sun May 14 12:09:52 2023 +0800 🎨 fix https://github.com/siyuan-note/siyuan/issues/8216 commit300a60aa45
Merge:0b001595
a6ecb981
Author: Vanessa <lly219@gmail.com> Date: Sun May 14 11:50:55 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit0b00159511
Author: Vanessa <lly219@gmail.com> Date: Sun May 14 11:50:41 2023 +0800 🐛 open new window commita6ecb981b2
Author: Liang Ding <d@b3log.org> Date: Sun May 14 11:43:54 2023 +0800 🎨 Sponsorship through the Open Collective is no longer supported commit6c3c8d44ad
Author: Liang Ding <d@b3log.org> Date: Sun May 14 10:44:39 2023 +0800 🎨 When multiple windows exist, each window should be isolated using the `Optimize Typesetting` https://github.com/siyuan-note/siyuan/issues/8216 commit3edd8230d3
Author: Vanessa <lly219@gmail.com> Date: Sun May 14 10:34:48 2023 +0800 🎨 https://github.com/siyuan-note/siyuan/issues/8216 commitf8412a49c4
Author: Vanessa <lly219@gmail.com> Date: Sun May 14 10:27:16 2023 +0800 🐛 fix https://github.com/siyuan-note/siyuan/issues/8187 commita74ee348f7
Author: Vanessa <lly219@gmail.com> Date: Sun May 14 10:17:43 2023 +0800 🎨 fix https://github.com/siyuan-note/siyuan/issues/8242 commit518ce94912
Author: Vanessa <lly219@gmail.com> Date: Sun May 14 10:09:11 2023 +0800 💄 bazaar commite6923bdebc
Author: Vanessa <lly219@gmail.com> Date: Sun May 14 09:55:50 2023 +0800 🎨 https://github.com/siyuan-note/siyuan/issues/8245?utm_source=ld246.com * 🎨 widgets search support symlink directory * 🎨 templates directory support symlink * Update template.go
336 lines
9.5 KiB
Go
336 lines
9.5 KiB
Go
// SiYuan - Build Your Eternal Digital Garden
|
|
// Copyright (c) 2020-present, b3log.org
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
package model
|
|
|
|
import (
|
|
"bytes"
|
|
"errors"
|
|
"fmt"
|
|
"io/fs"
|
|
"os"
|
|
"path/filepath"
|
|
"sort"
|
|
"strings"
|
|
"text/template"
|
|
"time"
|
|
|
|
"github.com/88250/gulu"
|
|
"github.com/88250/lute/ast"
|
|
"github.com/88250/lute/parse"
|
|
"github.com/88250/lute/render"
|
|
sprig "github.com/Masterminds/sprig/v3"
|
|
"github.com/araddon/dateparse"
|
|
"github.com/siyuan-note/filelock"
|
|
"github.com/siyuan-note/logging"
|
|
"github.com/siyuan-note/siyuan/kernel/search"
|
|
"github.com/siyuan-note/siyuan/kernel/sql"
|
|
"github.com/siyuan-note/siyuan/kernel/treenode"
|
|
"github.com/siyuan-note/siyuan/kernel/util"
|
|
)
|
|
|
|
func RenderGoTemplate(templateContent string) (ret string, err error) {
|
|
tpl, err := template.New("").Funcs(sprig.TxtFuncMap()).Parse(templateContent)
|
|
if nil != err {
|
|
return "", errors.New(fmt.Sprintf(Conf.Language(44), err.Error()))
|
|
}
|
|
|
|
buf := &bytes.Buffer{}
|
|
buf.Grow(4096)
|
|
err = tpl.Execute(buf, nil)
|
|
if nil != err {
|
|
return "", errors.New(fmt.Sprintf(Conf.Language(44), err.Error()))
|
|
}
|
|
ret = buf.String()
|
|
return
|
|
}
|
|
|
|
func RemoveTemplate(p string) (err error) {
|
|
err = filelock.Remove(p)
|
|
if nil != err {
|
|
logging.LogErrorf("remove template failed: %s", err)
|
|
}
|
|
return
|
|
}
|
|
|
|
func SearchTemplate(keyword string) (ret []*Block) {
|
|
ret = []*Block{}
|
|
|
|
templates := filepath.Join(util.DataDir, "templates")
|
|
if !util.IsPathRegularDirOrSymlinkDir(templates) {
|
|
return
|
|
}
|
|
|
|
groups, err := os.ReadDir(templates)
|
|
if nil != err {
|
|
logging.LogErrorf("read templates failed: %s", err)
|
|
return
|
|
}
|
|
|
|
sort.Slice(ret, func(i, j int) bool {
|
|
return util.PinYinCompare(filepath.Base(groups[i].Name()), filepath.Base(groups[j].Name()))
|
|
})
|
|
|
|
k := strings.ToLower(keyword)
|
|
for _, group := range groups {
|
|
if strings.HasPrefix(group.Name(), ".") {
|
|
continue
|
|
}
|
|
|
|
if group.IsDir() {
|
|
var templateBlocks []*Block
|
|
templateDir := filepath.Join(templates, group.Name())
|
|
// filepath.Walk 与 filepath.WalkDir 均不支持跟踪符号链接
|
|
filepath.WalkDir(templateDir, func(path string, entry fs.DirEntry, err error) error {
|
|
name := strings.ToLower(entry.Name())
|
|
if strings.HasPrefix(name, ".") {
|
|
if entry.IsDir() {
|
|
return filepath.SkipDir
|
|
}
|
|
return nil
|
|
}
|
|
|
|
if !strings.HasSuffix(name, ".md") || strings.HasPrefix(name, "readme") || !strings.Contains(name, k) {
|
|
return nil
|
|
}
|
|
|
|
content := strings.TrimPrefix(path, templates)
|
|
content = strings.TrimSuffix(content, ".md")
|
|
content = filepath.ToSlash(content)
|
|
content = strings.TrimPrefix(content, "/")
|
|
_, content = search.MarkText(content, keyword, 32, Conf.Search.CaseSensitive)
|
|
b := &Block{Path: path, Content: content}
|
|
templateBlocks = append(templateBlocks, b)
|
|
return nil
|
|
})
|
|
sort.Slice(templateBlocks, func(i, j int) bool {
|
|
return util.PinYinCompare(filepath.Base(templateBlocks[i].Path), filepath.Base(templateBlocks[j].Path))
|
|
})
|
|
ret = append(ret, templateBlocks...)
|
|
} else {
|
|
name := strings.ToLower(group.Name())
|
|
if strings.HasPrefix(name, ".") || !strings.HasSuffix(name, ".md") || "readme.md" == name || !strings.Contains(name, k) {
|
|
continue
|
|
}
|
|
|
|
content := group.Name()
|
|
content = strings.TrimSuffix(content, ".md")
|
|
content = filepath.ToSlash(content)
|
|
_, content = search.MarkText(content, keyword, 32, Conf.Search.CaseSensitive)
|
|
b := &Block{Path: filepath.Join(templates, group.Name()), Content: content}
|
|
ret = append(ret, b)
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func DocSaveAsTemplate(id, name string, overwrite bool) (code int, err error) {
|
|
bt := treenode.GetBlockTree(id)
|
|
if nil == bt {
|
|
return
|
|
}
|
|
|
|
tree := prepareExportTree(bt)
|
|
addBlockIALNodes(tree, true)
|
|
|
|
luteEngine := NewLute()
|
|
formatRenderer := render.NewFormatRenderer(tree, luteEngine.RenderOptions)
|
|
md := formatRenderer.Render()
|
|
name = util.FilterFileName(name) + ".md"
|
|
name = util.TruncateLenFileName(name)
|
|
savePath := filepath.Join(util.DataDir, "templates", name)
|
|
if gulu.File.IsExist(savePath) {
|
|
if !overwrite {
|
|
code = 1
|
|
return
|
|
}
|
|
}
|
|
|
|
err = filelock.WriteFile(savePath, md)
|
|
return
|
|
}
|
|
|
|
func RenderTemplate(p, id string) (string, error) {
|
|
return renderTemplate(p, id)
|
|
}
|
|
|
|
func renderTemplate(p, id string) (string, error) {
|
|
tree, err := loadTreeByBlockID(id)
|
|
if nil != err {
|
|
return "", err
|
|
}
|
|
|
|
node := treenode.GetNodeInTree(tree, id)
|
|
if nil == node {
|
|
return "", ErrBlockNotFound
|
|
}
|
|
block := sql.BuildBlockFromNode(node, tree)
|
|
md, err := os.ReadFile(p)
|
|
if nil != err {
|
|
return "", err
|
|
}
|
|
|
|
dataModel := map[string]string{}
|
|
var titleVar string
|
|
if nil != block {
|
|
titleVar = block.Name
|
|
if "d" == block.Type {
|
|
titleVar = block.Content
|
|
}
|
|
dataModel["title"] = titleVar
|
|
dataModel["id"] = block.ID
|
|
dataModel["name"] = block.Name
|
|
dataModel["alias"] = block.Alias
|
|
}
|
|
|
|
funcMap := sprig.TxtFuncMap()
|
|
funcMap["queryBlocks"] = func(stmt string, args ...string) (ret []*sql.Block) {
|
|
for _, arg := range args {
|
|
stmt = strings.Replace(stmt, "?", arg, 1)
|
|
}
|
|
ret = sql.SelectBlocksRawStmt(stmt, 1, Conf.Search.Limit)
|
|
return
|
|
}
|
|
funcMap["querySpans"] = func(stmt string, args ...string) (ret []*sql.Span) {
|
|
for _, arg := range args {
|
|
stmt = strings.Replace(stmt, "?", arg, 1)
|
|
}
|
|
ret = sql.SelectSpansRawStmt(stmt, Conf.Search.Limit)
|
|
return
|
|
}
|
|
funcMap["parseTime"] = func(dateStr string) time.Time {
|
|
now := time.Now()
|
|
ret, err := dateparse.ParseIn(dateStr, now.Location())
|
|
if nil != err {
|
|
logging.LogWarnf("parse date [%s] failed [%s], return current time instead", dateStr, err)
|
|
return now
|
|
}
|
|
return ret
|
|
}
|
|
|
|
goTpl := template.New("").Delims(".action{", "}")
|
|
tpl, err := goTpl.Funcs(funcMap).Parse(gulu.Str.FromBytes(md))
|
|
if nil != err {
|
|
return "", errors.New(fmt.Sprintf(Conf.Language(44), err.Error()))
|
|
}
|
|
|
|
buf := &bytes.Buffer{}
|
|
buf.Grow(4096)
|
|
if err = tpl.Execute(buf, dataModel); nil != err {
|
|
return "", errors.New(fmt.Sprintf(Conf.Language(44), err.Error()))
|
|
}
|
|
md = buf.Bytes()
|
|
tree = parseKTree(md)
|
|
if nil == tree {
|
|
msg := fmt.Sprintf("parse tree [%s] failed", p)
|
|
logging.LogErrorf(msg)
|
|
return "", errors.New(msg)
|
|
}
|
|
|
|
var nodesNeedAppendChild, unlinks []*ast.Node
|
|
ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
|
|
if !entering {
|
|
return ast.WalkContinue
|
|
}
|
|
|
|
if "" != n.ID {
|
|
// 重新生成 ID
|
|
n.ID = ast.NewNodeID()
|
|
n.SetIALAttr("id", n.ID)
|
|
}
|
|
|
|
if (ast.NodeListItem == n.Type && (nil == n.FirstChild ||
|
|
(3 == n.ListData.Typ && (nil == n.FirstChild.Next || ast.NodeKramdownBlockIAL == n.FirstChild.Next.Type)))) ||
|
|
(ast.NodeBlockquote == n.Type && nil != n.FirstChild && nil != n.FirstChild.Next && ast.NodeKramdownBlockIAL == n.FirstChild.Next.Type) {
|
|
nodesNeedAppendChild = append(nodesNeedAppendChild, n)
|
|
}
|
|
|
|
// 块引缺失锚文本情况下自动补全 https://github.com/siyuan-note/siyuan/issues/6087
|
|
if n.IsTextMarkType("block-ref") {
|
|
if refText := n.Text(); "" == refText {
|
|
refText = sql.GetRefText(n.TextMarkBlockRefID)
|
|
if "" != refText {
|
|
treenode.SetDynamicBlockRefText(n, refText)
|
|
} else {
|
|
unlinks = append(unlinks, n)
|
|
}
|
|
}
|
|
}
|
|
return ast.WalkContinue
|
|
})
|
|
for _, n := range nodesNeedAppendChild {
|
|
if ast.NodeBlockquote == n.Type {
|
|
n.FirstChild.InsertAfter(treenode.NewParagraph())
|
|
} else {
|
|
n.AppendChild(treenode.NewParagraph())
|
|
}
|
|
}
|
|
for _, n := range unlinks {
|
|
n.Unlink()
|
|
}
|
|
|
|
// 折叠标题导出为模板后使用会出现内容重复 https://github.com/siyuan-note/siyuan/issues/4488
|
|
ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
|
|
if !entering {
|
|
return ast.WalkContinue
|
|
}
|
|
|
|
if "1" == n.IALAttr("heading-fold") { // 为标题折叠下方块添加属性,前端渲染以后会统一做移除处理
|
|
n.SetIALAttr("status", "temp")
|
|
}
|
|
return ast.WalkContinue
|
|
})
|
|
|
|
luteEngine := NewLute()
|
|
dom := luteEngine.Tree2BlockDOM(tree, luteEngine.RenderOptions)
|
|
return dom, nil
|
|
}
|
|
|
|
func addBlockIALNodes(tree *parse.Tree, removeUpdated bool) {
|
|
var blocks []*ast.Node
|
|
ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
|
|
if !entering || !n.IsBlock() {
|
|
return ast.WalkContinue
|
|
}
|
|
|
|
if ast.NodeBlockQueryEmbed == n.Type {
|
|
if script := n.ChildByType(ast.NodeBlockQueryEmbedScript); nil != script {
|
|
script.Tokens = bytes.ReplaceAll(script.Tokens, []byte("\n"), []byte(" "))
|
|
}
|
|
} else if ast.NodeHTMLBlock == n.Type {
|
|
n.Tokens = bytes.TrimSpace(n.Tokens)
|
|
// 使用 <div> 包裹,否则后续解析时会识别为行级 HTML https://github.com/siyuan-note/siyuan/issues/4244
|
|
if !bytes.HasPrefix(n.Tokens, []byte("<div>")) {
|
|
n.Tokens = append([]byte("<div>\n"), n.Tokens...)
|
|
}
|
|
if !bytes.HasSuffix(n.Tokens, []byte("</div>")) {
|
|
n.Tokens = append(n.Tokens, []byte("\n</div>")...)
|
|
}
|
|
}
|
|
|
|
if removeUpdated {
|
|
n.RemoveIALAttr("updated")
|
|
}
|
|
if 0 < len(n.KramdownIAL) {
|
|
blocks = append(blocks, n)
|
|
}
|
|
return ast.WalkContinue
|
|
})
|
|
for _, block := range blocks {
|
|
block.InsertAfter(&ast.Node{Type: ast.NodeKramdownBlockIAL, Tokens: parse.IAL2Tokens(block.KramdownIAL)})
|
|
}
|
|
}
|