From fa45fafca415c14165e20bb9abb8683f2b6b1c33 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Tue, 31 May 2022 11:35:52 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E5=90=8C=E6=AD=A5=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=96=AD=E7=82=B9=E7=BB=AD=E4=BC=A0=20Fix=20?=
 =?UTF-8?q?https://github.com/siyuan-note/siyuan/issues/5056?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/sync.go | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/kernel/model/sync.go b/kernel/model/sync.go
index 350e76832..708a34134 100644
--- a/kernel/model/sync.go
+++ b/kernel/model/sync.go
@@ -300,7 +300,9 @@ func SyncData(boot, exit, byHand bool) {
 		syncDownloadErrCount++
 		return
 	}
-	data, err := os.ReadFile(filepath.Join(util.TempDir, "/sync/"+pathJSON))
+
+	tmpPathJSON := filepath.Join(util.TempDir, "/sync/"+pathJSON)
+	data, err := os.ReadFile(tmpPathJSON)
 	if nil != err {
 		return
 	}
@@ -320,6 +322,20 @@ func SyncData(boot, exit, byHand bool) {
 		syncDownloadErrCount++
 		return
 	}
+	if err = os.Rename(tmpPathJSON, filepath.Join(localSyncDirPath, pathJSON)); nil != err {
+		util.PushClearMsg()
+		msg := fmt.Sprintf(Conf.Language(80), formatErrorMsg(err))
+		Conf.Sync.Stat = msg
+		util.PushErrMsg(msg, 7000)
+		if boot {
+			BootSyncSucc = 1
+		}
+		if exit {
+			ExitSyncSucc = 1
+		}
+		syncDownloadErrCount++
+		return
+	}
 
 	fetchedFilesCount, transferSize, downloadedFiles, err := ossDownload(localSyncDirPath, "sync/"+Conf.Sync.CloudName, boot || exit)
 	if nil != err {