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

🐛 删除父文档时子文档排序配置未清理干净 Fix https://github.com/siyuan-note/siyuan/issues/6469

Browse source
This commit is contained in:
Liang Ding 2022-11-03 20:25:56 +08:00
parent 0b1e48c24a
commit 21e354836e
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
kernel/model/file.go
View file

@ -19,7 +19,6 @@ package model
import (
"errors"
"fmt"
"io/fs"
"math"
"os"
"path"
@ -1227,7 +1226,7 @@ func removeDoc(box *Box, p string) (err error) {
copyDocAssetsToDataAssets(box.ID, p)
var removeIDs []string
ids := rootChildIDs(tree.ID)
ids := treenode.RootChildIDs(tree.ID)
removeIDs = append(removeIDs, ids...)
dir := path.Dir(p)
@ -1487,7 +1486,7 @@ func moveSorts(rootID, fromBox, toBox string) {
}
fromRootSorts := map[string]int{}
ids := rootChildIDs(rootID)
ids := treenode.RootChildIDs(rootID)
fromConfPath := filepath.Join(util.DataDir, fromBox, ".siyuan", "sort.json")
fromFullSortIDs := map[string]int{}
if gulu.File.IsExist(fromConfPath) {
@ -1535,29 +1534,6 @@ func moveSorts(rootID, fromBox, toBox string) {
}
}
func rootChildIDs(rootID string) (ret []string) {
root := treenode.GetBlockTree(rootID)
if nil == root {
return
}
ret = append(ret, rootID)
boxLocalPath := filepath.Join(util.DataDir, root.BoxID)
subFolder := filepath.Join(boxLocalPath, strings.TrimSuffix(root.Path, ".sy"))
if !gulu.File.IsDir(subFolder) {
return
}
filepath.Walk(subFolder, func(path string, info fs.FileInfo, err error) error {
if strings.HasSuffix(path, ".sy") {
name := filepath.Base(path)
id := strings.TrimSuffix(name, ".sy")
ret = append(ret, id)
}
return nil
})
return
}
func ChangeFileTreeSort(boxID string, paths []string) {
if 1 > len(paths) {
return

25
kernel/treenode/tree.go
View file

@ -19,7 +19,9 @@ package treenode
import (
"crypto/sha256"
"fmt"
"io/fs"
"path"
"path/filepath"
"sort"
"strings"
@ -108,3 +110,26 @@ func IALStr(n *ast.Node) string {
}
return string(parse.IAL2Tokens(n.KramdownIAL))
}
func RootChildIDs(rootID string) (ret []string) {
root := GetBlockTree(rootID)
if nil == root {
return
}
ret = append(ret, rootID)
boxLocalPath := filepath.Join(util.DataDir, root.BoxID)
subFolder := filepath.Join(boxLocalPath, strings.TrimSuffix(root.Path, ".sy"))
if !gulu.File.IsDir(subFolder) {
return
}
filepath.Walk(subFolder, func(path string, info fs.FileInfo, err error) error {
if strings.HasSuffix(path, ".sy") {
name := filepath.Base(path)
id := strings.TrimSuffix(name, ".sy")
ret = append(ret, id)
}
return nil
})
return
}