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

🎨 导入 Markdown 时支持图片路径包含空格 Fix https://github.com/siyuan-note/siyuan/issues/6688

Browse source
This commit is contained in:
Liang Ding 2022-11-24 18:07:36 +08:00
parent 70e144d72a
commit bf0b9df04f
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
kernel/model/box.go
View file

@ -450,6 +450,7 @@ func parseStdMd(markdown []byte) (ret *parse.Tree) {
luteEngine.SetSetext(false) luteEngine.SetSetext(false)
luteEngine.SetYamlFrontMatter(false) luteEngine.SetYamlFrontMatter(false)
luteEngine.SetLinkRef(false) luteEngine.SetLinkRef(false)
luteEngine.SetImgPathAllowSpace(true)
ret = parse.Parse("", markdown, luteEngine.ParseOptions) ret = parse.Parse("", markdown, luteEngine.ParseOptions)
genTreeID(ret) genTreeID(ret)
return return

13
kernel/model/import.go
View file

@ -518,7 +518,14 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) {
return ast.WalkContinue return ast.WalkContinue
} }
if !util.IsRelativePath(dest) || "" == dest { dest = strings.ReplaceAll(dest, "%20", " ")
dest = strings.ReplaceAll(dest, "%5C", "/")
n.Tokens = []byte(dest)
if !util.IsRelativePath(dest) {
return ast.WalkContinue
}
dest = filepath.ToSlash(dest)
if "" == dest {
return ast.WalkContinue return ast.WalkContinue
} }
@ -611,10 +618,12 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) {
return ast.WalkContinue return ast.WalkContinue
} }
dest = strings.ReplaceAll(dest, "%20", " ")
dest = strings.ReplaceAll(dest, "%5C", "/")
n.Tokens = []byte(dest)
if !util.IsRelativePath(dest) { if !util.IsRelativePath(dest) {
return ast.WalkContinue return ast.WalkContinue
} }
dest = filepath.ToSlash(dest) dest = filepath.ToSlash(dest)
if "" == dest { if "" == dest {
return ast.WalkContinue return ast.WalkContinue