github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-03 19:41:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 无法插入资源文件的问题 Fix https://github.com/siyuan-note/siyuan/issues/5971

Browse Source
This commit is contained in:
Liang Ding 2022-09-26 20:20:50 +08:00
parent f7d91a67b9
commit e536f5d4b6
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/cache/asset.go vendored
View File

@ -45,6 +45,9 @@ func LoadAssets() {
assets := filepath.Join(util.DataDir, "assets") assets := filepath.Join(util.DataDir, "assets")
filepath.Walk(assets, func(path string, info fs.FileInfo, err error) error { filepath.Walk(assets, func(path string, info fs.FileInfo, err error) error {
if nil == info {
return err
}
if info.IsDir() { if info.IsDir() {
if strings.HasPrefix(info.Name(), ".") { if strings.HasPrefix(info.Name(), ".") {
return filepath.SkipDir return filepath.SkipDir

10
kernel/model/upload.go
View File

@ -45,6 +45,12 @@ func InsertLocalAssets(id string, assetPaths []string) (succMap map[string]inter
docDirLocalPath := filepath.Join(util.DataDir, bt.BoxID, path.Dir(bt.Path)) docDirLocalPath := filepath.Join(util.DataDir, bt.BoxID, path.Dir(bt.Path))
assets := getAssetsDir(filepath.Join(util.DataDir, bt.BoxID), docDirLocalPath) assets := getAssetsDir(filepath.Join(util.DataDir, bt.BoxID), docDirLocalPath)
if !gulu.File.IsExist(assets) {
if err = os.MkdirAll(assets, 0755); nil != err {
return
}
}
for _, p := range assetPaths { for _, p := range assetPaths {
fName := filepath.Base(p) fName := filepath.Base(p)
fName = util.FilterUploadFileName(fName) fName = util.FilterUploadFileName(fName)
@ -124,7 +130,9 @@ func Upload(c *gin.Context) {
if nil != form.Value["assetsDirPath"] { if nil != form.Value["assetsDirPath"] {
assetsDirPath = form.Value["assetsDirPath"][0] assetsDirPath = form.Value["assetsDirPath"][0]
assetsDirPath = filepath.Join(util.DataDir, assetsDirPath) assetsDirPath = filepath.Join(util.DataDir, assetsDirPath)
if err := os.MkdirAll(assetsDirPath, 0755); nil != err { }
if !gulu.File.IsExist(assetsDirPath) {
if err = os.MkdirAll(assetsDirPath, 0755); nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = err.Error() ret.Msg = err.Error()
return return