Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-31 22:08:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2022-06-04 22:19:10 +08:00
commit 64ae905921
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
kernel/model/sync.go
View file

@ -595,10 +595,11 @@ func workspaceData2SyncDir() (err error) {
filesys.ReleaseAllFileLocks()
passwd := Conf.E2EEPasswd
unchanged, err := unchangedDataList(passwd)
unchanged, removed, err := unchangedDataList(passwd)
if nil != err {
return
}
_ = removed // TODO: 支持多设备操作不同文档后云端同步合并 https://github.com/siyuan-note/siyuan/issues/5092
encryptedDataDir, err := prepareSyncData(passwd, unchanged)
if nil != err {
@ -624,6 +625,7 @@ type CloudIndex struct {
func genCloudIndex(localDirPath string, excludes map[string]bool) (err error) {
cloudIndex := map[string]*CloudIndex{}
// TODO: 优化云端同步资源占用 https://github.com/siyuan-note/siyuan/issues/5093
err = filepath.Walk(localDirPath, func(path string, info fs.FileInfo, err error) error {
if nil != err {
return err
@ -992,7 +994,7 @@ func unchangedSyncList() (ret map[string]bool, removes []string, err error) {
}
// unchangedDataList 获取 sync 和 data 一致（没有修改过）的文件列表，并删除 sync 中不存在于 data 中的多余文件。
func unchangedDataList(passwd string) (ret map[string]bool, err error) {
func unchangedDataList(passwd string) (unchangedList map[string]bool, removeList map[string]bool, err error) {
syncDir := Conf.Sync.GetSaveDir()
meta := filepath.Join(syncDir, pathJSON)
if !gulu.File.IsExist(meta) {
@ -1004,7 +1006,8 @@ func unchangedDataList(passwd string) (ret map[string]bool, err error) {
}
data, err = encryption.AESGCMDecryptBinBytes(data, passwd)
if nil != err {
return ret, errors.New(Conf.Language(40))
err = errors.New(Conf.Language(40))
return
}
metaJSON := map[string]string{}
@ -1012,8 +1015,8 @@ func unchangedDataList(passwd string) (ret map[string]bool, err error) {
return
}
ret = map[string]bool{}
var removeList []string
unchangedList = map[string]bool{}
removeList = map[string]bool{}
filepath.Walk(syncDir, func(path string, info fs.FileInfo, _ error) error {
if syncDir == path || pathJSON == info.Name() {
return nil
@ -1022,8 +1025,8 @@ func unchangedDataList(passwd string) (ret map[string]bool, err error) {
encryptedP := strings.TrimPrefix(path, syncDir+string(os.PathSeparator))
encryptedP = filepath.ToSlash(encryptedP)
decryptedP := metaJSON[encryptedP]
if "" == decryptedP {
removeList = append(removeList, path)
if "" == decryptedP { // 理论上不会发生
removeList[path] = true
if gulu.File.IsDir(path) {
return filepath.SkipDir
}
@ -1032,7 +1035,7 @@ func unchangedDataList(passwd string) (ret map[string]bool, err error) {
dataP := filepath.Join(util.DataDir, decryptedP)
dataP = filepath.FromSlash(dataP)
if !gulu.File.IsExist(dataP) { // data 已经删除的文件
removeList = append(removeList, path)
removeList[path] = true
if gulu.File.IsDir(path) {
return filepath.SkipDir
}
@ -1042,14 +1045,14 @@ func unchangedDataList(passwd string) (ret map[string]bool, err error) {
stat, _ := os.Stat(dataP)
dataModTime := stat.ModTime()
if info.ModTime() == dataModTime {
ret[dataP] = true
unchangedList[dataP] = true
return nil
}
return nil
})
// 在 sync 中删除 data 中已经删除的文件
for _, remove := range removeList {
for remove, _ := range removeList {
if strings.HasSuffix(remove, "index.json") {
continue
}