From 524fa72f59ca8653a2bf58df632c57c98f0ccbec Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 1 Jul 2022 20:26:25 +0800 Subject: [PATCH] :art: Sync repo --- kernel/model/sync.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/kernel/model/sync.go b/kernel/model/sync.go index 0b4ce9934..445cf3950 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -132,6 +132,18 @@ func SyncData(boot, exit, byHand bool) { syncLock.Lock() defer syncLock.Unlock() + // 创建数据快照 https://github.com/siyuan-note/siyuan/issues/5161 + indexRepoBeforeCloudSync() + + if !boot && !exit && byHand { + // 同步数据仓库 https://github.com/siyuan-note/siyuan/issues/5142 + if syncRepoErr := syncRepo(); nil != syncRepoErr { + util.LogErrorf("sync repo failed: %s", syncRepoErr) + } + } + + return // TODO: 测试 + WaitForWritingFiles() writingDataLock.Lock() var err error @@ -150,18 +162,6 @@ func SyncData(boot, exit, byHand bool) { return } - // 创建数据快照 https://github.com/siyuan-note/siyuan/issues/5161 - indexRepoBeforeCloudSync() - - if !boot && !exit && byHand { - // 同步数据仓库 https://github.com/siyuan-note/siyuan/issues/5142 - if syncRepoErr := syncRepo(); nil != syncRepoErr { - util.LogErrorf("sync repo failed: %s", syncRepoErr) - } - } - - return // TODO: 测试 - // 获取工作空间数据配置(数据版本) dataConf, err := getWorkspaceDataConf() if nil != err {