Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-01 14:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 公测云端同步数据仓库 https://github.com/siyuan-note/siyuan/issues/5337

Browse source
This commit is contained in:
Liang Ding 2022-07-04 09:53:31 +08:00
parent 5747fd4356
commit 795a040485
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
kernel/model/repository.go
View file

@ -230,12 +230,12 @@ func IndexRepo(memo string) (err error) {
if nil != latest {
if latest.ID != index.ID {
util.PushStatusBar(fmt.Sprintf(Conf.Language(147)+" [%s]", elapsed.Seconds(), index.ID[:7]))
util.PushStatusBar(fmt.Sprintf(Conf.Language(147), elapsed.Seconds()))
} else {
util.PushStatusBar(Conf.Language(148) + " [" + index.ID[:7] + "]")
util.PushStatusBar(Conf.Language(148))
}
} else {
util.PushStatusBar(fmt.Sprintf(Conf.Language(147)+" [%s]", elapsed.Seconds(), index.ID[:7]))
util.PushStatusBar(fmt.Sprintf(Conf.Language(147), elapsed.Seconds()))
}
util.PushClearProgress()
return
@ -298,7 +298,7 @@ func syncRepo(byHand bool) {
util.PushErrMsg(msg, 0)
return
}
util.PushStatusBar(fmt.Sprintf(Conf.Language(149)+" [%s]", elapsed.Seconds(), latest.ID[:7]))
util.PushStatusBar(fmt.Sprintf(Conf.Language(149), elapsed.Seconds()))
if 1 > len(mergeUpserts) && 1 > len(mergeRemoves) { // 没有数据变更
syncSameCount++
@ -331,7 +331,7 @@ func syncRepo(byHand bool) {
elapsed = time.Since(start)
go func() {
time.Sleep(2 * time.Second)
util.PushStatusBar(fmt.Sprintf(Conf.Language(149)+" [%s]", elapsed.Seconds(), latest.ID[:7]))
util.PushStatusBar(fmt.Sprintf(Conf.Language(149), elapsed.Seconds()))
}()
return
}
@ -358,12 +358,12 @@ func indexRepoBeforeCloudSync(repo *dejavu.Repo) (err error) {
util.LogErrorf("put index into data repo before cloud sync failed: %s", err)
return
}
util.PushStatusBar(fmt.Sprintf(Conf.Language(147)+" [%s]", elapsed.Seconds(), latest.ID[:7]))
util.PushStatusBar(fmt.Sprintf(Conf.Language(147), elapsed.Seconds()))
} else {
util.PushStatusBar(Conf.Language(148) + " [" + latest.ID[:7] + "]")
util.PushStatusBar(Conf.Language(148))
}
} else {
util.PushStatusBar(fmt.Sprintf(Conf.Language(147)+" [%s]", elapsed.Seconds(), latest.ID[:7]))
util.PushStatusBar(fmt.Sprintf(Conf.Language(147), elapsed.Seconds()))
}
if 7000 < elapsed.Milliseconds() {
util.LogWarnf("index data repo before cloud sync elapsed [%dms]", elapsed.Milliseconds())