From 1db705b6c63a44d761b75aced938fe4bf9b8e33f Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 15 Jun 2022 11:02:34 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=BD=9C=E5=9C=A8=E7=9A=84=E5=A4=87?= =?UTF-8?q?=E4=BB=BD=E9=94=81=E6=96=87=E4=BB=B6=E9=97=AE=E9=A2=98=20https:?= =?UTF-8?q?//ld246.com/article/1655253842949?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/backup.go | 4 +++- kernel/model/repository.go | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/model/backup.go b/kernel/model/backup.go index 2daa7be13..d11fb8688 100644 --- a/kernel/model/backup.go +++ b/kernel/model/backup.go @@ -252,8 +252,10 @@ func CreateLocalBackup() (err error) { defer util.ClearPushProgress(100) util.PushEndlessProgress(Conf.Language(22)) + writingDataLock.Lock() + defer writingDataLock.Unlock() WaitForWritingFiles() - + sql.WaitForWritingDatabase() filesys.ReleaseAllFileLocks() util.LogInfof("creating backup...") diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 5d4d648cb..911ae83e6 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -192,14 +192,12 @@ func IndexRepo(memo string) (err error) { return } + util.PushEndlessProgress(Conf.Language(143)) writingDataLock.Lock() defer writingDataLock.Unlock() - util.PushEndlessProgress(Conf.Language(143)) WaitForWritingFiles() sql.WaitForWritingDatabase() filesys.ReleaseAllFileLocks() - CloseWatchAssets() - defer WatchAssets() _, err = repo.Index(memo, util.PushEndlessProgress, indexCallbacks) util.PushClearProgress()