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

🎨 改进云端同步

Browse source
This commit is contained in:
Liang Ding 2022-07-11 14:26:36 +08:00
parent ccecd5bc5c
commit 99f36a2772
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
6 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel/model/sync.go
View file

@ -449,7 +449,13 @@ func incReindex(upserts, removes []string) {
if strings.HasPrefix(upsertFile, "/") {
upsertFile = upsertFile[1:]
}
box := upsertFile[:strings.Index(upsertFile, "/")]
idx := strings.Index(upsertFile, "/")
if 0 > idx {
// .sy 直接出现在 data 文件夹下，没有出现在笔记本文件夹下的情况
continue
}
box := upsertFile[:idx]
p := strings.TrimPrefix(upsertFile, box)
tree, err0 := LoadTree(box, p)
if nil != err0 {
@ -1260,6 +1266,8 @@ func formatErrorMsg(err error) string {
msg = Conf.Language(33)
} else if strings.Contains(msg, "Device or resource busy") {
msg = Conf.Language(85)
} else if strings.Contains(msg, "cipher: message authentication failed") {
msg = Conf.Language(172)
}
msg = msg + " v" + util.Ver
return msg