diff --git a/kernel/model/sync.go b/kernel/model/sync.go index 475b6c930..5ea4c026e 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -557,7 +557,7 @@ func syncDir2WorkspaceData(boot bool) (upsertFiles, removeFiles []string, err er modified := modifiedSyncList(unchanged) metaPath := filepath.Join(util.TempDir, "sync", pathJSON) // 使用前面解密验证时下载的临时文件 - indexPath := filepath.Join(Conf.Sync.GetSaveDir(), "index.json") + indexPath := filepath.Join(util.TempDir, "sync", "index.json") decryptedDataDir, upsertFiles, err := recoverSyncData(metaPath, indexPath, modified) if nil != err { util.LogErrorf("decrypt data dir failed: %s", err) diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go index 881013952..5c32db7e4 100644 --- a/kernel/model/transaction.go +++ b/kernel/model/transaction.go @@ -1057,27 +1057,19 @@ func refreshUpdated(n *ast.Node) { } } -func createdUpdated(n *ast.Node) { - ast.Walk(n, func(n *ast.Node, entering bool) ast.WalkStatus { - if !entering || "" == n.ID { - return ast.WalkContinue - } - - created := util.TimeFromID(n.ID) - updated := n.IALAttr("updated") - if "" == updated { - updated = created - } - if updated < created { - updated = created // 复制粘贴块后创建时间小于更新时间 https://github.com/siyuan-note/siyuan/issues/3624 - } - n.SetIALAttr("updated", updated) - parents := treenode.ParentNodes(n) - for _, parent := range parents { // 更新所有父节点的更新时间字段 - parent.SetIALAttr("updated", updated) - } - return ast.WalkContinue - }) +func createdUpdated(node *ast.Node) { + created := util.TimeFromID(node.ID) + updated := node.IALAttr("updated") + if "" == updated { + updated = created + } + if updated < created { + updated = created // 复制粘贴块后创建时间小于更新时间 https://github.com/siyuan-note/siyuan/issues/3624 + } + parents := treenode.ParentNodes(node) + for _, parent := range parents { // 更新所有父节点的更新时间字段 + parent.SetIALAttr("updated", updated) + } } type Operation struct {