Fix static file change detection on Windows.

Fixed windows uses different filepath separator. The filepath.ToSlash
shouldn't be used, because it can cause errors in filepath suffix and prefix
testing since "c:\a" isn't a prefix of "c:/a/b/c".

diff --git a/commands/hugo.go b/commands/hugo.go
index a99feb7c06324dac805fc31b6ac852b03f60dd5f..8cfbc734f50f926277dc7671d43b8fffd2542ab1 100644 (file)
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -198,16 +198,20 @@ func NewWatcher(port int) error {
 }
 
 func watchChange(ev *fsnotify.FileEvent) {
+       ext := filepath.Ext(ev.Name)
+       // ignore temp files
+       istemp := strings.HasSuffix(ext, "~") || (ext == ".swp") || (ext == ".tmp")
+       if istemp {
+               return
+       }
+
        if strings.HasPrefix(ev.Name, Config.GetAbsPath(Config.StaticDir)) {
                fmt.Println("Static file changed, syncing\n")
                utils.CheckErr(copyStatic(), fmt.Sprintf("Error copying static files to %s", Config.GetAbsPath(Config.PublishDir)))
        } else {
                if !ev.IsRename() { // Rename is always accompanied by a create or modify
-                       // Ignoring temp files created by editors (vim)
-                       if !strings.HasSuffix(ev.Name, "~") && !strings.HasSuffix(ev.Name, ".swp") {
-                               fmt.Println("Change detected, rebuilding site\n")
-                               utils.StopOnErr(buildSite(true))
-                       }
+                       fmt.Println("Change detected, rebuilding site\n")
+                       utils.StopOnErr(buildSite(true))
                }
        }
 }

diff --git a/hugolib/config.go b/hugolib/config.go
index 9a737d7b7c348af4bd2dfd9eab1f19d8f0cbe911..e2d3049372a708483e35b62a32c77af40040296e 100644 (file)
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -161,7 +161,7 @@ func (c *Config) GetAbsPath(name string) string {
                return name
        }
 
-       return filepath.ToSlash(filepath.Join(c.GetPath(), name))
+       return filepath.Join(c.GetPath(), name)
 }
 
 func (c *Config) findConfigFile(configFileName string) (string, error) {