From 9e1220faa74aa7bc4411537ec73a65599df9184a Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sat, 2 Jul 2022 19:15:31 +0800 Subject: [PATCH] :art: Sync repo --- kernel/go.mod | 2 +- kernel/go.sum | 4 ++-- kernel/model/repository.go | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index 532bfd3f3..4782c5cc2 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -40,7 +40,7 @@ require ( github.com/qiniu/go-sdk/v7 v7.13.0 github.com/radovskyb/watcher v1.0.7 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 - github.com/siyuan-note/dejavu v0.0.0-20220702094233-326d26b2ede6 + github.com/siyuan-note/dejavu v0.0.0-20220702111355-f4242fdd0e4b github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676 github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f github.com/siyuan-note/filelock v0.0.0-20220616063212-74cfba0754ee diff --git a/kernel/go.sum b/kernel/go.sum index 476725d82..b534eef27 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -421,8 +421,8 @@ github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/siyuan-note/dejavu v0.0.0-20220702094233-326d26b2ede6 h1:02PAj3+3jdnGMcPJrUQgLGTpwG8E2fdn7jbWGVnvQQ0= -github.com/siyuan-note/dejavu v0.0.0-20220702094233-326d26b2ede6/go.mod h1:0t+TpAdsrrv+6LkhDlJY2Gl92CQexgp8KWOBp5Ah9kU= +github.com/siyuan-note/dejavu v0.0.0-20220702111355-f4242fdd0e4b h1:CDpx6Npb4Ef+XWRfe1BjFcxW3VGg02/SpOyc4eIj6hw= +github.com/siyuan-note/dejavu v0.0.0-20220702111355-f4242fdd0e4b/go.mod h1:0t+TpAdsrrv+6LkhDlJY2Gl92CQexgp8KWOBp5Ah9kU= github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676 h1:QB9TjJQFhXhZ6dAtPpY02DlzHAQm1C+WqZq6OadG8mI= github.com/siyuan-note/encryption v0.0.0-20220612074546-f1dd94fe8676/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw= github.com/siyuan-note/eventbus v0.0.0-20220624162334-ca7c06dc771f h1:JMobMNZ7AqaKKyEK+WeWFhix/2TDQXgPZDajU00IybU= diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 6b28c3c86..1409b3d68 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -272,7 +272,7 @@ func indexRepoBeforeCloudSync() { if nil != latest { if latest.ID != index.ID { // 对新创建的快照需要更新备注，加入耗时统计 - index.Memo = fmt.Sprintf("[Auto] Cloud sync, completed in [%.2fs]", elapsed.Seconds()) + 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") @@ -312,7 +312,9 @@ func syncRepo() (err error) { util.LogInfof("sync data repo elapsed [%.2fs], latest [%s]", elapsed.Seconds(), latest.ID) if nil != err { util.LogErrorf("sync data repo failed: %s", err) - util.PushStatusBar("Sync data repo failed: " + err.Error()) + msg := "Sync data repo failed: " + err.Error() + util.PushStatusBar(msg) + util.PushErrMsg(msg, 0) return } util.PushStatusBar(fmt.Sprintf(Conf.Language(149)+" [%s]", elapsed.Seconds(), latest.ID[:7]))