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

🎨 支持多设备操作不同文档后云端同步合并 https://github.com/siyuan-note/siyuan/issues/5092

Browse source
This commit is contained in:
Liang Ding 2022-06-06 11:32:52 +08:00
parent 0fafd470f8
commit e05289a6ae
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/model/sync.go
View file

@ -338,7 +338,7 @@ func SyncData(boot, exit, byHand bool) {
metaPath := filepath.Join(Conf.Sync.GetSaveDir(), pathJSON)
indexPath := filepath.Join(util.TempDir, "sync", "index.json")
err = syncDirUpsertWorkspaceData(metaPath, indexPath, downloadedFiles)
_, err = syncDirUpsertWorkspaceData(metaPath, indexPath, downloadedFiles)
if nil != err {
util.LogErrorf("upsert partially downloaded files to workspace data failed: %s", err)
}
@ -515,7 +515,7 @@ func SetSyncMode(mode int) (err error) {
var syncLock = sync.Mutex{}
func syncDirUpsertWorkspaceData(metaPath, indexPath string, downloadedFiles map[string]bool) (err error) {
func syncDirUpsertWorkspaceData(metaPath, indexPath string, downloadedFiles map[string]bool) (upsertFiles []string, err error) {
start := time.Now()
modified := map[string]bool{}
@ -525,7 +525,7 @@ func syncDirUpsertWorkspaceData(metaPath, indexPath string, downloadedFiles map[
modified[file] = true
}
decryptedDataDir, _, err := recoverSyncData(metaPath, indexPath, modified)
decryptedDataDir, upsertFiles, err := recoverSyncData(metaPath, indexPath, modified)
if nil != err {
util.LogErrorf("decrypt data dir failed: %s", err)
return