From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Wed, 7 Jun 2017 20:31:57 +0000 (+0200)
Subject: Revert "hugolib: Fix live-reload regression for add/removal of dirs"
X-Git-Tag: v0.22~14
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bef50485;p=brevno-suite%2Fhugo

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

Never mind. The "adding dir" scenario didn't work anyway, so that will need another fix.

This reverts commit 49a104309d53af243b32443a59bdc2a6fc9beeef.

Closes ##3325
---

diff --git a/hugolib/site.go b/hugolib/site.go
index 0dfa3a30..8740f11d 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -753,6 +753,9 @@ 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.
@@ -775,6 +778,15 @@ 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 a1312814..ceea96ea 100644
--- 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 {