0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-02-02 15:34:09 +08:00
commit 197b005dad
4 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -6,7 +6,7 @@ require (
github.com/88250/clipboard v0.1.5
github.com/88250/css v0.1.2
github.com/88250/gulu v1.2.3-0.20221117052724-cd06804db798
github.com/88250/lute v1.7.6-0.20230201063400-7cb2a1f66764
github.com/88250/lute v1.7.6-0.20230202065128-4cbf76e24dcb
github.com/88250/pdfcpu v0.3.13
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ConradIrwin/font v0.0.0-20210318200717-ce8d41cc0732

4
kernel/go.sum
View file

@ -17,8 +17,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 h1:8HdZozCsXS
github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20221117052724-cd06804db798 h1:sR/s/Y9wyl79ZRCUERwLPo9zqaB3KhNRodCMTJ4ozEU=
github.com/88250/gulu v1.2.3-0.20221117052724-cd06804db798/go.mod h1:I1qBzsksFL2ciGSuqDE7R3XW4BUMrfDgOvSXEk7FsAI=
github.com/88250/lute v1.7.6-0.20230201063400-7cb2a1f66764 h1:DinlavemCfzk5IIR1E22m7Iq4ksiiSl9BHuyJ1HSH4g=
github.com/88250/lute v1.7.6-0.20230201063400-7cb2a1f66764/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.6-0.20230202065128-4cbf76e24dcb h1:cQFmZHUrHnYceHyv2gHMm8xkP8C3Y+I9+7zUJhLADlk=
github.com/88250/lute v1.7.6-0.20230202065128-4cbf76e24dcb/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/pdfcpu v0.3.13 h1:touMWMZkCGalMIbEg9bxYp7rETM+zwb9hXjwhqi4I7Q=
github.com/88250/pdfcpu v0.3.13/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

24
kernel/treenode/blocktree.go
View file

@ -147,26 +147,8 @@ func GetBlockTree(id string) (ret *BlockTree) {
}
func SetBlockTreePath(tree *parse.Tree) {
hash := btHash(tree.ID)
val, ok := blockTrees.Load(hash)
if !ok {
val = &btSlice{data: map[string]*BlockTree{}, changed: time.Time{}, m: &sync.Mutex{}}
blockTrees.Store(hash, val)
}
slice := val.(*btSlice)
slice.m.Lock()
slice.data[tree.ID] = &BlockTree{
ID: tree.ID,
RootID: tree.Root.ID,
BoxID: tree.Box,
Path: tree.Path,
HPath: tree.HPath,
Updated: tree.Root.IALAttr("updated"),
Type: TypeAbbr(ast.NodeDocument.String()),
}
slice.m.Unlock()
slice.changed = time.Now()
RemoveBlockTreesByRootID(tree.ID)
IndexBlockTree(tree)
}
func RemoveBlockTreesByRootID(rootID string) {
@ -176,7 +158,7 @@ func RemoveBlockTreesByRootID(rootID string) {
slice.m.Lock()
for _, b := range slice.data {
if b.RootID == rootID {
ids = append(ids, b.RootID)
ids = append(ids, b.ID)
}
}
slice.m.Unlock()