Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-18 15:40: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:37:35 +08:00
parent 8db76a66ff
commit 7f9030d84d
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 64 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/backup.go
View file

@ -344,7 +344,7 @@ func DownloadBackup() (err error) {
localDirPath := Conf.Backup.GetSaveDir()
util.PushEndlessProgress(Conf.Language(68))
start := time.Now()
fetchedFilesCount, transferSize, _, err := ossDownload(localDirPath, "backup", false)
fetchedFilesCount, transferSize, _, err := ossDownload(true, localDirPath, "backup", false, map[string]bool{}, map[string]bool{})
if nil == err {
elapsed := time.Now().Sub(start).Seconds()
util.LogInfof("downloaded backup [fetchedFiles=%d, transferSize=%s] in [%.2fs]", fetchedFilesCount, humanize.Bytes(transferSize), elapsed)
@ -364,7 +364,7 @@ func UploadBackup() (err error) {
util.PushEndlessProgress(Conf.Language(61))
util.LogInfof("uploading backup...")
start := time.Now()
wroteFiles, transferSize, err := ossUpload(localDirPath, "backup", "not exist", false, map[string]bool{}, map[string]bool{})
wroteFiles, transferSize, err := ossUpload(true, localDirPath, "backup", "not exist", false, map[string]bool{}, map[string]bool{})
if nil == err {
elapsed := time.Now().Sub(start).Seconds()
util.LogInfof("uploaded backup [wroteFiles=%d, transferSize=%s] in [%.2fs]", wroteFiles, humanize.Bytes(transferSize), elapsed)

64
kernel/model/osssync.go
View file

@ -163,7 +163,7 @@ func listCloudSyncDirOSS() (dirs []map[string]interface{}, size int64, err error
return
}
func ossDownload(localDirPath, cloudDirPath string, bootOrExit bool) (fetchedFilesCount int, transferSize uint64, downloadedFiles map[string]bool, err error) {
func ossDownload(isBackup bool, localDirPath, cloudDirPath string, bootOrExit bool, removeList, upsertList map[string]bool) (fetchedFilesCount int, transferSize uint64, downloadedFiles map[string]bool, err error) {
if !gulu.File.IsExist(localDirPath) {
return
}
@ -173,6 +173,62 @@ func ossDownload(localDirPath, cloudDirPath string, bootOrExit bool) (fetchedFil
return
}
if !isBackup && (0 < len(removeList) || 0 < len(upsertList)) {
var removed, upserted bool
var removes []string
for remove, _ := range removeList {
removes = append(removes, remove)
}
removeErr := ossRemove0(cloudDirPath, removes)
if nil != removeErr {
util.LogErrorf("remove merge cloud file failed: %s", removeErr)
} else {
for remove, _ := range removeList {
delete(cloudFileList, remove)
}
removed = 0 < len(removeList)
}
var tmpWroteFiles int
var tmpTransferSize uint64
for upsert, _ := range upsertList {
localUpsert := filepath.Join(localDirPath, upsert)
info, statErr := os.Stat(localUpsert)
if nil != statErr {
util.LogErrorf("stat file [%s] failed: %s", localUpsert, statErr)
upserted = false
break
}
if uploadErr := ossUpload0(localDirPath, cloudDirPath, localUpsert, &tmpWroteFiles, &tmpTransferSize); nil != uploadErr {
util.LogErrorf("upload merge cloud file [%s] failed: %s", upsert, uploadErr)
upserted = false
break
}
cloudFileList[upsert] = &CloudIndex{
Size: info.Size(),
Updated: info.ModTime().Unix(),
}
upserted = true
}
if removed || upserted {
data, marshalErr := gulu.JSON.MarshalJSON(cloudFileList)
if nil != marshalErr {
util.LogErrorf("marshal cloud file list failed: %s", marshalErr)
} else {
tmpIndex := filepath.Join(util.TempDir, "sync", "cloud.json")
if writeErr := os.WriteFile(tmpIndex, data, 0644); nil != writeErr {
util.LogErrorf("write cloud file list failed: %s", writeErr)
} else {
if uploadErr := ossUpload0(localDirPath, cloudDirPath, tmpIndex, &tmpWroteFiles, &tmpTransferSize); nil != uploadErr {
util.LogErrorf("upload merge cloud file [%s] failed: %s", tmpIndex, uploadErr)
}
}
}
}
}
localRemoves, cloudFetches, err := localUpsertRemoveListOSS(localDirPath, cloudFileList)
if nil != err {
return
@ -326,7 +382,7 @@ func ossDownload0(localDirPath, cloudDirPath, fetch string, fetchedFiles *int, t
return
}
func ossUpload(localDirPath, cloudDirPath, cloudDevice string, boot bool, removeList, upsertList map[string]bool) (wroteFiles int, transferSize uint64, err error) {
func ossUpload(isBackup bool, localDirPath, cloudDirPath, cloudDevice string, boot bool, removeList, upsertList map[string]bool) (wroteFiles int, transferSize uint64, err error) {
if !gulu.File.IsExist(localDirPath) {
return
}
@ -342,7 +398,7 @@ func ossUpload(localDirPath, cloudDirPath, cloudDevice string, boot bool, remove
var localUpserts, cloudRemoves []string
var cloudFileList map[string]*CloudIndex
var downloadList map[string]bool
if "" != localDevice && localDevice == cloudDevice {
if "" != localDevice && localDevice == cloudDevice && !isBackup {
//util.LogInfof("cloud device is the same as local device, get index from local")
localUpserts, cloudRemoves, err = cloudUpsertRemoveLocalListOSS(localDirPath, removeList, upsertList, excludes)
} else {
@ -357,7 +413,7 @@ func ossUpload(localDirPath, cloudDirPath, cloudDevice string, boot bool, remove
if nil != err {
return
}
if 0 < len(downloadList) {
if 0 < len(downloadList) && !isBackup {
// 下载合并云端变更
var tmpFetchedFiles int
var tmpTransferSize uint64

4
kernel/model/sync.go
View file

@ -246,7 +246,7 @@ func SyncData(boot, exit, byHand bool) {
return
}
wroteFiles, transferSize, err := ossUpload(localSyncDirPath, "sync/"+Conf.Sync.CloudName, device, boot, removeList, upsertList)
wroteFiles, transferSize, err := ossUpload(false, localSyncDirPath, "sync/"+Conf.Sync.CloudName, device, boot, removeList, upsertList)
if nil != err {
util.PushClearProgress()
IncWorkspaceDataVer() // 上传失败的话提升本地版本，以备下次上传
@ -345,7 +345,7 @@ func SyncData(boot, exit, byHand bool) {
return
}
fetchedFilesCount, transferSize, downloadedFiles, err := ossDownload(localSyncDirPath, "sync/"+Conf.Sync.CloudName, boot || exit)
fetchedFilesCount, transferSize, downloadedFiles, err := ossDownload(false, localSyncDirPath, "sync/"+Conf.Sync.CloudName, boot || exit, removeList, upsertList)
if nil != err {
util.PushClearProgress()
msg := fmt.Sprintf(Conf.Language(80), formatErrorMsg(err))