From d92f805e31fa3797092ed75bf1a3a8b396e2803a Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Tue, 19 Jul 2022 10:43:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?:art:=20=E5=90=8C=E6=AD=A5=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=90=8E=E5=A6=82=E6=9E=9C=2020%=20=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=AD=98=E5=9C=A8=E6=9B=B4=E6=96=B0=E5=88=99=E5=85=A8?=
 =?UTF-8?q?=E9=87=8F=E9=87=8D=E5=BB=BA=E7=B4=A2=E5=BC=95=20Fix=20https://g?=
 =?UTF-8?q?ithub.com/siyuan-note/siyuan/issues/5456?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/index.go      |  2 +-
 kernel/model/repository.go | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/kernel/model/index.go b/kernel/model/index.go
index 46cd41c5b..18e245b45 100644
--- a/kernel/model/index.go
+++ b/kernel/model/index.go
@@ -183,7 +183,7 @@ func (box *Box) Index(fullRebuildIndex bool) (treeCount int, treeSize int64) {
 		}
 	}
 
-	bootProgressPart = 40.0 / float64(boxLen) / float64(treeCount)
+	bootProgressPart = 20.0 / float64(boxLen) / float64(treeCount)
 
 	i = 0
 	// 块级行级入库，缓存块
diff --git a/kernel/model/repository.go b/kernel/model/repository.go
index 69095c8a4..a85c573b0 100644
--- a/kernel/model/repository.go
+++ b/kernel/model/repository.go
@@ -455,7 +455,7 @@ func syncRepo(boot, exit, byHand bool) {
 		return
 	}
 
