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

🎨 Add provider info at the end of message in all sync error notifications

Browse source
This commit is contained in:
Liang Ding 2023-04-06 15:00:03 +08:00
parent 86cbf95d5b
commit e954f7ab94
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
4 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
kernel/model/sync.go
View file

@ -62,7 +62,7 @@ func SyncDataDownload() {
if nil == err {
synced += Conf.Sync.Stat
} else {
synced += fmt.Sprintf(Conf.Language(80), formatErrorMsg(err))
synced += fmt.Sprintf(Conf.Language(80), formatRepoErrorMsg(err))
}
msg := fmt.Sprintf(Conf.Language(82), synced)
Conf.Sync.Stat = msg
@ -98,7 +98,7 @@ func SyncDataUpload() {
if nil == err {
synced += Conf.Sync.Stat
} else {
synced += fmt.Sprintf(Conf.Language(80), formatErrorMsg(err))
synced += fmt.Sprintf(Conf.Language(80), formatRepoErrorMsg(err))
}
msg := fmt.Sprintf(Conf.Language(82), synced)
Conf.Sync.Stat = msg
@ -157,7 +157,7 @@ func BootSyncData() {
if nil == err {
synced += Conf.Sync.Stat
} else {
synced += fmt.Sprintf(Conf.Language(80), formatErrorMsg(err))
synced += fmt.Sprintf(Conf.Language(80), formatRepoErrorMsg(err))
}
msg := fmt.Sprintf(Conf.Language(82), synced)
Conf.Sync.Stat = msg
@ -204,7 +204,7 @@ func syncData(exit, byHand bool) {
if nil == err {
synced += Conf.Sync.Stat
} else {
synced += fmt.Sprintf(Conf.Language(80), formatErrorMsg(err))
synced += fmt.Sprintf(Conf.Language(80), formatRepoErrorMsg(err))
}
msg := fmt.Sprintf(Conf.Language(82), synced)
Conf.Sync.Stat = msg
@ -406,7 +406,7 @@ func CreateCloudSyncDir(name string) (err error) {
err = repo.CreateCloudRepo(name)
if nil != err {
err = errors.New(formatErrorMsg(err))
err = errors.New(formatRepoErrorMsg(err))
return
}
return
@ -431,7 +431,7 @@ func RemoveCloudSyncDir(name string) (err error) {
err = repo.RemoveCloudRepo(name)
if nil != err {
err = errors.New(formatErrorMsg(err))
err = errors.New(formatRepoErrorMsg(err))
return
}
@ -457,7 +457,7 @@ func ListCloudSyncDir() (syncDirs []*Sync, hSize string, err error) {
dirs, size, err = repo.GetCloudRepos()
if nil != err {
err = errors.New(formatErrorMsg(err))
err = errors.New(formatRepoErrorMsg(err))
return
}
if 1 > len(dirs) {
@ -488,7 +488,7 @@ func ListCloudSyncDir() (syncDirs []*Sync, hSize string, err error) {
return
}
func formatErrorMsg(err error) string {
func formatRepoErrorMsg(err error) string {
msg := err.Error()
if errors.Is(err, cloud.ErrCloudAuthFailed) {
msg = Conf.Language(31)
@ -518,6 +518,7 @@ func formatErrorMsg(err error) string {
msg = Conf.Language(28)
}
}
msg += " (Provider: " + conf.ProviderToStr(Conf.Sync.Provider) + ")"
return msg
}