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

⚡ 云端数据同步时降低交互阻塞时间 Fix https://github.com/siyuan-note/siyuan/issues/4984

Browse source
This commit is contained in:
Liang Ding 2022-05-30 10:50:12 +08:00
parent 1cdc80e1bd
commit c88bd514d3
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
10 changed files with 63 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

18
kernel/model/import.go
View file

@ -250,8 +250,8 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
}
}
syncLock.Lock()
defer syncLock.Unlock()
writingDataLock.Lock()
defer writingDataLock.Unlock()
filesys.ReleaseAllFileLocks()
@ -279,7 +279,7 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
}
IncWorkspaceDataVer()
refreshFileTree()
RefreshFileTree()
return
}
@ -327,8 +327,8 @@ func ImportData(zipPath string) (err error) {
return errors.New("write conf.json failed")
}
syncLock.Lock()
defer syncLock.Unlock()
writingDataLock.Lock()
defer writingDataLock.Unlock()
filesys.ReleaseAllFileLocks()
tmpDataPath := filepath.Dir(filepath.Dir(confPath))
@ -339,7 +339,7 @@ func ImportData(zipPath string) (err error) {
}
IncWorkspaceDataVer()
refreshFileTree()
RefreshFileTree()
return
}
@ -347,8 +347,8 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) {
util.PushEndlessProgress(Conf.Language(73))
WaitForWritingFiles()
syncLock.Lock()
defer syncLock.Unlock()
writingDataLock.Lock()
defer writingDataLock.Unlock()
box := Conf.Box(boxID)
var baseHPath, baseTargetPath, boxLocalPath string
@ -510,7 +510,7 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) {
}
IncWorkspaceDataVer()
refreshFileTree()
RefreshFileTree()
} else { // 导入单个文件
fileName := filepath.Base(localPath)
if !strings.HasSuffix(fileName, ".md") && !strings.HasSuffix(fileName, ".markdown") {