Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Daniel 2023-06-12 12:04:28 +08:00
parent a7e6164f0e
commit b35950b957
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
kernel/api/sync.go
View file

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

2
kernel/model/repository.go
View file

@ -1175,7 +1175,7 @@ func syncRepo(exit, byHand bool) (err error) {
Conf.Save() Conf.Save()
autoSyncErrCount = 0 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]", 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) processSyncMergeResult(exit, byHand, start, mergeResult)
return return

6
kernel/model/sync.go
View file

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