Browse Source

:art: 改进桌面端底部状态栏通知 https://github.com/siyuan-note/siyuan/issues/5294

Liang Ding 3 years ago
parent
commit
27bdcb6672
2 changed files with 15 additions and 7 deletions
  1. 13 7
      kernel/model/repository.go
  2. 2 0
      kernel/util/websocket.go

+ 13 - 7
kernel/model/repository.go

@@ -402,13 +402,19 @@ func indexRepoBeforeCloudSync() {
 		return
 	}
 	elapsed := time.Since(start)
-	if nil != latest && latest.ID != index.ID {
-		// 对新创建的快照需要更新备注,加入耗时统计
-		index.Memo = fmt.Sprintf("[Auto] Cloud sync, completed in [%.2fs]", elapsed.Seconds())
-		err = repo.PutIndex(index)
-		if nil != err {
-			util.LogErrorf("put index into data repo before cloud sync failed: %s", err)
-			return
+	if nil != latest {
+		if latest.ID != index.ID {
+			// 对新创建的快照需要更新备注,加入耗时统计
+			index.Memo = fmt.Sprintf("[Auto] Cloud sync, completed in [%.2fs]", elapsed.Seconds())
+			err = repo.PutIndex(index)
+			if nil != err {
+				util.PushStatusBar("Save data snapshot for cloud sync failed")
+				util.LogErrorf("put index into data repo before cloud sync failed: %s", err)
+				return
+			}
+			util.PushStatusBar("Made a new data snapshot for cloud sync")
+		} else {
+			util.PushStatusBar("Checked data snapshot and found no changes ")
 		}
 	}
 	if 7000 < elapsed.Milliseconds() {

+ 2 - 0
kernel/util/websocket.go

@@ -18,6 +18,7 @@ package util
 
 import (
 	"sync"
+	"time"
 
 	"github.com/88250/gulu"
 	"github.com/88250/melody"
@@ -145,6 +146,7 @@ func PushErrMsg(msg string, timeout int) (msgId string) {
 }
 
 func PushStatusBar(msg string) {
+	msg += " (" + time.Now().Format("2006-01-02 15:04:05") + ")"
 	BroadcastByType("main", "statusbar", 0, msg, nil)
 }