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

🎨 同步时如果发现数据仓库损坏则自动重建仓库 Fix https://github.com/siyuan-note/siyuan/issues/6144

Browse source
This commit is contained in:
Liang Ding 2022-10-10 20:29:53 +08:00
parent c1ec8035b2
commit 04a46b0c1a
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 36 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

39
kernel/model/repository.go
View file

@ -507,6 +507,12 @@ func syncRepo(boot, exit, byHand bool) (err error) {
syncContext := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}
_, mergeResult, trafficStat, err := repo.Sync(cloudInfo, syncContext)
if errors.Is(err, dejavu.ErrRepoFatalErr) {
// 重置仓库并再次尝试同步
if _, resetErr := resetRepository(repo); nil == resetErr {
_, mergeResult, trafficStat, err = repo.Sync(cloudInfo, syncContext)
}
}
elapsed := time.Since(start)
if nil != err {
syncDownloadErrCount++
@ -682,21 +688,11 @@ func indexRepoBeforeCloudSync(repo *dejavu.Repo) (err error) {
eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar,
})
if errors.Is(err, dejavu.ErrNotFoundObject) {
logging.LogWarnf("data repo is corrupted, try to reset it")
resetErr := os.RemoveAll(filepath.Join(repo.Path))
var resetErr error
index, resetErr = resetRepository(repo)
if nil != resetErr {
logging.LogErrorf("remove data repo failed: %s", resetErr)
return
}
index, err = repo.Index("[Sync] Cloud sync", map[string]interface{}{
eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar,
})
logging.LogWarnf("data repo has been reset")
go func() {
time.Sleep(5 * time.Second)
util.PushMsg(Conf.Language(105), 5000)
}()
}
if nil != err {
@ -727,6 +723,25 @@ func indexRepoBeforeCloudSync(repo *dejavu.Repo) (err error) {
return
}
func resetRepository(repo *dejavu.Repo) (index *entity.Index, err error) {
logging.LogWarnf("data repo is corrupted, try to reset it")
err = os.RemoveAll(filepath.Join(repo.Path))
if nil != err {
logging.LogErrorf("remove data repo failed: %s", err)
return
}
index, err = repo.Index("[Sync] Cloud sync", map[string]interface{}{
eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar,
})
logging.LogWarnf("data repo has been reset")
go func() {
time.Sleep(5 * time.Second)
util.PushMsg(Conf.Language(105), 5000)
}()
return
}
func newRepository() (ret *dejavu.Repo, err error) {
ignoreLines := getIgnoreLines()
ignoreLines = append(ignoreLines, "/.siyuan/conf.json") // 忽略旧版同步配置