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

🎨 导入 .sy.zip 时增量建立索引 https://github.com/siyuan-note/siyuan/issues/7123

Browse source
This commit is contained in:
Liang Ding 2023-01-19 17:13:27 +08:00
parent 7401ae845a
commit 772984fe1b
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
4 changed files with 51 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

38
kernel/model/import.go
View file

@ -321,6 +321,7 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
}
}
// 将包含的资源文件统一移动到 data/assets/ 下
var assetsDirs []string
filepath.Walk(unzipRootPath, func(path string, info fs.FileInfo, err error) error {
if strings.Contains(path, "assets") && info.IsDir() {
@ -328,9 +329,9 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
}
return nil
})
dataAssets := filepath.Join(util.DataDir, "assets")
for _, assets := range assetsDirs {
if gulu.File.IsDir(assets) {
dataAssets := filepath.Join(util.DataDir, "assets")
if err = filelock.Copy(assets, dataAssets); nil != err {
logging.LogErrorf("copy assets from [%s] to [%s] failed: %s", assets, dataAssets, err)
return
@ -356,14 +357,47 @@ func ImportSY(zipPath, boxID, toPath string) (err error) {
return
}
var treePaths []string
filepath.Walk(unzipRootPath, func(path string, info fs.FileInfo, err error) error {
if info.IsDir() {
if strings.HasPrefix(info.Name(), ".") {
return filepath.SkipDir
}
return nil
}
if !strings.HasSuffix(info.Name(), ".sy") {
return nil
}
p := strings.TrimPrefix(path, unzipRootPath)
p = filepath.ToSlash(p)
treePaths = append(treePaths, p)
return nil
})
if err = filelock.RoboCopy(unzipRootPath, targetDir); nil != err {
logging.LogErrorf("copy data dir from [%s] to [%s] failed: %s", unzipRootPath, util.DataDir, err)
err = errors.New("copy data failed")
return
}
boxAbsPath := filepath.Join(util.DataDir, boxID)
for _, treePath := range treePaths {
absPath := filepath.Join(targetDir, treePath)
p := strings.TrimPrefix(absPath, boxAbsPath)
p = filepath.ToSlash(p)
tree, err := LoadTree(boxID, p)
if nil != err {
logging.LogErrorf("load tree [%s] failed: %s", treePath, err)
continue
}
treenode.IndexBlockTree(tree)
sql.UpsertTreeQueue(tree)
}
IncSync()
FullReindex()
return
}