From 81946a7276c9c8510d75cd5601062ef9adf9c266 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Fri, 2 Sep 2022 00:51:08 +0800
Subject: [PATCH] =?UTF-8?q?:loud=5Fsound:=20=E7=BB=86=E5=8C=96=E4=BA=91?=
 =?UTF-8?q?=E7=AB=AF=E5=90=8C=E6=AD=A5=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/repository.go | 72 ++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/kernel/model/repository.go b/kernel/model/repository.go
index 24869bf69..d35250d7e 100644
--- a/kernel/model/repository.go
+++ b/kernel/model/repository.go
@@ -541,40 +541,7 @@ func syncRepo(boot, exit, byHand bool) (err error) {
 	logging.LogInfof("synced data repo [ufc=%d, dfc=%d, ucc=%d, dcc=%d, ub=%s, db=%s] in [%.2fs]",
 		trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)), elapsed.Seconds())
 
-	logging.LogInfof("sync merge result [conflicts=%d, upserts=%d, removes=%d]", len(mergeResult.Conflicts), len(mergeResult.Upserts), len(mergeResult.Removes))
-	if 0 < len(mergeResult.Conflicts) {
-		logBuilder := bytes.Buffer{}
-		for i, f := range mergeResult.Conflicts {
-			logBuilder.WriteString("  ")
-			logBuilder.WriteString(f.Path)
-			if i < len(mergeResult.Conflicts)-1 {
-				logBuilder.WriteString("\n")
-			}
-		}
-		logging.LogInfof("sync conflicts:\n%s", logBuilder.String())
-	}
-	if 0 < len(mergeResult.Upserts) {
-		logBuilder := bytes.Buffer{}
-		for i, f := range mergeResult.Upserts {
-			logBuilder.WriteString("  ")
-			logBuilder.WriteString(f.Path)
-			if i < len(mergeResult.Upserts)-1 {
-				logBuilder.WriteString("\n")
-			}
-		}
-		logging.LogInfof("sync merge upserts:\n%s", logBuilder.String())
-	}
-	if 0 < len(mergeResult.Removes) {
-		logBuilder := bytes.Buffer{}
-		for i, f := range mergeResult.Removes {
-			logBuilder.WriteString("  ")
-			logBuilder.WriteString(f.Path)
-			if i < len(mergeResult.Removes)-1 {
-				logBuilder.WriteString("\n")
-			}
-		}
-		logging.LogInfof("sync merge removes:\n%s", logBuilder.String())
-	}
+	logSyncMergeResult(mergeResult)
 
 	if 0 < len(mergeResult.Conflicts) {
 		// 云端同步发生冲突时生成副本 https://github.com/siyuan-note/siyuan/issues/5687
@@ -665,6 +632,43 @@ func syncRepo(boot, exit, byHand bool) (err error) {
 	return
 }
 
+func logSyncMergeResult(mergeResult *dejavu.MergeResult) {
+	logging.LogInfof("sync merge result [conflicts=%d, upserts=%d, removes=%d]", len(mergeResult.Conflicts), len(mergeResult.Upserts), len(mergeResult.Removes))
+	if 0 < len(mergeResult.Conflicts) {
+		logBuilder := bytes.Buffer{}
+		for i, f := range mergeResult.Conflicts {
+			logBuilder.WriteString("  ")
+			logBuilder.WriteString(f.Path)
+			if i < len(mergeResult.Conflicts)-1 {
+				logBuilder.WriteString("\n")
+			}
+		}
+		logging.LogInfof("sync conflicts:\n%s", logBuilder.String())
+	}
+	if 0 < len(mergeResult.Upserts) {
+		logBuilder := bytes.Buffer{}
+		for i, f := range mergeResult.Upserts {
+			logBuilder.WriteString("  ")
+			logBuilder.WriteString(f.Path)
+			if i < len(mergeResult.Upserts)-1 {
+				logBuilder.WriteString("\n")
+			}
+		}
+		logging.LogInfof("sync merge upserts:\n%s", logBuilder.String())
+	}
+	if 0 < len(mergeResult.Removes) {
+		logBuilder := bytes.Buffer{}
+		for i, f := range mergeResult.Removes {
+			logBuilder.WriteString("  ")
+			logBuilder.WriteString(f.Path)
+			if i < len(mergeResult.Removes)-1 {
+				logBuilder.WriteString("\n")
+			}
+		}
+		logging.LogInfof("sync merge removes:\n%s", logBuilder.String())
+	}
+}
+
 func needFullReindex(upsertTrees int) bool {
 	return 0.2 < float64(upsertTrees)/float64(treenode.CountTrees())
 }