0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 搜索资源文件支持跟随 assets 文件夹符号链接 Fix https://github.com/siyuan-note/siyuan/issues/6217

Browse source
This commit is contained in:
Liang Ding 2022-10-16 14:15:42 +08:00
parent a00e25cd1e
commit 56128b9cb7
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/cache/asset.go vendored
View file

@ -43,7 +43,7 @@ func LoadAssets() {
assetsLock.Lock()
defer assetsLock.Unlock()
assets := filepath.Join(util.DataDir, "assets")
assets := util.GetDataAssetsAbsPath()
filepath.Walk(assets, func(path string, info fs.FileInfo, err error) error {
if nil == info {
return err
@ -59,7 +59,7 @@ func LoadAssets() {
}
hName := util.RemoveID(info.Name())
path = filepath.ToSlash(strings.TrimPrefix(path, util.DataDir))[1:]
path = "assets" + filepath.ToSlash(strings.TrimPrefix(path, assets))
Assets[path] = &Asset{
HName: hName,
Path: path,

28
kernel/model/assets.go
View file

@ -632,11 +632,7 @@ func UnusedAssets() (ret []string) {
delete(assetsPathMap, toRemove)
}
dataAssetsAbsPath, err := getDataAssetsAbsPath()
if nil != err {
return
}
dataAssetsAbsPath := util.GetDataAssetsAbsPath()
for _, assetAbsPath := range assetsPathMap {
if _, ok := linkDestMap[assetAbsPath]; ok {
continue
@ -794,10 +790,7 @@ func allAssetAbsPaths() (assetsAbsPathMap map[string]string, err error) {
}
// 全局 assets
dataAssetsAbsPath, err := getDataAssetsAbsPath()
if nil != err {
return
}
dataAssetsAbsPath := util.GetDataAssetsAbsPath()
filepath.Walk(dataAssetsAbsPath, func(assetPath string, info fs.FileInfo, err error) error {
if dataAssetsAbsPath == assetPath {
return nil
@ -863,20 +856,3 @@ func copyAssetsToDataAssets(rootPath string) {
}
}
}
func getDataAssetsAbsPath() (ret string, err error) {
ret = filepath.Join(util.DataDir, "assets")
stat, statErr := os.Lstat(ret)
if nil != statErr {
err = statErr
return
}
if 0 != stat.Mode()&os.ModeSymlink {
// 跟随符号链接 https://github.com/siyuan-note/siyuan/issues/5480
ret, err = os.Readlink(ret)
if nil != err {
return
}
}
return
}

18
kernel/util/working.go
View file

@ -534,3 +534,21 @@ func IsValidPandocBin(binPath string) bool {
}
return false
}
func GetDataAssetsAbsPath() (ret string) {
ret = filepath.Join(DataDir, "assets")
var err error
stat, err := os.Lstat(ret)
if nil != err {
logging.LogErrorf("stat assets failed: %s", err)
return
}
if 0 != stat.Mode()&os.ModeSymlink {
// 跟随符号链接 https://github.com/siyuan-note/siyuan/issues/5480
ret, err = os.Readlink(ret)
if nil != err {
logging.LogErrorf("read assets link failed: %s", err)
}
}
return
}