Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 23:38:49 +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 15:57:13 +08:00
parent 95764092ec
commit e58520b6ce
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
8 changed files with 25 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

61
kernel/model/repository.go
View file

@ -1024,12 +1024,6 @@ func syncRepoDownload() (err error) {
syncContext := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}
mergeResult, trafficStat, err := repo.SyncDownload(syncContext)
if errors.Is(err, dejavu.ErrRepoFatal) {
// 重置仓库并再次尝试同步
if _, resetErr := resetRepository(repo); nil == resetErr {
mergeResult, trafficStat, err = repo.SyncDownload(syncContext)
}
}
elapsed := time.Since(start)
if nil != err {
planSyncAfter(fixSyncInterval)
@ -1094,12 +1088,6 @@ func syncRepoUpload() (err error) {
syncContext := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}
trafficStat, err := repo.SyncUpload(syncContext)
if errors.Is(err, dejavu.ErrRepoFatal) {
// 重置仓库并再次尝试同步
if _, resetErr := resetRepository(repo); nil == resetErr {
trafficStat, err = repo.SyncUpload(syncContext)
}
}
elapsed := time.Since(start)
if nil != err {
planSyncAfter(fixSyncInterval)
@ -1172,10 +1160,18 @@ func bootSyncRepo() (err error) {
syncContext := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}
fetchedFiles, err := repo.GetSyncCloudFiles(syncContext)
if errors.Is(err, dejavu.ErrRepoFatal) {
// 重置仓库并再次尝试同步
if _, resetErr := resetRepository(repo); nil == resetErr {
fetchedFiles, err = repo.GetSyncCloudFiles(syncContext)
}
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()
util.PushStatusBar(msg)
util.PushErrMsg(msg, 0)
BootSyncSucc = 1
isBootSyncing.Store(false)
return
}
syncingFiles = sync.Map{}
@ -1266,12 +1262,6 @@ func syncRepo(exit, byHand bool) (dataChanged bool, err error) {
syncContext := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}
mergeResult, trafficStat, err := repo.Sync(syncContext)
if errors.Is(err, dejavu.ErrRepoFatal) {
// 重置仓库并再次尝试同步
if _, resetErr := resetRepository(repo); nil == resetErr {
mergeResult, trafficStat, err = repo.Sync(syncContext)
}
}
elapsed := time.Since(start)
if nil != err {
autoSyncErrCount++
@ -1529,12 +1519,8 @@ func indexRepoBeforeCloudSync(repo *dejavu.Repo) (beforeIndex, afterIndex *entit
eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar,
})
if errors.Is(err, dejavu.ErrNotFoundObject) {
var resetErr error
afterIndex, resetErr = resetRepository(repo)
if nil != resetErr {
return
}
err = nil
logging.LogErrorf("data repo is corrupted: %s", err)
return
}
if nil != err {
@ -1579,25 +1565,6 @@ func indexRepoBeforeCloudSync(repo *dejavu.Repo) (beforeIndex, afterIndex *entit
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) {
cloudConf, err := buildCloudConf()
if nil != err {