diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20210615213222-vs5tzbd.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20210615213222-vs5tzbd.sy index 7a6543fce..9b28e979e 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20210615213222-vs5tzbd.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20210615213222-vs5tzbd.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20210615213222-vs5tzbd", "title": "Data history", - "updated": "20220615120852" + "updated": "20220625231856" }, "Children": [ { @@ -552,7 +552,7 @@ "ListData": {}, "Properties": { "id": "20220501135308-3azjqzh", - "updated": "20220615120419" + "updated": "20220625231844" }, "Children": [ { @@ -564,7 +564,7 @@ }, "Properties": { "id": "20220501135308-itmzgsj", - "updated": "20220615120419" + "updated": "20220625231844" }, "Children": [ { @@ -572,12 +572,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220501135308-yvsiton", - "updated": "20220615120419" + "updated": "20220625231844" }, "Children": [ { "Type": "NodeText", - "Data": "At the top " + "Data": "Click the " }, { "Type": "NodeKbd", @@ -588,7 +588,7 @@ }, { "Type": "NodeText", - "Data": "..." + "Data": "Data History" }, { "Type": "NodeKbdCloseMarker" @@ -597,7 +597,7 @@ }, { "Type": "NodeText", - "Data": " menu or " + "Data": " button on the top toolbar or " }, { "Type": "NodeKbd", @@ -1400,7 +1400,7 @@ }, "Properties": { "id": "20220615120602-5r3nl34", - "updated": "20220615120840" + "updated": "20220625231856" }, "Children": [ { @@ -1414,7 +1414,7 @@ }, "Properties": { "id": "20220615120602-a20qin2", - "updated": "20220615120602" + "updated": "20220625231856" }, "Children": [ { @@ -1422,12 +1422,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220615120602-k0xs8n5", - "updated": "20220615120602" + "updated": "20220625231856" }, "Children": [ { "Type": "NodeText", - "Data": "On the top " + "Data": "Click the " }, { "Type": "NodeKbd", @@ -1438,7 +1438,7 @@ }, { "Type": "NodeText", - "Data": "..." + "Data": "Data History" }, { "Type": "NodeKbdCloseMarker" @@ -1447,7 +1447,7 @@ }, { "Type": "NodeText", - "Data": " menu or " + "Data": " button on the top toolbar or " }, { "Type": "NodeKbd", diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20210615211733-v6rzowm.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20210615211733-v6rzowm.sy index 5cb5e2336..dc654226e 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20210615211733-v6rzowm.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20210615211733-v6rzowm.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20210615211733-v6rzowm", "title": "数据历史", - "updated": "20220615120214" + "updated": "20220625231706" }, "Children": [ { @@ -572,7 +572,7 @@ "ListData": {}, "Properties": { "id": "20210104090742-8rmcz3i", - "updated": "20220615112450" + "updated": "20220625231706" }, "Children": [ { @@ -584,7 +584,7 @@ }, "Properties": { "id": "20220501135052-k47n4ms", - "updated": "20220615112450" + "updated": "20220625231706" }, "Children": [ { @@ -592,12 +592,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220501135052-o3r30jj", - "updated": "20220615112450" + "updated": "20220625231706" }, "Children": [ { "Type": "NodeText", - "Data": "在顶部 " + "Data": "点击顶部工具栏 " }, { "Type": "NodeKbd", @@ -608,7 +608,7 @@ }, { "Type": "NodeText", - "Data": "..." + "Data": "数据历史" }, { "Type": "NodeKbdCloseMarker" @@ -617,7 +617,7 @@ }, { "Type": "NodeText", - "Data": " 菜单或者 " + "Data": " 按钮或者 " }, { "Type": "NodeKbd", @@ -1420,7 +1420,7 @@ }, "Properties": { "id": "20220615112933-zoh8iyg", - "updated": "20220615120214" + "updated": "20220625231649" }, "Children": [ { @@ -1434,7 +1434,7 @@ }, "Properties": { "id": "20220615114246-9or7h68", - "updated": "20220615114246" + "updated": "20220625231649" }, "Children": [ { @@ -1442,12 +1442,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220615114246-lr3ydl0", - "updated": "20220615114250" + "updated": "20220625231649" }, "Children": [ { "Type": "NodeText", - "Data": "在顶部 " + "Data": "点击顶部工具栏 " }, { "Type": "NodeKbd", @@ -1458,7 +1458,7 @@ }, { "Type": "NodeText", - "Data": "..." + "Data": "数据历史" }, { "Type": "NodeKbdCloseMarker" @@ -1467,7 +1467,7 @@ }, { "Type": "NodeText", - "Data": " 菜单或者 " + "Data": " 按钮或者 " }, { "Type": "NodeKbd", diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122707-8cr09co.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122707-8cr09co.sy index ecd28a6de..5b7b5b737 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122707-8cr09co.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122707-8cr09co.sy @@ -4,7 +4,7 @@ "Properties": { "id": "20211226122707-8cr09co", "title": "數據歷史", - "updated": "20220615120430" + "updated": "20220625231923" }, "Children": [ { @@ -552,7 +552,7 @@ "ListData": {}, "Properties": { "id": "20220501135134-lh5drjl", - "updated": "20220615120430" + "updated": "20220625231918" }, "Children": [ { @@ -564,7 +564,7 @@ }, "Properties": { "id": "20220501135134-nkzl4wl", - "updated": "20220615120430" + "updated": "20220625231918" }, "Children": [ { @@ -572,12 +572,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220501135134-n7t2zfn", - "updated": "20220615120430" + "updated": "20220625231918" }, "Children": [ { "Type": "NodeText", - "Data": "在頂部 " + "Data": "點擊頂部工具欄 " }, { "Type": "NodeKbd", @@ -588,7 +588,7 @@ }, { "Type": "NodeText", - "Data": "..." + "Data": "數據歷史" }, { "Type": "NodeKbdCloseMarker" @@ -597,7 +597,7 @@ }, { "Type": "NodeText", - "Data": " 菜單或者 " + "Data": " 按鈕或者 " }, { "Type": "NodeKbd", @@ -1400,7 +1400,7 @@ }, "Properties": { "id": "20220615120134-rfk9khd", - "updated": "20220615120216" + "updated": "20220625231923" }, "Children": [ { @@ -1414,7 +1414,7 @@ }, "Properties": { "id": "20220615120134-1uthigi", - "updated": "20220615120134" + "updated": "20220625231923" }, "Children": [ { @@ -1422,12 +1422,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220615120134-7n3iucn", - "updated": "20220615120134" + "updated": "20220625231923" }, "Children": [ { "Type": "NodeText", - "Data": "在頂部 " + "Data": "點擊頂部工具欄 " }, { "Type": "NodeKbd", @@ -1438,7 +1438,7 @@ }, { "Type": "NodeText", - "Data": "..." + "Data": "數據歷史" }, { "Type": "NodeKbdCloseMarker" @@ -1447,7 +1447,7 @@ }, { "Type": "NodeText", - "Data": " 菜單或者 " + "Data": " 按鈕或者 " }, { "Type": "NodeKbd", diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts index 7123f76eb..72be612b4 100644 --- a/app/src/util/onGetConfig.ts +++ b/app/src/util/onGetConfig.ts @@ -286,16 +286,16 @@ const initBar = () => { -
- - - -
+
+ + + +
diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 51d26788a..8de5477c8 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -35,7 +35,7 @@ import ( func init() { eventbus.Subscribe(dejavu.EvtIndexWalkData, func(context map[string]interface{}, path string) { - msg := "Indexing repo [walk data " + path + "]" + msg := "Indexing data repository [walk data " + path + "]" util.SetBootDetails(msg) switch context[CtxPushMsg].(int) { @@ -49,7 +49,7 @@ func init() { } }) eventbus.Subscribe(dejavu.EvtIndexGetLatestFile, func(context map[string]interface{}, path string) { - msg := "Indexing repo [get latest file " + path + "]" + msg := "Indexing data repository [get latest file " + path + "]" util.SetBootDetails(msg) switch context[CtxPushMsg].(int) { @@ -63,7 +63,7 @@ func init() { } }) eventbus.Subscribe(dejavu.EvtIndexUpsertFile, func(context map[string]interface{}, path string) { - msg := "Indexing repo [upsert file " + path + "]" + msg := "Indexing data repository [upsert file " + path + "]" util.SetBootDetails(msg) switch context[CtxPushMsg].(int) { @@ -78,7 +78,7 @@ func init() { }) eventbus.Subscribe(dejavu.EvtCheckoutWalkData, func(context map[string]interface{}, path string) { - msg := "Checkout repo [walk data " + path + "]" + msg := "Checkout data repository [walk data " + path + "]" util.SetBootDetails(msg) switch context[CtxPushMsg].(int) { @@ -92,7 +92,7 @@ func init() { } }) eventbus.Subscribe(dejavu.EvtCheckoutUpsertFile, func(context map[string]interface{}, path string) { - msg := "Checkout repo [upsert file " + path + "]" + msg := "Checkout data repository [upsert file " + path + "]" util.SetBootDetails(msg) switch context[CtxPushMsg].(int) { @@ -106,7 +106,7 @@ func init() { } }) eventbus.Subscribe(dejavu.EvtCheckoutRemoveFile, func(context map[string]interface{}, path string) { - msg := "Checkout repo [remove file " + path + "]" + msg := "Checkout data repository [remove file " + path + "]" util.SetBootDetails(msg) switch context[CtxPushMsg].(int) { @@ -121,7 +121,7 @@ func init() { }) eventbus.Subscribe(dejavu.EvtSyncBeforeDownloadCloudIndexes, func(context map[string]interface{}, latestSync string) { - msg := "Downloading repo indexes..." + msg := "Downloading data repository indexes..." util.SetBootDetails(msg) switch context[CtxPushMsg].(int) { @@ -136,7 +136,7 @@ func init() { }) eventbus.Subscribe(dejavu.EvtSyncBeforeDownloadCloudFile, func(context map[string]interface{}, id string) { - msg := "Downloading repo object [" + id + "]" + msg := "Downloading data repository object [" + id + "]" util.SetBootDetails(msg) switch context[CtxPushMsg].(int) { @@ -151,7 +151,7 @@ func init() { }) eventbus.Subscribe(dejavu.EvtSyncBeforeDownloadCloudChunk, func(context map[string]interface{}, id string) { - msg := "Downloading repo object [" + id + "]" + msg := "Downloading data repository object [" + id + "]" util.SetBootDetails(msg) switch context[CtxPushMsg].(int) { @@ -166,7 +166,7 @@ func init() { }) eventbus.Subscribe(dejavu.EvtSyncBeforeUploadObject, func(context map[string]interface{}, id string) { - msg := "Uploading repo object [" + id + "]" + msg := "Uploading data repository object [" + id + "]" util.SetBootDetails(msg) switch context[CtxPushMsg].(int) { @@ -189,7 +189,7 @@ func GetRepoIndexLogs(page int) (logs []*dejavu.Log, pageCount, totalCount int, repo, err := dejavu.NewRepo(util.DataDir, util.RepoDir, Conf.Repo.Key) if nil != err { - util.LogErrorf("init repo failed: %s", err) + util.LogErrorf("init data repository failed: %s", err) return } @@ -201,7 +201,7 @@ func GetRepoIndexLogs(page int) (logs []*dejavu.Log, pageCount, totalCount int, return } - util.LogErrorf("get repo index logs failed: %s", err) + util.LogErrorf("get data repo index logs failed: %s", err) return } return @@ -269,7 +269,7 @@ func InitRepoKey() (err error) { randomBytes = make([]byte, 16) _, err = rand.Read(randomBytes) if nil != err { - util.LogErrorf("init repo key failed: %s", err) + util.LogErrorf("init data repo key failed: %s", err) util.PushUpdateMsg(msgId, Conf.Language(137), 5000) return } @@ -277,7 +277,7 @@ func InitRepoKey() (err error) { key, err := encryption.KDF(password, salt) if nil != err { - util.LogErrorf("init repo key failed: %s", err) + util.LogErrorf("init data repo key failed: %s", err) util.PushUpdateMsg(msgId, Conf.Language(137), 5000) return } @@ -301,7 +301,7 @@ func CheckoutRepo(id string) (err error) { repo, err := dejavu.NewRepo(util.DataDir, util.RepoDir, Conf.Repo.Key) if nil != err { - util.LogErrorf("init repo failed: %s", err) + util.LogErrorf("init data repo failed: %s", err) return } @@ -351,7 +351,7 @@ func IndexRepo(memo string) (err error) { repo, err := dejavu.NewRepo(util.DataDir, util.RepoDir, Conf.Repo.Key) if nil != err { - util.LogErrorf("init repo failed: %s", err) + util.LogErrorf("init data repo failed: %s", err) return } @@ -383,7 +383,7 @@ func indexRepoBeforeCloudSync() { repo, err := dejavu.NewRepo(util.DataDir, util.RepoDir, Conf.Repo.Key) if nil != err { - util.LogErrorf("init repo failed: %s", err) + util.LogErrorf("init data repo failed: %s", err) return } @@ -393,7 +393,7 @@ func indexRepoBeforeCloudSync() { CtxPushMsg: CtxPushMsgToStatusBar, }) if nil != err { - util.LogErrorf("index repo before cloud sync failed: %s", err) + util.LogErrorf("index data repo before cloud sync failed: %s", err) return } elapsed := time.Since(start) @@ -402,12 +402,12 @@ func indexRepoBeforeCloudSync() { index.Memo = fmt.Sprintf("[Auto] Cloud sync, completed in [%.2fs]", elapsed.Seconds()) err = repo.PutIndex(index) if nil != err { - util.LogErrorf("put index into repo before cloud sync failed: %s", err) + util.LogErrorf("put index into data repo before cloud sync failed: %s", err) return } } if 7000 < elapsed.Milliseconds() { - util.LogWarnf("index repo before cloud sync elapsed [%dms]", elapsed.Milliseconds()) + util.LogWarnf("index data repo before cloud sync elapsed [%dms]", elapsed.Milliseconds()) } } @@ -418,7 +418,7 @@ func syncRepo() (err error) { repo, err := dejavu.NewRepo(util.DataDir, util.RepoDir, Conf.Repo.Key) if nil != err { - util.LogErrorf("init repo failed: %s", err) + util.LogErrorf("init data repo failed: %s", err) return } @@ -427,6 +427,7 @@ func syncRepo() (err error) { CtxPushMsg: CtxPushMsgToStatusBar, }) elapsed := time.Since(start) - util.LogInfof("sync repo elapsed [%.2fs]", elapsed.Seconds()) + util.LogInfof("sync data repo elapsed [%.2fs]", elapsed.Seconds()) + util.PushStatusBar(fmt.Sprintf("Sync data data repo elapsed [%.2fs]", elapsed.Seconds())) return }