From 2d96137033210335a8962602a354227b276f902e Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Tue, 31 May 2022 09:33:08 +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=20https:?=
 =?UTF-8?q?//github.com/siyuan-note/siyuan/issues/5056?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/osssync.go | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/kernel/model/osssync.go b/kernel/model/osssync.go
index 49209273d..d203134d2 100644
--- a/kernel/model/osssync.go
+++ b/kernel/model/osssync.go
@@ -192,13 +192,11 @@ func ossDownload(localDirPath, cloudDirPath string, bootOrExit bool) (fetchedFil
 	}
 	p, _ := ants.NewPoolWithFunc(poolSize, func(arg interface{}) {
 		defer waitGroup.Done()
-		if nil != downloadErr {
-			return // 快速失败
-		}
+
 		fetch := arg.(string)
 		err = ossDownload0(localDirPath, cloudDirPath, fetch, &fetchedFiles, &transferSize, bootOrExit)
 		if nil != err {
-			downloadErr = err
+			downloadErr = err // 仅记录最后一次错误
 			return
 		}
 		if needPushProgress {
@@ -211,6 +209,11 @@ func ossDownload(localDirPath, cloudDirPath string, bootOrExit bool) (fetchedFil
 		}
 	})
 	for _, fetch := range cloudFetches {
+		if "/.siyuan/conf.json" == fetch {
+			// 同步下载可能会报错，为了确保本地数据版本号不变所以不能更新配置文件，配置文件最后单独下载
+			continue
+		}
+
 		waitGroup.Add(1)
 		p.Invoke(fetch)
 	}
@@ -220,6 +223,12 @@ func ossDownload(localDirPath, cloudDirPath string, bootOrExit bool) (fetchedFil
 		err = downloadErr
 		return
 	}
+
+	err = ossDownload0(localDirPath, cloudDirPath, "/.siyuan/conf.json", &fetchedFiles, &transferSize, bootOrExit)
+	if nil != err {
+		return
+	}
+
 	if needPushProgress {
 		util.ClearPushProgress(len(cloudFetches))
 		util.PushMsg(Conf.Language(106), 1000*60*10)