hugolib: Fix live-reload regression for add/removal of dirs

This reverts commit b5b6e81c0269abf9b0f4bc6a127744a25344e5c6.

That change breaks watching of new directories (new dirs, deleted dirs).

Reopens #3325
Fixes #3569

diff --git a/hugolib/site.go b/hugolib/site.go
index 8740f11d5db485e29bd3339eaf5046f21b1f797d..0dfa3a30ead628839b0aceb54f4fa41c597e0305 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -753,9 +753,6 @@ func (s *Site) reProcess(events []fsnotify.Event) (whatChanged, error) {
                go pageConverter(pageChan, convertResults, wg2)
        }
 
-       sp := source.NewSourceSpec(s.Cfg, s.Fs)
-       fs := sp.NewFilesystem("")
-
        for _, ev := range sourceChanged {
                // The incrementalReadCollator below will also make changes to the site's pages,
                // so we do this first to prevent races.
@@ -778,15 +775,6 @@ func (s *Site) reProcess(events []fsnotify.Event) (whatChanged, error) {
                        }
                }
 
-               // ignore files shouldn't be proceed
-               if fi, err := s.Fs.Source.Stat(ev.Name); err != nil {
-                       continue
-               } else {
-                       if ok, err := fs.ShouldRead(ev.Name, fi); err != nil || !ok {
-                               continue
-                       }
-               }
-
                sourceReallyChanged = append(sourceReallyChanged, ev)
        }
 

diff --git a/source/filesystem.go b/source/filesystem.go
index ceea96ea5d0b4545ad3b87e7f29a0031f469a5ae..a13128144335deb69d4ec79dbf97644b8122f8e9 100644 (file)
--- a/source/filesystem.go
+++ b/source/filesystem.go
@@ -90,7 +90,7 @@ func (f *Filesystem) captureFiles() {
                        return nil
                }
 
-               b, err := f.ShouldRead(filePath, fi)
+               b, err := f.shouldRead(filePath, fi)
                if err != nil {
                        return err
                }
@@ -118,7 +118,7 @@ func (f *Filesystem) captureFiles() {
 
 }
 
-func (f *Filesystem) ShouldRead(filePath string, fi os.FileInfo) (bool, error) {
+func (f *Filesystem) shouldRead(filePath string, fi os.FileInfo) (bool, error) {
        if fi.Mode()&os.ModeSymlink == os.ModeSymlink {
                link, err := filepath.EvalSymlinks(filePath)
                if err != nil {