Prechádzať zdrojové kódy

:art: Improve the mouse hove data sync button information on the desktop and browser https://github.com/siyuan-note/siyuan/issues/8521

Daniel 2 rokov pred
rodič
commit
b35950b957
3 zmenil súbory, kde vykonal 5 pridanie a 4 odobranie
  1. 1 0
      kernel/api/sync.go
  2. 1 1
      kernel/model/repository.go
  3. 3 3
      kernel/model/sync.go

+ 1 - 0
kernel/api/sync.go

@@ -39,6 +39,7 @@ func getSyncInfo(c *gin.Context) {
 		"synced":  model.Conf.Sync.Synced,
 		"stat":    stat,
 		"kernels": model.GetOnlineKernels(),
+		"kernel":  model.KernelID,
 	}
 }
 

+ 1 - 1
kernel/model/repository.go

@@ -1175,7 +1175,7 @@ func syncRepo(exit, byHand bool) (err error) {
 	Conf.Save()
 	autoSyncErrCount = 0
 	logging.LogInfof("synced data repo [kernel=%s, provider=%d, ufc=%d, dfc=%d, ucc=%d, dcc=%d, ub=%s, db=%s] in [%.2fs]",
-		kernelID, Conf.Sync.Provider, trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)), elapsed.Seconds())
+		KernelID, Conf.Sync.Provider, trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)), elapsed.Seconds())
 
 	processSyncMergeResult(exit, byHand, start, mergeResult)
 	return

+ 3 - 3
kernel/model/sync.go

@@ -623,7 +623,7 @@ func GetOnlineKernels() (ret []*OnlineKernel) {
 	tmp := onlineKernels
 	onlineKernelsLock.Unlock()
 	for _, kernel := range tmp {
-		if kernel.ID == kernelID {
+		if kernel.ID == KernelID {
 			continue
 		}
 
@@ -740,14 +740,14 @@ func connectSyncWebSocket() {
 	}()
 }
 
-var kernelID = gulu.Rand.String(7)
+var KernelID = gulu.Rand.String(7)
 
 func dialSyncWebSocket() (c *websocket.Conn, err error) {
 	//endpoint := "ws://127.0.0.1:64388" + "/apis/siyuan/dejavu/ws"
 	endpoint := util.AliyunWebSocketServer + "/apis/siyuan/dejavu/ws"
 	header := http.Header{
 		"x-siyuan-uid":      []string{Conf.User.UserId},
-		"x-siyuan-kernel":   []string{kernelID},
+		"x-siyuan-kernel":   []string{KernelID},
 		"x-siyuan-ver":      []string{util.Ver},
 		"x-siyuan-os":       []string{runtime.GOOS},
 		"x-siyuan-hostname": []string{util.GetDeviceName()},