Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 17:10:12 +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-05 21:12:56 +08:00
parent 801050ab8d
commit 8db76a66ff
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/model/osssync.go
View file

@ -188,6 +188,7 @@ func ossDownload(localDirPath, cloudDirPath string, bootOrExit bool) (fetchedFil
needPushProgress := 32 < len(cloudFetches) needPushProgress := 32 < len(cloudFetches)
waitGroup := &sync.WaitGroup{} waitGroup := &sync.WaitGroup{}
var downloadErr error var downloadErr error
downloadedFilesLock := sync.Mutex{}
downloadedFiles = map[string]bool{} downloadedFiles = map[string]bool{}
poolSize := 4 poolSize := 4
if poolSize > len(cloudFetches)-1 /* 不计入 /.siyuan/conf.json，配置文件最后单独下载 */ { if poolSize > len(cloudFetches)-1 /* 不计入 /.siyuan/conf.json，配置文件最后单独下载 */ {
@ -205,7 +206,9 @@ func ossDownload(localDirPath, cloudDirPath string, bootOrExit bool) (fetchedFil
downloadErr = err // 仅记录最后一次错误 downloadErr = err // 仅记录最后一次错误
return return
} }
downloadedFiles[fetch] = true // FIXME: 并发修改 map downloadedFilesLock.Lock()
downloadedFiles[fetch] = true
downloadedFilesLock.Unlock()
if needPushProgress { if needPushProgress {
msg := fmt.Sprintf(Conf.Language(103), fetchedFilesCount, len(cloudFetches)-fetchedFilesCount) msg := fmt.Sprintf(Conf.Language(103), fetchedFilesCount, len(cloudFetches)-fetchedFilesCount)