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

🎨 同步下载支持断点续传 Fix https://github.com/siyuan-note/siyuan/issues/5056

Browse source
This commit is contained in:
Liang Ding 2022-05-31 11:35:52 +08:00
parent 9b35a01d53
commit fa45fafca4
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
kernel/model/sync.go
View file

@ -300,7 +300,9 @@ func SyncData(boot, exit, byHand bool) {
syncDownloadErrCount++ syncDownloadErrCount++
return return
} }
data, err := os.ReadFile(filepath.Join(util.TempDir, "/sync/"+pathJSON))
tmpPathJSON := filepath.Join(util.TempDir, "/sync/"+pathJSON)
data, err := os.ReadFile(tmpPathJSON)
if nil != err { if nil != err {
return return
} }
@ -320,6 +322,20 @@ func SyncData(boot, exit, byHand bool) {
syncDownloadErrCount++ syncDownloadErrCount++
return return
} }
if err = os.Rename(tmpPathJSON, filepath.Join(localSyncDirPath, pathJSON)); nil != err {
util.PushClearMsg()
msg := fmt.Sprintf(Conf.Language(80), formatErrorMsg(err))
Conf.Sync.Stat = msg
util.PushErrMsg(msg, 7000)
if boot {
BootSyncSucc = 1
}
if exit {
ExitSyncSucc = 1
}
syncDownloadErrCount++
return
}
fetchedFilesCount, transferSize, downloadedFiles, err := ossDownload(localSyncDirPath, "sync/"+Conf.Sync.CloudName, boot || exit) fetchedFilesCount, transferSize, downloadedFiles, err := ossDownload(localSyncDirPath, "sync/"+Conf.Sync.CloudName, boot || exit)
if nil != err { if nil != err {