From f3aa37f21c5f6a473d4cdae1304a2f5dd627bb6e Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Fri, 3 Feb 2023 20:07:54 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/sync.go | 45 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/kernel/model/sync.go b/kernel/model/sync.go
index 7f9bb848a..e8462d68f 100644
--- a/kernel/model/sync.go
+++ b/kernel/model/sync.go
@@ -28,6 +28,7 @@ import (
 
 	"github.com/88250/gulu"
 	"github.com/dustin/go-humanize"
+	"github.com/siyuan-note/dejavu"
 	"github.com/siyuan-note/dejavu/cloud"
 	"github.com/siyuan-note/logging"
 	"github.com/siyuan-note/siyuan/kernel/conf"
@@ -415,32 +416,32 @@ func ListCloudSyncDir() (syncDirs []*Sync, hSize string, err error) {
 }
 
 func formatErrorMsg(err error) string {
-	if errors.Is(err, cloud.ErrCloudAuthFailed) {
-		return Conf.Language(31) + " v" + util.Ver
-	}
-
 	msg := err.Error()
-	msgLowerCase := strings.ToLower(msg)
-	if strings.Contains(msgLowerCase, "permission denied") || strings.Contains(msg, "access is denied") {
-		msg = Conf.Language(33) + " " + err.Error()
-	} else if strings.Contains(msgLowerCase, "device or resource busy") || strings.Contains(msg, "is being used by another") {
-		msg = fmt.Sprintf(Conf.Language(85), err)
-	} else if strings.Contains(msgLowerCase, "cipher: message authentication failed") {
-		msg = Conf.Language(135)
-	} else if strings.Contains(msgLowerCase, "repo fatal error") {
-		msg = Conf.Language(23)
-	} else if strings.Contains(msgLowerCase, "no such host") || strings.Contains(msgLowerCase, "connection failed") || strings.Contains(msgLowerCase, "hostname resolution") || strings.Contains(msgLowerCase, "No address associated with hostname") {
-		msg = Conf.Language(24)
-	} else if strings.Contains(msgLowerCase, "net/http: request canceled while waiting for connection") || strings.Contains(msgLowerCase, "exceeded while awaiting") || strings.Contains(msgLowerCase, "context deadline exceeded") || strings.Contains(msgLowerCase, "timeout") || strings.Contains(msgLowerCase, "context cancellation while reading body") {
-		msg = Conf.Language(24)
-	} else if strings.Contains(msgLowerCase, "connection was") || strings.Contains(msgLowerCase, "reset by peer") || strings.Contains(msgLowerCase, "refused") || strings.Contains(msgLowerCase, "socket") {
-		msg = Conf.Language(28)
-	} else if strings.Contains(msgLowerCase, "cloud object not found") {
+	if errors.Is(err, cloud.ErrCloudAuthFailed) {
+		msg = Conf.Language(31)
+	} else if errors.Is(err, cloud.ErrCloudObjectNotFound) {
 		msg = Conf.Language(129)
-	} else if strings.Contains(msgLowerCase, "lock cloud repo failed") {
+	} else if errors.Is(err, dejavu.ErrLockCloudFailed) {
 		msg = Conf.Language(188)
-	} else if strings.Contains(msgLowerCase, "cloud repo is locked") {
+	} else if errors.Is(err, dejavu.ErrCloudLocked) {
 		msg = Conf.Language(189)
+	} else if errors.Is(err, dejavu.ErrRepoFatalErr) {
+		msg = Conf.Language(23)
+	} else {
+		msgLowerCase := strings.ToLower(msg)
+		if strings.Contains(msgLowerCase, "permission denied") || strings.Contains(msg, "access is denied") {
+			msg = Conf.Language(33)
+		} else if strings.Contains(msgLowerCase, "device or resource busy") || strings.Contains(msg, "is being used by another") {
+			msg = fmt.Sprintf(Conf.Language(85), err)
+		} else if strings.Contains(msgLowerCase, "cipher: message authentication failed") {
+			msg = Conf.Language(135)
+		} else if strings.Contains(msgLowerCase, "no such host") || strings.Contains(msgLowerCase, "connection failed") || strings.Contains(msgLowerCase, "hostname resolution") || strings.Contains(msgLowerCase, "No address associated with hostname") {
+			msg = Conf.Language(24)
+		} else if strings.Contains(msgLowerCase, "net/http: request canceled while waiting for connection") || strings.Contains(msgLowerCase, "exceeded while awaiting") || strings.Contains(msgLowerCase, "context deadline exceeded") || strings.Contains(msgLowerCase, "timeout") || strings.Contains(msgLowerCase, "context cancellation while reading body") {
+			msg = Conf.Language(24)
+		} else if strings.Contains(msgLowerCase, "connection was") || strings.Contains(msgLowerCase, "reset by peer") || strings.Contains(msgLowerCase, "refused") || strings.Contains(msgLowerCase, "socket") {
+			msg = Conf.Language(28)
+		}
 	}
 	msg = msg + " v" + util.Ver
 	return msg