0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Improve sort when importing markdown files https://github.com/siyuan-note/siyuan/issues/11390

Browse source
This commit is contained in:
Daniel 2024-08-05 23:21:55 +08:00
parent a63c545ad5
commit 91a068ff52
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
kernel/model/import.go
View file

@ -680,7 +680,10 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) {
}
boxLocalPath = filepath.Join(util.DataDir, boxID)
if gulu.File.IsDir(localPath) {
hPathsIDs := map[string]string{}
idPaths := map[string]string{}
if gulu.File.IsDir(localPath) { // 导入文件夹
// 收集所有资源文件
assets := map[string]string{}
filelock.Walk(localPath, func(currentPath string, info os.FileInfo, walkErr error) error {
@ -843,6 +846,9 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) {
reassignIDUpdated(tree)
importTrees = append(importTrees, tree)
hPathsIDs[tree.HPath] = tree.ID
idPaths[tree.ID] = tree.Path
return nil
})
} else { // 导入单个文件
@ -953,6 +959,17 @@ func ImportFromLocalPath(boxID, localPath string, toPath string) (err error) {
importTrees = []*parse.Tree{}
searchLinks = map[string]string{}
// 按照路径排序 Improve sort when importing markdown files https://github.com/siyuan-note/siyuan/issues/11390
var paths, hPaths []string
for hPath := range hPathsIDs {
hPaths = append(hPaths, hPath)
}
sort.Strings(hPaths)
for _, hPath := range hPaths {
paths = append(paths, idPaths[hPathsIDs[hPath]])
}
ChangeFileTreeSort(boxID, paths)
}
IncSync()