github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

hugolib: Re-work "fast render" logic in the new flow

Browse source 
Note that this fixes some "live reload" issues recently introduced in non-released code.

Closes #5811
See #5784
This commit is contained in:
Bjørn Erik Pedersen 2019-04-04 12:37:55 +02:00
parent 4494a01b79
commit d0d661dffd
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hugolib/hugo_sites.go
View file

@ -569,7 +569,6 @@ func (cfg *BuildCfg) shouldRender(p *pageState) bool {
return false return false
} }
if p.forceRender { if p.forceRender {
p.forceRender = false
return true return true
} }
@ -577,6 +576,10 @@ func (cfg *BuildCfg) shouldRender(p *pageState) bool {
return true return true
} }
if cfg.RecentlyVisited[p.RelPermalink()] {
return true
}
if cfg.whatChanged != nil && !p.File().IsZero() { if cfg.whatChanged != nil && !p.File().IsZero() {
return cfg.whatChanged.files[p.File().Filename()] return cfg.whatChanged.files[p.File().Filename()]
} }

2
hugolib/hugo_sites_build.go
View file

@ -288,12 +288,10 @@ func (h *HugoSites) render(config *BuildCfg) error {
// needs this set. // needs this set.
s2.rc = &siteRenderingContext{Format: renderFormat} s2.rc = &siteRenderingContext{Format: renderFormat}
if !config.PartialReRender {
if err := s2.preparePagesForRender(siteRenderContext.sitesOutIdx); err != nil { if err := s2.preparePagesForRender(siteRenderContext.sitesOutIdx); err != nil {
return err return err
} }
} }
}
if !config.SkipRender { if !config.SkipRender {
if config.PartialReRender { if config.PartialReRender {

5
hugolib/pagebundler.go
View file

@ -110,8 +110,9 @@ func (s *siteContentProcessor) process(ctx context.Context) error {
panic(fmt.Sprintf("invalid page site: %v vs %v", p.s, s)) panic(fmt.Sprintf("invalid page site: %v vs %v", p.s, s))
} }
if s.partialBuild { p.forceRender = s.partialBuild
p.forceRender = true
if p.forceRender {
s.site.replacePage(p) s.site.replacePage(p)
} else { } else {
s.site.addPage(p) s.site.addPage(p)