Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-19 16:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 插入资源文件时文件名长度最大限制 189 字节 https://github.com/siyuan-note/siyuan/issues/7099

Browse source
This commit is contained in:
Liang Ding 2023-01-17 21:34:12 +08:00
parent 5734548f78
commit ce2fadac6a
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/assets.go
View file

@ -176,7 +176,7 @@ func NetImg2LocalAssets(rootID string) (err error) {
} }
} }
name = strings.TrimSuffix(name, ext) name = strings.TrimSuffix(name, ext)
name = gulu.Str.SubStr(name, 64) name = gulu.Str.SubStr(name, 63) // 插入资源文件时文件名长度最大限制 189 字节 https://github.com/siyuan-note/siyuan/issues/7099
name = util.FilterFileName(name) name = util.FilterFileName(name)
name = "net-img-" + name + "-" + ast.NewNodeID() + ext name = "net-img-" + name + "-" + ast.NewNodeID() + ext
writePath := filepath.Join(assetsDirPath, name) writePath := filepath.Join(assetsDirPath, name)

6
kernel/util/file.go
View file

@ -54,11 +54,11 @@ func AssetName(name string) string {
_, id := LastID(name) _, id := LastID(name)
ext := path.Ext(name) ext := path.Ext(name)
name = name[0 : len(name)-len(ext)] name = name[0 : len(name)-len(ext)]
if !IsIDPattern(id) { if !ast.IsNodeIDPattern(id) {
id = ast.NewNodeID() id = ast.NewNodeID()
name = name + "-" + id + ext name = name + "-" + id + ext
} else { } else {
if !IsIDPattern(name) { if !ast.IsNodeIDPattern(name) {
name = name[:len(name)-len(id)-1] + "-" + id + ext name = name[:len(name)-len(id)-1] + "-" + id + ext
} else { } else {
name = name + ext name = name + ext
@ -141,6 +141,8 @@ func FilterUploadFileName(name string) string {
ret = strings.ReplaceAll(ret, "#", "") ret = strings.ReplaceAll(ret, "#", "")
ret = strings.ReplaceAll(ret, "%", "") ret = strings.ReplaceAll(ret, "%", "")
ret = strings.ReplaceAll(ret, "$", "") ret = strings.ReplaceAll(ret, "$", "")
// 插入资源文件时文件名长度最大限制 189 字节 https://github.com/siyuan-note/siyuan/issues/7099
ret = gulu.Str.SubStr(ret, 63)
return ret return ret
} }