Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 23:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Add more file formats supporting snapshots comparing https://github.com/siyuan-note/siyuan/issues/8438

Browse source
This commit is contained in:
Daniel 2023-06-02 11:02:57 +08:00
parent 1090fb00b6
commit 5ba0397a80
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 77 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

144
kernel/model/repository.go
View file

@ -81,51 +81,74 @@ func OpenRepoSnapshotDoc(fileID string) (id, rootID, content string, isLargeDoc
if nil != err { if nil != err {
return return
} }
luteEngine := NewLute()
isLargeDoc, snapshotTree, updated, err := parseTreeInSnapshot(fileID, repo, luteEngine) file, err := repo.GetFile(fileID)
if nil != err { if nil != err {
logging.LogErrorf("parse tree from snapshot file [%s] failed", fileID)
return return
} }
id = snapshotTree.Root.ID
rootID = snapshotTree.Root.ID
if !isLargeDoc { data, err := repo.OpenFile(file)
renderTree := &parse.Tree{Root: &ast.Node{Type: ast.NodeDocument}} if nil != err {
return
var unlinks []*ast.Node
ast.Walk(snapshotTree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering {
return ast.WalkContinue
}
n.RemoveIALAttr("heading-fold")
n.RemoveIALAttr("fold")
return ast.WalkContinue
})
for _, unlink := range unlinks {
unlink.Unlink()
}
var appends []*ast.Node
for n := snapshotTree.Root.FirstChild; nil != n; n = n.Next {
appends = append(appends, n)
}
for _, n := range appends {
renderTree.Root.AppendChild(n)
}
snapshotTree = renderTree
} }
luteEngine.RenderOptions.ProtyleContenteditable = false updated = file.Updated
if isLargeDoc {
util.PushMsg(Conf.Language(36), 5000) if strings.HasSuffix(file.Path, ".sy") {
formatRenderer := render.NewFormatRenderer(snapshotTree, luteEngine.RenderOptions) luteEngine := NewLute()
content = gulu.Str.FromBytes(formatRenderer.Render()) var snapshotTree *parse.Tree
isLargeDoc, snapshotTree, err = parseTreeInSnapshot(data, luteEngine)
if nil != err {
logging.LogErrorf("parse tree from snapshot file [%s] failed", fileID)
return
}
id = snapshotTree.Root.ID
rootID = snapshotTree.Root.ID
if !isLargeDoc {
renderTree := &parse.Tree{Root: &ast.Node{Type: ast.NodeDocument}}
var unlinks []*ast.Node
ast.Walk(snapshotTree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering {
return ast.WalkContinue
}
n.RemoveIALAttr("heading-fold")
n.RemoveIALAttr("fold")
return ast.WalkContinue
})
for _, unlink := range unlinks {
unlink.Unlink()
}
var appends []*ast.Node
for n := snapshotTree.Root.FirstChild; nil != n; n = n.Next {
appends = append(appends, n)
}
for _, n := range appends {
renderTree.Root.AppendChild(n)
}
snapshotTree = renderTree
}
luteEngine.RenderOptions.ProtyleContenteditable = false
if isLargeDoc {
util.PushMsg(Conf.Language(36), 5000)
formatRenderer := render.NewFormatRenderer(snapshotTree, luteEngine.RenderOptions)
content = gulu.Str.FromBytes(formatRenderer.Render())
} else {
content = luteEngine.Tree2BlockDOM(snapshotTree, luteEngine.RenderOptions)
}
} else { } else {
content = luteEngine.Tree2BlockDOM(snapshotTree, luteEngine.RenderOptions) isLargeDoc = true
if strings.HasSuffix(file.Path, ".json") {
content = gulu.Str.FromBytes(data)
} else {
content = file.Path
}
} }
return return
} }
@ -250,46 +273,33 @@ func parseTitleInSnapshot(fileID string, repo *dejavu.Repo, luteEngine *lute.Lut
return return
} }
if !strings.HasSuffix(file.Path, ".sy") { title = path.Base(file.Path)
return if strings.HasSuffix(file.Path, ".sy") {
} var data []byte
data, err = repo.OpenFile(file)
if nil != err {
logging.LogErrorf("open file [%s] failed: %s", fileID, err)
return
}
var data []byte var tree *parse.Tree
data, err = repo.OpenFile(file) tree, err = filesys.ParseJSONWithoutFix(data, luteEngine.ParseOptions)
if nil != err { if nil != err {
logging.LogErrorf("open file [%s] failed: %s", fileID, err) logging.LogErrorf("parse file [%s] failed: %s", fileID, err)
return return
} }
var tree *parse.Tree title = tree.Root.IALAttr("title")
tree, err = filesys.ParseJSONWithoutFix(data, luteEngine.ParseOptions)
if nil != err {
logging.LogErrorf("parse file [%s] failed: %s", fileID, err)
return
} }
title = tree.Root.IALAttr("title")
return return
} }
func parseTreeInSnapshot(fileID string, repo *dejavu.Repo, luteEngine *lute.Lute) (isLargeDoc bool, tree *parse.Tree, updated int64, err error) { func parseTreeInSnapshot(data []byte, luteEngine *lute.Lute) (isLargeDoc bool, tree *parse.Tree, err error) {
file, err := repo.GetFile(fileID)
if nil != err {
return
}
data, err := repo.OpenFile(file)
if nil != err {
return
}
isLargeDoc = 1024*1024*1 <= len(data) isLargeDoc = 1024*1024*1 <= len(data)
tree, err = filesys.ParseJSONWithoutFix(data, luteEngine.ParseOptions) tree, err = filesys.ParseJSONWithoutFix(data, luteEngine.ParseOptions)
if nil != err { if nil != err {
return return
} }
updated = file.Updated
return return
} }