Merge remote-tracking branch 'origin/dev' into dev

kernel/cache/asset.go

@@ -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,

kernel/model/assets.go

@@ -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
-}

kernel/util/working.go

@@ -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
+}