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

🎨 Error notification pops up only once after auto sync fails https://github.com/siyuan-note/siyuan/issues/8096

Browse source
This commit is contained in:
Liang Ding 2023-04-24 15:29:34 +08:00
parent 0fc3f045e0
commit 2a8378c327
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
4 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
kernel/model/repository.go
View file

@ -902,7 +902,7 @@ func syncRepoDownload() (err error) {
Conf.Sync.Synced = util.CurrentTimeMillis()
msg := fmt.Sprintf(Conf.Language(150), trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)))
Conf.Sync.Stat = msg
syncDownloadErrCount = 0
autoSyncErrCount = 0
logging.LogInfof("synced data repo download [provider=%d, ufc=%d, dfc=%d, ucc=%d, dcc=%d, ub=%s, db=%s] in [%.2fs]",
Conf.Sync.Provider, trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)), elapsed.Seconds())
@ -969,6 +969,7 @@ func syncRepoUpload() (err error) {
Conf.Sync.Synced = util.CurrentTimeMillis()
msg := fmt.Sprintf(Conf.Language(150), trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)))
Conf.Sync.Stat = msg
autoSyncErrCount = 0
logging.LogInfof("synced data repo upload [provider=%d, ufc=%d, dfc=%d, ucc=%d, dcc=%d, ub=%s, db=%s] in [%.2fs]",
Conf.Sync.Provider, trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)), elapsed.Seconds())
return
@ -976,7 +977,7 @@ func syncRepoUpload() (err error) {
func bootSyncRepo() (err error) {
if 1 > len(Conf.Repo.Key) {
syncDownloadErrCount++
autoSyncErrCount++
planSyncAfter(fixSyncInterval)
msg := Conf.Language(26)
@ -988,7 +989,7 @@ func bootSyncRepo() (err error) {
repo, err := newRepository()
if nil != err {
syncDownloadErrCount++
autoSyncErrCount++
planSyncAfter(fixSyncInterval)
msg := fmt.Sprintf("sync repo failed: %s", err)
@ -1001,7 +1002,7 @@ func bootSyncRepo() (err error) {
start := time.Now()
err = indexRepoBeforeCloudSync(repo)
if nil != err {
syncDownloadErrCount++
autoSyncErrCount++
planSyncAfter(fixSyncInterval)
return
}
@ -1032,7 +1033,7 @@ func bootSyncRepo() (err error) {
elapsed := time.Since(start)
logging.LogInfof("boot get sync cloud files elapsed [%.2fs]", elapsed.Seconds())
if nil != err {
syncDownloadErrCount++
autoSyncErrCount++
planSyncAfter(fixSyncInterval)
logging.LogErrorf("sync data repo failed: %s", err)
@ -1067,7 +1068,7 @@ func bootSyncRepo() (err error) {
func syncRepo(exit, byHand bool) (err error) {
if 1 > len(Conf.Repo.Key) {
syncDownloadErrCount++
autoSyncErrCount++
planSyncAfter(fixSyncInterval)
msg := Conf.Language(26)
@ -1079,7 +1080,7 @@ func syncRepo(exit, byHand bool) (err error) {
repo, err := newRepository()
if nil != err {
syncDownloadErrCount++
autoSyncErrCount++
planSyncAfter(fixSyncInterval)
msg := fmt.Sprintf("sync repo failed: %s", err)
@ -1092,7 +1093,7 @@ func syncRepo(exit, byHand bool) (err error) {
start := time.Now()
err = indexRepoBeforeCloudSync(repo)
if nil != err {
syncDownloadErrCount++
autoSyncErrCount++
planSyncAfter(fixSyncInterval)
return
}
@ -1107,7 +1108,7 @@ func syncRepo(exit, byHand bool) (err error) {
}
elapsed := time.Since(start)
if nil != err {
syncDownloadErrCount++
autoSyncErrCount++
planSyncAfter(fixSyncInterval)
logging.LogErrorf("sync data repo failed: %s", err)
@ -1120,7 +1121,9 @@ func syncRepo(exit, byHand bool) (err error) {
}
Conf.Sync.Stat = msg
util.PushStatusBar(msg)
util.PushErrMsg(msg, 0)
if 1 > autoSyncErrCount || byHand {
util.PushErrMsg(msg, 0)
}
if exit {
ExitSyncSucc = 1
}
@ -1131,7 +1134,7 @@ func syncRepo(exit, byHand bool) (err error) {
Conf.Sync.Synced = util.CurrentTimeMillis()
msg := fmt.Sprintf(Conf.Language(150), trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)))
Conf.Sync.Stat = msg
syncDownloadErrCount = 0
autoSyncErrCount = 0
logging.LogInfof("synced data repo [provider=%d, ufc=%d, dfc=%d, ucc=%d, dcc=%d, ub=%s, db=%s] in [%.2fs]",
Conf.Sync.Provider, trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)), elapsed.Seconds())