-	err = indexRepoBeforeCloudSync(repo)
+	indexBeforeSync, err := indexRepoBeforeCloudSync(repo)
 	if nil != err {
 		syncDownloadErrCount++
 		planSyncAfter(fixSyncInterval)
@@ -467,9 +467,9 @@ func syncRepo(boot, exit, byHand bool) {
 	if nil != err {
 		return
 	}
+
 	syncContext := map[string]interface{}{dejavu.CtxPushMsg: dejavu.CtxPushMsgToStatusBar}
 	_, mergeResult, trafficStat, err := repo.Sync(cloudInfo, syncContext)
-
 	elapsed := time.Since(start)
 	if nil != err {
 		syncDownloadErrCount++
@@ -526,9 +526,15 @@ func syncRepo(boot, exit, byHand bool) {
 		treenode.InitBlockTree()
 	}
 
-	incReindex(upserts, removes)
 	cache.ClearDocsIAL() // 同步后文档树文档图标没有更新 https://github.com/siyuan-note/siyuan/issues/4939
 
+	fullReindex := 0.2 < float64(len(upserts))/float64(len(indexBeforeSync.Files))
+	if fullReindex {
+		RefreshFileTree()
+		return
+	}
+	incReindex(upserts, removes)
+
 	if !boot && !exit {
 		util.ReloadUI()
 	}
@@ -543,10 +549,10 @@ func syncRepo(boot, exit, byHand bool) {
 	return
 }
 
-func indexRepoBeforeCloudSync(repo *dejavu.Repo) (err error) {
+func indexRepoBeforeCloudSync(repo *dejavu.Repo) (index *entity.Index, err error) {
 	start := time.Now()
 	latest, _ := repo.Latest()
-	index, err := repo.Index("[Sync] Cloud sync", map[string]interface{}{
+	index, err = repo.Index("[Sync] Cloud sync", map[string]interface{}{
 		dejavu.CtxPushMsg: dejavu.CtxPushMsgToStatusBar,
 	})
 	if nil != err {
@@ -682,7 +688,7 @@ func subscribeEvents() {
 	eventbus.Subscribe(dejavu.EvtCloudBeforeDownloadFiles, func(context map[string]interface{}, ids []string) {
 		msg := fmt.Sprintf(Conf.Language(165), len(ids))
 		util.SetBootDetails(msg)
-		bootProgressPart = 20 / float64(len(ids))
+		bootProgressPart = 10 / float64(len(ids))
 		contextPushMsg(context, msg)
 	})
 	eventbus.Subscribe(dejavu.EvtCloudBeforeDownloadFile, func(context map[string]interface{}, id string) {
@@ -696,7 +702,7 @@ func subscribeEvents() {
 	eventbus.Subscribe(dejavu.EvtCloudBeforeDownloadChunks, func(context map[string]interface{}, ids []string) {
 		msg := fmt.Sprintf(Conf.Language(166), len(ids))
 		util.SetBootDetails(msg)
-		bootProgressPart = 20 / float64(len(ids))
+		bootProgressPart = 10 / float64(len(ids))
 		contextPushMsg(context, msg)
 	})
 	eventbus.Subscribe(dejavu.EvtCloudBeforeDownloadChunk, func(context map[string]interface{}, id string) {

From bfb5c0cb967ef858e451e3688d2641fd4e91cf24 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Tue, 19 Jul 2022 10:53:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?:art:=20=E8=B0=83=E6=95=B4=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E5=9B=BE=E6=A0=87=E5=A4=A7=E5=B0=8F=20https://github.?=
 =?UTF-8?q?com/siyuan-note/siyuan/issues/5444?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/electron/main.js     |  14 +++++++-------
 app/stage/icon-large.png | Bin 0 -> 5625 bytes
 2 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 app/stage/icon-large.png

diff --git a/app/electron/main.js b/app/electron/main.js
index ed71d53d9..6ecd667ff 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -55,7 +55,7 @@ const showErrorWindow = (title, content) => {
     width: screen.getPrimaryDisplay().size.width / 2,
     height: screen.getPrimaryDisplay().workAreaSize.height / 2,
     frame: false,
-    icon: path.join(appDir, 'stage', 'icon.png'),
+    icon: path.join(appDir, 'stage', 'icon-large.png'),
     webPreferences: {
       nativeWindowOpen: true,
       nodeIntegration: true,
@@ -71,7 +71,7 @@ const showErrorWindow = (title, content) => {
       v: appVer,
       title: title,
       content: content,
-      icon: path.join(appDir, 'stage', 'icon.png'),
+      icon: path.join(appDir, 'stage', 'icon-large.png'),
     },
   })
   errWindow.show()
@@ -176,7 +176,7 @@ const boot = () => {
     },
     frame: 'darwin' === process.platform,
     titleBarStyle: 'hidden',
-    icon: path.join(appDir, 'stage', 'icon.png'),
+    icon: path.join(appDir, 'stage', 'icon-large.png'),
   })
 
   require('@electron/remote/main').enable(mainWindow.webContents)
@@ -361,7 +361,7 @@ const boot = () => {
 
   if ('win32' === process.platform || 'linux' === process.platform) {
     // 系统托盘
-    tray = new Tray(path.join(appDir, 'stage', 'icon.png'))
+    tray = new Tray(path.join(appDir, 'stage', 'icon-large.png'))
     tray.setToolTip('SiYuan')
     const trayMenuTemplate = [
       {
@@ -432,7 +432,7 @@ const initKernel = (initData) => {
       width: screen.getPrimaryDisplay().size.width / 2,
       height: screen.getPrimaryDisplay().workAreaSize.height / 2,
       frame: false,
-      icon: path.join(appDir, 'stage', 'icon.png'),
+      icon: path.join(appDir, 'stage', 'icon-large.png'),
       transparent: 'linux' !== process.platform,
       webPreferences: {
         nativeWindowOpen: true,
@@ -586,7 +586,7 @@ app.whenReady().then(() => {
       width: screen.getPrimaryDisplay().size.width / 2,
       height: screen.getPrimaryDisplay().workAreaSize.height / 2,
       frame: false,
-      icon: path.join(appDir, 'stage', 'icon.png'),
+      icon: path.join(appDir, 'stage', 'icon-large.png'),
       transparent: 'linux' !== process.platform,
       webPreferences: {
         nativeWindowOpen: true,
@@ -606,7 +606,7 @@ app.whenReady().then(() => {
         query: {
           home: app.getPath('home'),
           v: appVer,
-          icon: path.join(appDir, 'stage', 'icon.png'),
+          icon: path.join(appDir, 'stage', 'icon-large.png'),
         },
       })
     firstOpenWindow.show()
diff --git a/app/stage/icon-large.png b/app/stage/icon-large.png
new file mode 100644
index 0000000000000000000000000000000000000000..16c056ad7dc406324616951fb1f6ac8554b1dcf9
GIT binary patch
literal 5625
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
b<1e(>^>;S60(UH1fIRwn2XM<)^1lCXjZ~80

literal 0
HcmV?d00001