Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-04 15:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-09-06 10:13:40 +08:00
commit e8b47f6136
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/model/box.go
View file

@ -380,6 +380,11 @@ func isSkipFile(filename string) bool {
func moveTree(tree *parse.Tree) {
treenode.SetBlockTreePath(tree)
if hidden := tree.Root.IALAttr("custom-hidden"); "true" == hidden {
tree.Root.RemoveIALAttr("custom-hidden")
filesys.WriteTree(tree)
}
sql.UpsertTreeQueue(tree)
box := Conf.Box(tree.Box)

9
kernel/model/file.go
View file

@ -232,7 +232,7 @@ type FileInfo struct {
isdir bool
}
func ListDocTree(boxID, path string, sortMode int, flashcard, showHidden bool, maxListCount int) (ret []*File, totals int, err error) {
func ListDocTree(boxID, listPath string, sortMode int, flashcard, showHidden bool, maxListCount int) (ret []*File, totals int, err error) {
//os.MkdirAll("pprof", 0755)
//cpuProfile, _ := os.Create("pprof/cpu_profile_list_doc_tree")
//pprof.StartCPUProfile(cpuProfile)
@ -267,7 +267,7 @@ func ListDocTree(boxID, path string, sortMode int, flashcard, showHidden bool, m
var files []*FileInfo
start := time.Now()
files, totals, err = box.Ls(path)
files, totals, err = box.Ls(listPath)
if nil != err {
return
}
@ -299,6 +299,11 @@ func ListDocTree(boxID, path string, sortMode int, flashcard, showHidden bool, m
subFiles, err := os.ReadDir(filepath.Join(boxLocalPath, file.path))
if nil == err {
for _, subFile := range subFiles {
subDocFilePath := path.Join(file.path, subFile.Name())
if subIAL := box.docIAL(subDocFilePath); "true" == subIAL["custom-hidden"] {
continue
}
if strings.HasSuffix(subFile.Name(), ".sy") {
doc.SubFileCount++
}