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

🐛 Fix typo

Browse source
This commit is contained in:
Liang Ding 2022-06-04 21:05:03 +08:00
parent 64ae905921
commit 1acfe53098
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/osssync.go
View file

@ -723,7 +723,7 @@ func cloudUpsertRemoveListOSS(localDirPath string, cloudFileList map[string]*Clo
ignores := syncIgnoreList.Values()
for _, p := range ignores {
relPath := p.(string)
relPath = pathSha246(relPath, "/")
relPath = pathSha256Short(relPath, "/")
relPath = filepath.Join(localDirPath, relPath)
excludes[relPath] = true
}

8
kernel/model/sync.go
View file

@ -792,7 +792,7 @@ func prepareSyncData(passwd string, unchangedList map[string]bool) (encryptedDat
p := plainP
if !strings.HasPrefix(plainP, ".siyuan") { // 配置目录下都用明文，其他文件需要映射文件名
p = pathSha246(p, string(os.PathSeparator))
p = pathSha256Short(p, string(os.PathSeparator))
}
metaJSON[filepath.ToSlash(p)] = filepath.ToSlash(plainP)
@ -935,7 +935,7 @@ func unchangedSyncList() (ret map[string]bool, removes []string, err error) {
ignores := syncIgnoreList.Values()
for _, p := range ignores {
relPath := p.(string)
relPath = pathSha246(relPath, "/")
relPath = pathSha256Short(relPath, "/")
relPath = filepath.Join(syncDir, relPath)
excludes[relPath] = true
}
@ -956,7 +956,7 @@ func unchangedSyncList() (ret map[string]bool, removes []string, err error) {
plainP := strings.TrimPrefix(path, util.DataDir+sep)
dataP := plainP
dataP = pathSha246(dataP, sep)
dataP = pathSha256Short(dataP, sep)
syncP := filepath.Join(syncDir, dataP)
if excludes[syncP] {
@ -1291,7 +1291,7 @@ func getSyncIgnoreList() (ret *hashset.Set) {
return
}
func pathSha246(p, sep string) string {
func pathSha256Short(p, sep string) string {
buf := bytes.Buffer{}
parts := strings.Split(p, sep)
for i, part := range parts {