github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-04 23:32:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Sync repo

Browse Source
This commit is contained in:
Liang Ding 2022-07-01 20:26:25 +08:00
parent e50b2148db
commit 524fa72f59
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kernel/model/sync.go
View File

@ -132,6 +132,18 @@ func SyncData(boot, exit, byHand bool) {
syncLock.Lock() syncLock.Lock()
defer syncLock.Unlock() 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() WaitForWritingFiles()
writingDataLock.Lock() writingDataLock.Lock()
var err error var err error
@ -150,18 +162,6 @@ func SyncData(boot, exit, byHand bool) {
return 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() dataConf, err := getWorkspaceDataConf()
if nil != err { if nil != err {