提交 7f065e5c 编写于 作者: chai2010's avatar chai2010

修复 windows 路径错误

上级 38905554
......@@ -5,6 +5,7 @@ package loader
import (
"io/fs"
"os"
pathpkg "path"
"path/filepath"
"sort"
"strings"
......@@ -273,6 +274,7 @@ func (p *_Loader) ParseDir(pkgpath string) ([]*ast.File, error) {
}
func (p *_Loader) readDirFiles(fileSystem fs.FS, path string) (filenames []string, datas [][]byte, err error) {
path = filepath.ToSlash(path)
path = strings.TrimPrefix(path, "/")
logger.Tracef(&config.EnableTrace_loader, "path: %v", path)
......@@ -306,7 +308,8 @@ func (p *_Loader) readDirFiles(fileSystem fs.FS, path string) (filenames []strin
for _, name := range filenames {
var fpath string
if path != "" && path != "." {
fpath = strings.TrimPrefix(filepath.Join(path, name), "/")
// embed.FS 采用 Unix 风格路径
fpath = strings.TrimPrefix(pathpkg.Join(path, name), "/")
} else {
fpath = strings.TrimPrefix(name, "/")
}
......
......@@ -5,7 +5,6 @@ package waroot
import (
"embed"
"io/fs"
"path/filepath"
"strings"
)
......@@ -13,7 +12,8 @@ import (
var _warootFS embed.FS
func GetFS() fs.FS {
fs, err := fs.Sub(_warootFS, filepath.Join("_waroot", "src"))
// embed.FS 均采用 Unix 风格路径
fs, err := fs.Sub(_warootFS, "_waroot/src")
if err != nil {
panic(err)
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册