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

🐛 File names ending with . will be considered as missing assets

Browse source 
🎨 Improve HTML clipping https://github.com/siyuan-note/siyuan/issues/13355
This commit is contained in:
Daniel 2024-12-04 22:37:22 +08:00
parent 821a58d895
commit 22190b532d
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
8 changed files with 36 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kernel/util/file.go
View file

@ -132,7 +132,7 @@ func IsPathRegularDirOrSymlinkDir(path string) bool {
}
func RemoveID(name string) string {
ext := path.Ext(name)
ext := Ext(name)
name = strings.TrimSuffix(name, ext)
if 23 < len(name) {
if id := name[len(name)-22:]; ast.IsNodeIDPattern(id) {
@ -142,9 +142,17 @@ func RemoveID(name string) string {
return name + ext
}
func Ext(name string) (ret string) {
ret = path.Ext(name)
if "." == ret {
ret = ""
}
return
}
func AssetName(name string) string {
_, id := LastID(name)
ext := path.Ext(name)
ext := Ext(name)
name = name[0 : len(name)-len(ext)]
if !ast.IsNodeIDPattern(id) {
id = ast.NewNodeID()
@ -161,7 +169,7 @@ func AssetName(name string) string {
func LastID(p string) (name, id string) {
name = path.Base(p)
ext := path.Ext(name)
ext := Ext(name)
id = strings.TrimSuffix(name, ext)
if 22 < len(id) {
id = id[len(id)-22:]
@ -242,6 +250,7 @@ func FilterFileName(name string) string {
name = strings.ReplaceAll(name, ">", "_")
name = strings.ReplaceAll(name, "|", "_")
name = strings.TrimSpace(name)
name = strings.TrimSuffix(name, ".")
name = RemoveInvalid(name) // Remove invisible characters from file names when uploading assets https://github.com/siyuan-note/siyuan/issues/11683
return name
}