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

🎨 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

12
kernel/conf/sync.go
View file

@ -63,6 +63,14 @@ const (
ProviderWebDAV = 3 // ProviderWebDAV 为 WebDAV 协议提供的云端存储服务 ProviderWebDAV = 3 // ProviderWebDAV 为 WebDAV 协议提供的云端存储服务
) )
func NewSyncProviderCheckURL() string { func ProviderToStr(provider int) string {
return "https://www.baidu.com" switch provider {
case ProviderSiYuan:
return "SiYuan"
case ProviderS3:
return "S3"
case ProviderWebDAV:
return "WebDAV"
}
return "Unknown"
} }

2
kernel/model/export.go
View file

@ -288,7 +288,7 @@ func exportData(exportFolder string) (zipPath string, err error) {
data := filepath.Join(util.WorkspaceDir, "data") data := filepath.Join(util.WorkspaceDir, "data")
if err = filelock.RoboCopy(data, exportFolder); nil != err { if err = filelock.RoboCopy(data, exportFolder); nil != err {
logging.LogErrorf("copy data dir from [%s] to [%s] failed: %s", data, baseFolderName, err) logging.LogErrorf("copy data dir from [%s] to [%s] failed: %s", data, baseFolderName, err)
err = errors.New(fmt.Sprintf(Conf.Language(14), formatErrorMsg(err))) err = errors.New(fmt.Sprintf(Conf.Language(14), err.Error()))
return return
} }

12
kernel/model/repository.go
View file

@ -594,7 +594,7 @@ func UploadCloudSnapshot(tag, id string) (err error) {
err = fmt.Errorf(Conf.Language(84), Conf.Language(154)) err = fmt.Errorf(Conf.Language(84), Conf.Language(154))
return return
} }
err = errors.New(fmt.Sprintf(Conf.Language(84), formatErrorMsg(err))) err = errors.New(fmt.Sprintf(Conf.Language(84), formatRepoErrorMsg(err)))
return return
} }
msg := fmt.Sprintf(Conf.Language(152), uploadFileCount, uploadChunkCount, humanize.Bytes(uint64(uploadBytes))) msg := fmt.Sprintf(Conf.Language(152), uploadFileCount, uploadChunkCount, humanize.Bytes(uint64(uploadBytes)))
@ -827,7 +827,7 @@ func syncRepoDownload() (err error) {
planSyncAfter(fixSyncInterval) planSyncAfter(fixSyncInterval)
logging.LogErrorf("sync data repo download failed: %s", err) logging.LogErrorf("sync data repo download failed: %s", err)
msg := fmt.Sprintf(Conf.Language(80), formatErrorMsg(err)) msg := fmt.Sprintf(Conf.Language(80), formatRepoErrorMsg(err))
if errors.Is(err, dejavu.ErrCloudStorageSizeExceeded) { if errors.Is(err, dejavu.ErrCloudStorageSizeExceeded) {
msg = fmt.Sprintf(Conf.Language(43), humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize))) msg = fmt.Sprintf(Conf.Language(43), humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize)))
if 2 == Conf.User.UserSiYuanSubscriptionPlan { if 2 == Conf.User.UserSiYuanSubscriptionPlan {
@ -894,7 +894,7 @@ func syncRepoUpload() (err error) {
planSyncAfter(fixSyncInterval) planSyncAfter(fixSyncInterval)
logging.LogErrorf("sync data repo upload failed: %s", err) logging.LogErrorf("sync data repo upload failed: %s", err)
msg := fmt.Sprintf(Conf.Language(80), formatErrorMsg(err)) msg := fmt.Sprintf(Conf.Language(80), formatRepoErrorMsg(err))
if errors.Is(err, dejavu.ErrCloudStorageSizeExceeded) { if errors.Is(err, dejavu.ErrCloudStorageSizeExceeded) {
msg = fmt.Sprintf(Conf.Language(43), humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize))) msg = fmt.Sprintf(Conf.Language(43), humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize)))
if 2 == Conf.User.UserSiYuanSubscriptionPlan { if 2 == Conf.User.UserSiYuanSubscriptionPlan {
@ -978,7 +978,7 @@ func bootSyncRepo() (err error) {
planSyncAfter(fixSyncInterval) planSyncAfter(fixSyncInterval)
logging.LogErrorf("sync data repo failed: %s", err) logging.LogErrorf("sync data repo failed: %s", err)
msg := fmt.Sprintf(Conf.Language(80), formatErrorMsg(err)) msg := fmt.Sprintf(Conf.Language(80), formatRepoErrorMsg(err))
if errors.Is(err, dejavu.ErrCloudStorageSizeExceeded) { if errors.Is(err, dejavu.ErrCloudStorageSizeExceeded) {
msg = fmt.Sprintf(Conf.Language(43), humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize))) msg = fmt.Sprintf(Conf.Language(43), humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize)))
if 2 == Conf.User.UserSiYuanSubscriptionPlan { if 2 == Conf.User.UserSiYuanSubscriptionPlan {
@ -1053,7 +1053,7 @@ func syncRepo(exit, byHand bool) (err error) {
planSyncAfter(fixSyncInterval) planSyncAfter(fixSyncInterval)
logging.LogErrorf("sync data repo failed: %s", err) logging.LogErrorf("sync data repo failed: %s", err)
msg := fmt.Sprintf(Conf.Language(80), formatErrorMsg(err)) msg := fmt.Sprintf(Conf.Language(80), formatRepoErrorMsg(err))
if errors.Is(err, dejavu.ErrCloudStorageSizeExceeded) { if errors.Is(err, dejavu.ErrCloudStorageSizeExceeded) {
msg = fmt.Sprintf(Conf.Language(43), humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize))) msg = fmt.Sprintf(Conf.Language(43), humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize)))
if 2 == Conf.User.UserSiYuanSubscriptionPlan { if 2 == Conf.User.UserSiYuanSubscriptionPlan {
@ -1267,7 +1267,7 @@ func indexRepoBeforeCloudSync(repo *dejavu.Repo) (err error) {
} }
if nil != err { if nil != err {
msg := fmt.Sprintf(Conf.Language(140), formatErrorMsg(err)) msg := fmt.Sprintf(Conf.Language(140), formatRepoErrorMsg(err))
util.PushStatusBar(msg) util.PushStatusBar(msg)
util.PushErrMsg(msg, 12000) util.PushErrMsg(msg, 12000)
logging.LogErrorf("index data repo before cloud sync failed: %s", err) logging.LogErrorf("index data repo before cloud sync failed: %s", err)

17
kernel/model/sync.go
View file

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