Fix some livereload content regressions

Introduced in Hugo 0.38.

Fixes #4566

diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
index f0eb21dc16af157cd46e5e707eb3c925fe9190eb..cac59e4ca041213b7ea3bf5c4d61c2288ab9acc3 100644 (file)
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -347,8 +347,8 @@ func (cfg *BuildCfg) shouldRender(p *Page) bool {
                return true
        }
 
-       if cfg.whatChanged != nil && p.File != nil && cfg.whatChanged.files[p.File.Filename()] {
-               return true
+       if cfg.whatChanged != nil && p.File != nil {
+               return cfg.whatChanged.files[p.File.Filename()]
        }
 
        return false
@@ -708,10 +708,15 @@ func (m *contentChangeMap) resolveAndRemove(filename string) (string, string, bu
                dir += helpers.FilePathSeparator
        }
 
-       fileTp, _ := classifyBundledFile(name)
+       fileTp, isContent := classifyBundledFile(name)
 
        // This may be a member of a bundle. Start with branch bundles, the most specific.
        if fileTp != bundleLeaf {
+               if fileTp == bundleNot && isContent {
+                       // Branch bundles does not contain content pages as resources.
+                       return dir, filename, bundleNot
+               }
+
                for i, b := range m.branches {
                        if b == dir {
                                m.branches = append(m.branches[:i], m.branches[i+1:]...)

diff --git a/hugolib/page.go b/hugolib/page.go
index 2b3ca37ba15b770984f1068bf8d0920b353f7842..195e68084ac4f46f3ec1c45fef6738e4b1682b7e 100644 (file)
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -438,7 +438,7 @@ func (ps Pages) findPagePosByFilnamePrefix(prefix string) int {
 // will return -1 if not found
 func (ps Pages) findPagePos(page *Page) int {
        for i, x := range ps {
-               if x.Source.Path() == page.Source.Path() {
+               if x.Source.Filename() == page.Source.Filename() {
                        return i
                }
        }

diff --git a/hugolib/site.go b/hugolib/site.go
index 4027ce075cae3e0cfc6674aac762260aa611b04b..b0d70bff2141493b3f98dc1dc5a167e02a568afa 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -1225,7 +1225,8 @@ func (s *Site) absContentDir() string {
 }
 
 func (s *Site) isContentDirEvent(e fsnotify.Event) bool {
-       return s.getContentDir(e.Name) != ""
+       relDir, _ := s.PathSpec.RelContentDir(e.Name)
+       return relDir != e.Name
 }
 
 func (s *Site) getContentDir(path string) string {