From ce2fadac6adb75336ea31945bb3ca603da6f4745 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 17 Jan 2023 21:34:12 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=8F=92=E5=85=A5=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=B6=E6=96=87=E4=BB=B6=E5=90=8D=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E6=9C=80=E5=A4=A7=E9=99=90=E5=88=B6=20189=20=E5=AD=97?= =?UTF-8?q?=E8=8A=82=20https://github.com/siyuan-note/siyuan/issues/7099?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/assets.go | 2 +- kernel/util/file.go | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kernel/model/assets.go b/kernel/model/assets.go index 66c0e177b..50213850a 100644 --- a/kernel/model/assets.go +++ b/kernel/model/assets.go @@ -176,7 +176,7 @@ func NetImg2LocalAssets(rootID string) (err error) { } } 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 = "net-img-" + name + "-" + ast.NewNodeID() + ext writePath := filepath.Join(assetsDirPath, name) diff --git a/kernel/util/file.go b/kernel/util/file.go index f6ca0ae0b..61006a6c7 100644 --- a/kernel/util/file.go +++ b/kernel/util/file.go @@ -54,11 +54,11 @@ func AssetName(name string) string { _, id := LastID(name) ext := path.Ext(name) name = name[0 : len(name)-len(ext)] - if !IsIDPattern(id) { + if !ast.IsNodeIDPattern(id) { id = ast.NewNodeID() name = name + "-" + id + ext } else { - if !IsIDPattern(name) { + if !ast.IsNodeIDPattern(name) { name = name[:len(name)-len(id)-1] + "-" + id + ext } else { name = name + ext @@ -141,6 +141,8 @@ func FilterUploadFileName(name string) string { 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 }