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

⚡ Improve serving assets performance https://github.com/siyuan-note/siyuan/issues/13501

Browse source
This commit is contained in:
Daniel 2024-12-16 23:30:26 +08:00
parent 4ab2adff4f
commit be96ea7895
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
kernel/model/assets.go
View file

@ -322,13 +322,24 @@ func GetAssetAbsPath(relativePath string) (ret string, err error) {
if strings.Contains(relativePath, "?") { if strings.Contains(relativePath, "?") {
relativePath = relativePath[:strings.Index(relativePath, "?")] relativePath = relativePath[:strings.Index(relativePath, "?")]
} }
// 在全局 assets 路径下搜索
p := filepath.Join(util.DataDir, relativePath)
if gulu.File.IsExist(p) {
ret = p
if !util.IsSubPath(util.WorkspaceDir, ret) {
err = fmt.Errorf("[%s] is not sub path of workspace", ret)
return
}
return
}
// 在笔记本下搜索
notebooks, err := ListNotebooks() notebooks, err := ListNotebooks()
if err != nil { if err != nil {
err = errors.New(Conf.Language(0)) err = errors.New(Conf.Language(0))
return return
} }
// 在笔记本下搜索
for _, notebook := range notebooks { for _, notebook := range notebooks {
notebookAbsPath := filepath.Join(util.DataDir, notebook.ID) notebookAbsPath := filepath.Join(util.DataDir, notebook.ID)
filelock.Walk(notebookAbsPath, func(path string, d fs.DirEntry, err error) error { filelock.Walk(notebookAbsPath, func(path string, d fs.DirEntry, err error) error {
@ -356,16 +367,6 @@ func GetAssetAbsPath(relativePath string) (ret string, err error) {
} }
} }
// 在全局 assets 路径下搜索
p := filepath.Join(util.DataDir, relativePath)
if gulu.File.IsExist(p) {
ret = p
if !util.IsSubPath(util.WorkspaceDir, ret) {
err = fmt.Errorf("[%s] is not sub path of workspace", ret)
return
}
return
}
return "", errors.New(fmt.Sprintf(Conf.Language(12), relativePath)) return "", errors.New(fmt.Sprintf(Conf.Language(12), relativePath))
} }