diff --git a/kernel/conf/sync.go b/kernel/conf/sync.go index 910bb1721..686b2d448 100644 --- a/kernel/conf/sync.go +++ b/kernel/conf/sync.go @@ -63,6 +63,14 @@ const ( ProviderWebDAV = 3 // ProviderWebDAV 为 WebDAV 协议提供的云端存储服务 ) -func NewSyncProviderCheckURL() string { - return "https://www.baidu.com" +func ProviderToStr(provider int) string { + switch provider { + case ProviderSiYuan: + return "SiYuan" + case ProviderS3: + return "S3" + case ProviderWebDAV: + return "WebDAV" + } + return "Unknown" } diff --git a/kernel/model/export.go b/kernel/model/export.go index 82573e9fc..98237f737 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -288,7 +288,7 @@ func exportData(exportFolder string) (zipPath string, err error) { data := filepath.Join(util.WorkspaceDir, "data") if err = filelock.RoboCopy(data, exportFolder); nil != 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 } diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 03d21b8ef..226c57cf9 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -594,7 +594,7 @@ func UploadCloudSnapshot(tag, id string) (err error) { err = fmt.Errorf(Conf.Language(84), Conf.Language(154)) return } - err = errors.New(fmt.Sprintf(Conf.Language(84), formatErrorMsg(err))) + err = errors.New(fmt.Sprintf(Conf.Language(84), formatRepoErrorMsg(err))) return } msg := fmt.Sprintf(Conf.Language(152), uploadFileCount, uploadChunkCount, humanize.Bytes(uint64(uploadBytes))) @@ -827,7 +827,7 @@ func syncRepoDownload() (err error) { planSyncAfter(fixSyncInterval) 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) { msg = fmt.Sprintf(Conf.Language(43), humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize))) if 2 == Conf.User.UserSiYuanSubscriptionPlan { @@ -894,7 +894,7 @@ func syncRepoUpload() (err error) { planSyncAfter(fixSyncInterval) 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) { msg = fmt.Sprintf(Conf.Language(43), humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize))) if 2 == Conf.User.UserSiYuanSubscriptionPlan { @@ -978,7 +978,7 @@ func bootSyncRepo() (err error) { planSyncAfter(fixSyncInterval) 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) { msg = fmt.Sprintf(Conf.Language(43), humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize))) if 2 == Conf.User.UserSiYuanSubscriptionPlan { @@ -1053,7 +1053,7 @@ func syncRepo(exit, byHand bool) (err error) { planSyncAfter(fixSyncInterval) 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) { msg = fmt.Sprintf(Conf.Language(43), humanize.Bytes(uint64(Conf.User.UserSiYuanRepoSize))) if 2 == Conf.User.UserSiYuanSubscriptionPlan { @@ -1267,7 +1267,7 @@ func indexRepoBeforeCloudSync(repo *dejavu.Repo) (err error) { } if nil != err { - msg := fmt.Sprintf(Conf.Language(140), formatErrorMsg(err)) + msg := fmt.Sprintf(Conf.Language(140), formatRepoErrorMsg(err)) util.PushStatusBar(msg) util.PushErrMsg(msg, 12000) logging.LogErrorf("index data repo before cloud sync failed: %s", err) diff --git a/kernel/model/sync.go b/kernel/model/sync.go index 1f825cd1c..78f1187af 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -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 }