Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-22 15:04:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Data repo no longer automatically resets after corrupted https://github.com/siyuan-note/siyuan/issues/10580

Browse source
This commit is contained in:
Daniel 2024-03-12 16:35:46 +08:00
parent e58520b6ce
commit d90dff900e
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kernel/model/repository.go
View file

@ -1163,7 +1163,6 @@ func bootSyncRepo() (err error) {
autoSyncErrCount++
planSyncAfter(fixSyncInterval)
logging.LogErrorf("data repo is corrupted: %s", err)
msg := fmt.Sprintf(Conf.Language(80), formatRepoErrorMsg(err))
Conf.Sync.Stat = msg
Conf.Save()
@ -1518,12 +1517,10 @@ func indexRepoBeforeCloudSync(repo *dejavu.Repo) (beforeIndex, afterIndex *entit
afterIndex, err = repo.Index("[Sync] Cloud sync", map[string]interface{}{
eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar,
})
if errors.Is(err, dejavu.ErrNotFoundObject) {
logging.LogErrorf("data repo is corrupted: %s", err)
return
}
if nil != err {
if errors.Is(err, dejavu.ErrNotFoundObject) {
err = dejavu.ErrRepoFatal
}
msg := fmt.Sprintf(Conf.Language(140), formatRepoErrorMsg(err))
util.PushStatusBar(msg)
util.PushErrMsg(msg, 12000)

1
kernel/model/sync.go
View file

@ -221,7 +221,6 @@ func syncData(exit, byHand bool) {
logging.LogErrorf("write websocket message failed: %v", writeErr)
}
}
return
}