Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 00:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2023-09-30 20:30:21 +08:00
commit 67e0dad0a7
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kernel/model/upload.go
View file

@ -52,13 +52,13 @@ func InsertLocalAssets(id string, assetPaths []string, isUpload bool) (succMap m
}
for _, p := range assetPaths {
fName := filepath.Base(p)
baseName := filepath.Base(p)
fName := baseName
fName = util.FilterUploadFileName(fName)
ext := filepath.Ext(fName)
fName = strings.TrimSuffix(fName, ext)
ext = strings.ToLower(ext)
fName += ext
baseName := fName
if gulu.File.IsDir(p) || !isUpload {
if !strings.HasPrefix(p, "\\\\") {
p = "file://" + p
@ -148,13 +148,14 @@ func Upload(c *gin.Context) {
succMap := map[string]interface{}{}
files := form.File["file[]"]
for _, file := range files {
fName := file.Filename
baseName := file.Filename
fName := baseName
fName = util.FilterUploadFileName(fName)
ext := filepath.Ext(fName)
fName = strings.TrimSuffix(fName, ext)
ext = strings.ToLower(ext)
fName += ext
baseName := fName
f, openErr := file.Open()
if nil != openErr {
errFiles = append(errFiles, fName)