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

🎨 Improve importing Markdown https://github.com/siyuan-note/siyuan/issues/13149

Browse source
This commit is contained in:
Daniel 2024-11-14 23:51:27 +08:00
parent e164e88dc4
commit 9681fe6d80
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kernel/model/import.go
View file

@ -752,7 +752,12 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) {
targetPath = strings.ReplaceAll(targetPath, ".sy/", "/") targetPath = strings.ReplaceAll(targetPath, ".sy/", "/")
targetPath += ".sy" targetPath += ".sy"
targetPaths[curRelPath] = targetPath if _, ok := targetPaths[curRelPath]; !ok {
targetPaths[curRelPath] = targetPath
} else {
targetPath = targetPaths[curRelPath]
id = strings.TrimSuffix(path.Base(targetPath), ".sy")
}
if info.IsDir() { if info.IsDir() {
if subMdFiles := util.GetFilePathsByExts(currentPath, []string{".md", ".markdown"}); 1 > len(subMdFiles) { if subMdFiles := util.GetFilePathsByExts(currentPath, []string{".md", ".markdown"}); 1 > len(subMdFiles) {
@ -760,6 +765,12 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) {
return nil return nil
} }
// 如果当前文件夹路径下包含同名的 Markdown 文件，则不创建空文档 https://github.com/siyuan-note/siyuan/issues/13149
if gulu.File.IsExist(currentPath+".md") || gulu.File.IsExist(currentPath+".markdown") {
targetPaths[curRelPath+".md"] = targetPath
return nil
}
tree = treenode.NewTree(boxID, targetPath, hPath, title) tree = treenode.NewTree(boxID, targetPath, hPath, title)
importTrees = append(importTrees, tree) importTrees = append(importTrees, tree)
return nil return nil