mirrors/mycorrhiza
1
0
Fork 0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2025-12-01 22:28:05 +00:00
Code Issues Releases Wiki Activity

Fix missing subhyphae in the tree view

Browse Source
This commit is contained in:
Mikhail Chekan
2021-10-01 17:18:11 +08:00
parent 49e5ca8a6f
commit 8a30d84dfb
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tree/tree.go
View File

@@ -104,7 +104,7 @@ func Tree(hyphaName string) (siblingsHTML, childrenHTML, prev, next string) {
wg.Done()
}()
go func() {
children = figureOutChildren(hyphaName, descendantsPool).children
children = figureOutChildren(hyphaName, descendantsPool, true).children
wg.Done()
}()
wg.Wait()
@@ -128,10 +128,11 @@ func Tree(hyphaName string) (siblingsHTML, childrenHTML, prev, next string) {
type child struct {
name string
exists bool
children []child
}
func figureOutChildren(hyphaName string, subhyphaePool map[string]bool) child {
func figureOutChildren(hyphaName string, subhyphaePool map[string]bool, exists bool) child {
var (
nestLevel = strings.Count(hyphaName, "/")
adopted = make([]child, 0)
@@ -140,10 +141,23 @@ func figureOutChildren(hyphaName string, subhyphaePool map[string]bool) child {
subnestLevel := strings.Count(subhyphaName, "/")
if subnestLevel-1 == nestLevel && path.Dir(subhyphaName) == hyphaName {
delete(subhyphaePool, subhyphaName)
adopted = append(adopted, figureOutChildren(subhyphaName, subhyphaePool))
adopted = append(adopted, figureOutChildren(subhyphaName, subhyphaePool, true))
}
}
return child{hyphaName, adopted}
for descName, _ := range subhyphaePool {
if strings.HasPrefix(descName, hyphaName) {
var (
rawSubPath = strings.TrimPrefix(descName, hyphaName)[1:]
slashIdx = strings.IndexRune(rawSubPath, '/')
)
if slashIdx > -1 {
var sibPath = descName[:slashIdx+len(hyphaName)+1]
adopted = append(adopted, figureOutChildren(sibPath, subhyphaePool, false))
} // `else` never happens?
}
}
return child{hyphaName, exists, adopted}
}
type sibling struct {