Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-30 21:38:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🐛 Improve importing .sy.zip https://github.com/siyuan-note/siyuan/issues/12825

Browse source
This commit is contained in:
Daniel 2024-10-18 15:24:12 +08:00
parent 5efce9b33e
commit 5c274f5c79
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
12 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kernel/model/import.go
View file

@ -147,7 +147,7 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
trees := map[string]*parse.Tree{}
// 重新生成块 ID
for _, syPath := range syPaths {
for i, syPath := range syPaths {
data, readErr := os.ReadFile(syPath)
if nil != readErr {
logging.LogErrorf("read .sy [%s] failed: %s", syPath, readErr)
@ -176,10 +176,12 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
tree.ID = tree.Root.ID
tree.Path = filepath.ToSlash(strings.TrimPrefix(syPath, unzipRootPath))
trees[tree.ID] = tree
util.PushEndlessProgress(Conf.language(73) + " " + fmt.Sprintf(Conf.language(70), fmt.Sprintf("%d/%d", i+1, len(syPaths))))
}
// 引用和嵌入指向重新生成的块 ID
for _, tree := range trees {
util.PushEndlessProgress(Conf.language(73) + " " + fmt.Sprintf(Conf.language(70), tree.Root.IALAttr("title")))
ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering {
return ast.WalkContinue
@ -269,6 +271,7 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
// 重新指向数据库属性值
for _, tree := range trees {
util.PushEndlessProgress(Conf.language(73) + " " + fmt.Sprintf(Conf.language(70), tree.Root.IALAttr("title")))
ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering || "" == n.ID {
return ast.WalkContinue
@ -362,6 +365,7 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
// 写回 .sy
for _, tree := range trees {
util.PushEndlessProgress(Conf.language(73) + " " + fmt.Sprintf(Conf.language(70), tree.Root.IALAttr("title")))
syPath := filepath.Join(unzipRootPath, tree.Path)
if "" == tree.Root.Spec {
parse.NestedInlines2FlattedSpans(tree, false)
@ -587,6 +591,7 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
treenode.IndexBlockTree(tree)
sql.IndexTreeQueue(tree)
util.PushEndlessProgress(Conf.language(73) + " " + fmt.Sprintf(Conf.language(70), tree.Root.IALAttr("title")))
}
IncSync()