Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 23:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 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:43:04 +08:00
parent f45cee76ce
commit f4b94360da
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

32
kernel/model/repository.go
View file

@ -1019,6 +1019,13 @@ func syncRepoDownload() (err error) {
_, _, err = indexRepoBeforeCloudSync(repo) _, _, err = indexRepoBeforeCloudSync(repo)
if nil != err { if nil != err {
planSyncAfter(fixSyncInterval) planSyncAfter(fixSyncInterval)
logging.LogErrorf("sync data repo download failed: %s", err)
msg := fmt.Sprintf(Conf.Language(80), formatRepoErrorMsg(err))
Conf.Sync.Stat = msg
Conf.Save()
util.PushStatusBar(msg)
util.PushErrMsg(msg, 0)
return return
} }
@ -1083,6 +1090,13 @@ func syncRepoUpload() (err error) {
_, _, err = indexRepoBeforeCloudSync(repo) _, _, err = indexRepoBeforeCloudSync(repo)
if nil != err { if nil != err {
planSyncAfter(fixSyncInterval) planSyncAfter(fixSyncInterval)
logging.LogErrorf("sync data repo upload failed: %s", err)
msg := fmt.Sprintf(Conf.Language(80), formatRepoErrorMsg(err))
Conf.Sync.Stat = msg
Conf.Save()
util.PushStatusBar(msg)
util.PushErrMsg(msg, 0)
return return
} }
@ -1263,6 +1277,18 @@ func syncRepo(exit, byHand bool) (dataChanged bool, err error) {
if nil != err { if nil != err {
autoSyncErrCount++ autoSyncErrCount++
planSyncAfter(fixSyncInterval) planSyncAfter(fixSyncInterval)
logging.LogErrorf("sync data repo failed: %s", err)
msg := fmt.Sprintf(Conf.Language(80), formatRepoErrorMsg(err))
Conf.Sync.Stat = msg
Conf.Save()
util.PushStatusBar(msg)
if 1 > autoSyncErrCount || byHand {
util.PushErrMsg(msg, 0)
}
if exit {
ExitSyncSucc = 1
}
return return
} }
@ -1525,12 +1551,6 @@ func indexRepoBeforeCloudSync(repo *dejavu.Repo) (beforeIndex, afterIndex *entit
eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar, eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar,
}) })
if nil != err { 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)
logging.LogErrorf("index data repo before cloud sync failed: %s", err) logging.LogErrorf("index data repo before cloud sync failed: %s", err)
return return
} }