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

✨ 数据仓库支持云端备份 https://github.com/siyuan-note/siyuan/issues/5336

Browse source
This commit is contained in:
Liang Ding 2022-07-05 09:40:10 +08:00
parent e41d411c2d
commit 1ecdb8864a
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
kernel/model/repository.go
View file

@ -85,7 +85,7 @@ func ImportRepoKey(base64Key string) (err error) {
time.Sleep(1 * time.Second)
util.PushUpdateMsg(msgId, Conf.Language(138), 3000)
time.Sleep(1 * time.Second)
if initErr := indexRepo("[Auto] Init data repo"); nil != initErr {
if initErr := indexRepo("[Init] Init data repo"); nil != initErr {
util.PushUpdateMsg(msgId, fmt.Sprintf(Conf.Language(140), initErr), 7000)
}
return
@ -145,7 +145,7 @@ func InitRepoKey() (err error) {
time.Sleep(1 * time.Second)
util.PushUpdateMsg(msgId, Conf.Language(138), 3000)
time.Sleep(1 * time.Second)
if initErr := indexRepo("[Auto] Init data repo"); nil != initErr {
if initErr := indexRepo("[Init] Init data repo"); nil != initErr {
util.PushUpdateMsg(msgId, fmt.Sprintf(Conf.Language(140), initErr), 7000)
}
return
@ -228,9 +228,16 @@ func CreateSnapshot(name string) (err error) {
CtxPushMsg: CtxPushMsgToStatusBarAndProgress,
})
if nil != err {
util.PushStatusBar("Create data snapshot failed")
util.PushStatusBar("Create data snapshot failed: " + err.Error())
return
}
if err = repo.AddTag(index.ID, name); nil != err {
msg := fmt.Sprintf("Add tag to data snapshot [%s] failed: %s", index.ID, err)
util.PushStatusBar(msg)
return
}
elapsed := time.Since(start)
if nil == latest || latest.ID != index.ID {
@ -397,7 +404,7 @@ func syncRepo(boot, exit, byHand bool) {
func indexRepoBeforeCloudSync(repo *dejavu.Repo) (err error) {
start := time.Now()
latest, _ := repo.Latest()
index, err := repo.Index("[Auto] Cloud sync", map[string]interface{}{
index, err := repo.Index("[Sync] Cloud sync", map[string]interface{}{
CtxPushMsg: CtxPushMsgToStatusBar,
})
if nil != err {
@ -409,7 +416,7 @@ func indexRepoBeforeCloudSync(repo *dejavu.Repo) (err error) {
if nil == latest || latest.ID != index.ID {
// 对新创建的快照需要更新备注，加入耗时统计
index.Memo = fmt.Sprintf("[Auto] Cloud sync, completed in %.2fs", elapsed.Seconds())
index.Memo = fmt.Sprintf("[Sync] Cloud sync, completed in %.2fs", elapsed.Seconds())
if err = repo.PutIndex(index); nil != err {
util.PushStatusBar("Save data snapshot for cloud sync failed")
util.LogErrorf("put index into data repo before cloud sync failed: %s", err)