From 14cc2780df9c0acfb1597761a1130a0328d04d2c Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 27 Jan 2023 12:38:26 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E5=AF=BC=E5=85=A5=20Markdown=20?= =?UTF-8?q?=E5=92=8C=20`.sy.zip`=20=E6=97=B6=E5=A2=9E=E9=87=8F=E5=BB=BA?= =?UTF-8?q?=E7=AB=8B=E7=B4=A2=E5=BC=95=20https://github.com/siyuan-note/si?= =?UTF-8?q?yuan/issues/7123?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/import.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/model/import.go b/kernel/model/import.go index 8df17c22c..1f32ea112 100644 --- a/kernel/model/import.go +++ b/kernel/model/import.go @@ -45,7 +45,6 @@ import ( "github.com/88250/lute/render" "github.com/siyuan-note/filelock" "github.com/siyuan-note/logging" - "github.com/siyuan-note/siyuan/kernel/filesys" "github.com/siyuan-note/siyuan/kernel/sql" "github.com/siyuan-note/siyuan/kernel/treenode" "github.com/siyuan-note/siyuan/kernel/util" @@ -524,7 +523,7 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) { hPath = strings.TrimSuffix(hPath, ext) if info.IsDir() { tree = treenode.NewTree(boxID, targetPath, hPath, title) - if err = filesys.WriteTree(tree); nil != err { + if err = indexWriteJSONQueue(tree); nil != err { return io.EOF } return nil @@ -614,7 +613,7 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) { i++ if 0 == i%4 { - util.PushEndlessProgress(fmt.Sprintf(Conf.Language(66), util.ShortPathForBootingDisplay(tree.Path))) + util.PushEndlessProgress(fmt.Sprintf(Conf.Language(66), fmt.Sprintf("%d ", i)+util.ShortPathForBootingDisplay(tree.Path))) } return nil })