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

🎨 改进云端数据同步

Browse source
This commit is contained in:
Liang Ding 2022-07-17 00:47:45 +08:00
parent 412f6d0303
commit 3d514b6d31
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
9 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/repository.go
View file

@ -253,8 +253,10 @@ func UploadCloudSnapshot(tag, id string) (err error) {
uploadFileCount, uploadChunkCount, uploadBytes, err := repo.UploadTagIndex(tag, id, cloudInfo, map[string]interface{}{dejavu.CtxPushMsg: dejavu.CtxPushMsgToStatusBarAndProgress})
if nil != err {
if errors.Is(err, dejavu.ErrCloudBackupCountExceeded) {
err = errors.New(Conf.Language(154))
err = fmt.Errorf(Conf.Language(84), Conf.Language(154))
return
}
err = errors.New(fmt.Sprintf(Conf.Language(84), formatErrorMsg(err)))
return
}
msg := fmt.Sprintf(Conf.Language(152), uploadFileCount, uploadChunkCount, humanize.Bytes(uint64(uploadBytes)))

2
kernel/model/sync.go
View file

@ -296,6 +296,8 @@ func formatErrorMsg(err error) string {
msg = Conf.Language(85) + " " + err.Error()
} else if strings.Contains(msg, "cipher: message authentication failed") {
msg = Conf.Language(172) + " " + err.Error()
} else if strings.Contains(msg, "repo fatal error") {
msg = Conf.Language(23) + " " + err.Error()
}
msg = msg + " v" + util.Ver
return msg