diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-03 17:27:40 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-08 20:13:39 +0200 |
commit | 7ff0a8ee9fe8d710d407e57faf1fda43bd635f28 (patch) | |
tree | 4baa7d913f735cc1089e465b51ff007014bfe25a /hugolib/page__common.go | |
parent | df374851a0683f1446f33a4afef74c42f7d3eaaf (diff) |
Simplify page tree logic
This is preparation for #6041.
For historic reasons, the code for bulding the section tree and the taxonomies were very much separate.
This works, but makes it hard to extend, maintain, and possibly not so fast as it could be.
This simplification also introduces 3 slightly breaking changes, which I suspect most people will be pleased about. See referenced issues:
This commit also switches the radix tree dependency to a mutable implementation: github.com/armon/go-radix.
Fixes #6154
Fixes #6153
Fixes #6152
Diffstat (limited to 'hugolib/page__common.go')
-rw-r--r-- | hugolib/page__common.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/hugolib/page__common.go b/hugolib/page__common.go index f9ceee8c9..cf554bb40 100644 --- a/hugolib/page__common.go +++ b/hugolib/page__common.go @@ -30,6 +30,8 @@ type pageCommon struct { s *Site m *pageMeta + bucket *pagesMapBucket + // Laziliy initialized dependencies. init *lazy.Init @@ -101,17 +103,17 @@ type pageCommon struct { translationKey string translationKeyInit sync.Once - // Will only be set for sections and regular pages. + // Will only be set for bundled pages. parent *pageState - // Will only be set for section pages and the home page. - subSections page.Pages - // Set in fast render mode to force render a given page. forceRender bool } type pagePages struct { - pages page.Pages pagesInit sync.Once + pages page.Pages + + regularPagesInit sync.Once + regularPages page.Pages } |