Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-24 01:06:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 文件夹不编入路径映射

Browse source
This commit is contained in:
Liang Ding 2022-06-06 00:35:12 +08:00
parent 9ba54bf495
commit 42ff4a8fe4
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kernel/model/osssync.go
View file

@ -511,11 +511,11 @@ func ossUpload(isBackup bool, localDirPath, cloudDirPath, cloudDevice string, bo
}
})
index := filepath.Join(localDirPath, "index.json")
meta := filepath.Join(localDirPath, pathJSON)
for _, localUpsert := range localUpserts {
if index == localUpsert {
if index == localUpsert || meta == localUpsert {
// 同步过程中断导致的一致性问题 https://github.com/siyuan-note/siyuan/issues/4912
// index 最后单独上传
index = localUpsert
// index 和路径映射文件最后单独上传
continue
}
@ -529,11 +529,15 @@ func ossUpload(isBackup bool, localDirPath, cloudDirPath, cloudDevice string, bo
return
}
// 单独上传 index
// 单独上传 index 和路径映射
if uploadErr = ossUpload0(localDirPath, cloudDirPath, index, &wroteFiles, &transferSize); nil != uploadErr {
err = uploadErr
return
}
if uploadErr = ossUpload0(localDirPath, cloudDirPath, meta, &wroteFiles, &transferSize); nil != uploadErr {
err = uploadErr
return
}
if needPushProgress {
util.PushMsg(Conf.Language(105), 3000)

2
kernel/model/sync.go
View file

@ -1006,7 +1006,7 @@ func calcUnchangedDataList(passwd string) (unchangedDataList map[string]bool, re
unchangedDataList = map[string]bool{}
removeList = map[string]bool{}
filepath.Walk(syncDir, func(path string, info fs.FileInfo, _ error) error {
if syncDir == path || pathJSON == info.Name() {
if syncDir == path || pathJSON == info.Name() || "index.json" == info.Name() || info.IsDir() {
return nil
}