Fix watcher detecting changes as static when no theme
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sun, 28 Jun 2015 17:27:28 +0000 (19:27 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sun, 28 Jun 2015 17:27:28 +0000 (19:27 +0200)
There have been some changes to the ´helpers.GetThemesDirPath()´ so it now returns an empty string when no theme.

This is correct, but it broke the watch service (at lest on OSX), as `strings.HasPrefix("", "somestring") evaluates to true somehow, and content changes are incorrectly branded as static.

There are other issues in there, but that will come later ...

See #1236

commands/hugo.go

index 5cea9d0950e30ccf06516661c2778ea5cd741240..c57f5fe4e727f317037a2632de05b376425454ab 100644 (file)
@@ -444,7 +444,7 @@ func NewWatcher(port int) error {
                                                continue
                                        }
 
-                                       isstatic := strings.HasPrefix(ev.Name, helpers.GetStaticDirPath()) || strings.HasPrefix(ev.Name, helpers.GetThemesDirPath())
+                                       isstatic := strings.HasPrefix(ev.Name, helpers.GetStaticDirPath()) || (len(helpers.GetThemesDirPath()) > 0 && strings.HasPrefix(ev.Name, helpers.GetThemesDirPath()))
                                        staticChanged = staticChanged || isstatic
                                        dynamicChanged = dynamicChanged || !isstatic