mirrors/mycorrhiza
1
0
Fork 0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2025-01-07 10:20:26 +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
Show Stats 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() wg.Done()
}() }()
go func() { go func() {
children = figureOutChildren(hyphaName, descendantsPool).children children = figureOutChildren(hyphaName, descendantsPool, true).children
wg.Done() wg.Done()
}() }()
wg.Wait() wg.Wait()
@ -128,10 +128,11 @@ func Tree(hyphaName string) (siblingsHTML, childrenHTML, prev, next string) {
type child struct { type child struct {
name string name string
exists bool
children []child children []child
} }
func figureOutChildren(hyphaName string, subhyphaePool map[string]bool) child { func figureOutChildren(hyphaName string, subhyphaePool map[string]bool, exists bool) child {
var ( var (
nestLevel = strings.Count(hyphaName, "/") nestLevel = strings.Count(hyphaName, "/")
adopted = make([]child, 0) adopted = make([]child, 0)
@ -140,10 +141,23 @@ func figureOutChildren(hyphaName string, subhyphaePool map[string]bool) child {
subnestLevel := strings.Count(subhyphaName, "/") subnestLevel := strings.Count(subhyphaName, "/")
if subnestLevel-1 == nestLevel && path.Dir(subhyphaName) == hyphaName { if subnestLevel-1 == nestLevel && path.Dir(subhyphaName) == hyphaName {
delete(subhyphaePool, subhyphaName) 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 { type sibling struct {

2
tree/view.qtpl
View File

@ -20,7 +20,7 @@ pseudographics:
}) })
%} %}
<li class="subhyphae__entry"> <li class="subhyphae__entry">
<a class="subhyphae__link" href="/hypha/{%s c.name %}"> <a class="subhyphae__link {% if !c.exists %}wikilink_new{% endif %}" href="/hypha/{%s c.name %}">
{%s util.BeautifulName(path.Base(c.name)) %} {%s util.BeautifulName(path.Base(c.name)) %}
</a> </a>
{% if len(c.children) > 0 %} {% if len(c.children) > 0 %}

10
tree/view.qtpl.go
View File

@ -82,7 +82,15 @@ func streamchildHTML(qw422016 *qt422016.Writer, c *child) {
//line tree/view.qtpl:21 //line tree/view.qtpl:21
qw422016.N().S(` qw422016.N().S(`
<li class="subhyphae__entry"> <li class="subhyphae__entry">
<a class="subhyphae__link" href="/hypha/`) <a class="subhyphae__link `)
//line tree/view.qtpl:23
if !c.exists {
//line tree/view.qtpl:23
qw422016.N().S(`wikilink_new`)
//line tree/view.qtpl:23
}
//line tree/view.qtpl:23
qw422016.N().S(`" href="/hypha/`)
//line tree/view.qtpl:23 //line tree/view.qtpl:23
qw422016.E().S(c.name) qw422016.E().S(c.name)
//line tree/view.qtpl:23 //line tree/view.qtpl:23