0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-06-06 11:36:52 +08:00
commit 2dfad9d996
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
kernel/model/osssync.go
View file

@ -437,27 +437,29 @@ func ossUpload(isBackup bool, localDirPath, cloudDirPath, cloudDevice string, bo
if nil != err {
return
}
indexPath := filepath.Join(util.TempDir, "sync", "index.json")
tmpSyncDir := filepath.Join(util.TempDir, "sync")
indexPath := filepath.Join(tmpSyncDir, "index.json")
if err = os.WriteFile(indexPath, data, 0644); nil != err {
return
}
var tmpFetchedFiles int
var tmpTransferSize uint64
err = ossDownload0(util.TempDir+"/sync", "sync/"+Conf.Sync.CloudName, "/"+pathJSON, &tmpFetchedFiles, &tmpTransferSize, false)
err = ossDownload0(tmpSyncDir, "sync/"+Conf.Sync.CloudName, "/"+pathJSON, &tmpFetchedFiles, &tmpTransferSize, false)
if nil != err {
util.LogErrorf("download merge cloud file failed: %s", err)
return
}
metaPath := filepath.Join(util.TempDir, "/sync/"+pathJSON)
err = syncDirUpsertWorkspaceData(metaPath, indexPath, downloadList)
metaPath := filepath.Join(tmpSyncDir, pathJSON)
var upsertFiles []string
upsertFiles, err = syncDirUpsertWorkspaceData(metaPath, indexPath, downloadList)
if nil != err {
util.LogErrorf("download merge cloud file failed: %s", err)
return
}
// 增量索引
for upsertFile, _ := range downloadList {
for _, upsertFile := range upsertFiles {
if !strings.HasSuffix(upsertFile, ".sy") {
continue
}
@ -864,7 +866,6 @@ func cloudUpsertRemoveListOSS(localDirPath string, cloudFileList, localFileList
cloudChangedList[cloudFile] = true
}
delete(unchanged, filepath.Join(localDirPath, "index.json")) // 同步偶尔报错 `The system cannot find the path specified.` https://github.com/siyuan-note/siyuan/issues/4942
filepath.Walk(localDirPath, func(path string, info fs.FileInfo, err error) error {
if localDirPath == path || info.IsDir() {
return nil
@ -886,7 +887,7 @@ func cloudUpsertRemoveListOSS(localDirPath string, cloudFileList, localFileList
downloadList = map[string]bool{}
for cloudChanged, _ := range cloudChangedList {
if upsertList[cloudChanged] || removeList[cloudChanged] || excludes[cloudChanged] {
if upsertList[cloudChanged] || removeList[cloudChanged] || excludes[cloudChanged] || "/"+pathJSON == cloudChanged || "/index.json" == cloudChanged {
continue
}
downloadList[cloudChanged] = true

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