shithub: hugo

Download patch

ref: e5aa47749157e4c49a645d37df89fa76b0e8f952
parent: 6258d48b0220fa59edf50a32031677eb7b7944d4
author: Bjørn Erik Pedersen <[email protected]>
date: Sun Feb 14 07:16:03 EST 2016 

Add support for symbolic links for content, layout, static, theme

Note: This is for the content roots only, but that should satisfy most needs.

Fixes #1855


--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -17,6 +17,7 @@
 
 import (
 	"fmt"
+	"github.com/spf13/hugo/hugofs"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -35,7 +36,6 @@
 	"github.com/spf13/cobra"
 	"github.com/spf13/fsync"
 	"github.com/spf13/hugo/helpers"
-	"github.com/spf13/hugo/hugofs"
 	"github.com/spf13/hugo/hugolib"
 	"github.com/spf13/hugo/livereload"
 	"github.com/spf13/hugo/utils"
@@ -651,12 +651,12 @@
 		return nil
 	}
 
-	filepath.Walk(dataDir, walker)
-	filepath.Walk(helpers.AbsPathify(viper.GetString("ContentDir")), walker)
-	filepath.Walk(helpers.AbsPathify(viper.GetString("LayoutDir")), walker)
-	filepath.Walk(helpers.AbsPathify(viper.GetString("StaticDir")), walker)
+	helpers.SymbolicWalk(hugofs.SourceFs, dataDir, walker)
+	helpers.SymbolicWalk(hugofs.SourceFs, helpers.AbsPathify(viper.GetString("ContentDir")), walker)
+	helpers.SymbolicWalk(hugofs.SourceFs, helpers.AbsPathify(viper.GetString("LayoutDir")), walker)
+	helpers.SymbolicWalk(hugofs.SourceFs, helpers.AbsPathify(viper.GetString("StaticDir")), walker)
 	if helpers.ThemeSet() {
-		filepath.Walk(helpers.AbsPathify(viper.GetString("themesDir")+"/"+viper.GetString("theme")), walker)
+		helpers.SymbolicWalk(hugofs.SourceFs, helpers.AbsPathify(viper.GetString("themesDir")+"/"+viper.GetString("theme")), walker)
 	}
 
 	return a
@@ -769,7 +769,7 @@
 					// When mkdir -p is used, only the top directory triggers an event (at least on OSX)
 					if ev.Op&fsnotify.Create == fsnotify.Create {
 						if s, err := hugofs.SourceFs.Stat(ev.Name); err == nil && s.Mode().IsDir() {
-							afero.Walk(hugofs.SourceFs, ev.Name, walkAdder)
+							helpers.SymbolicWalk(hugofs.SourceFs, ev.Name, walkAdder)
 						}
 					}
 
--- a/commands/import_jekyll.go
+++ b/commands/import_jekyll.go
@@ -124,7 +124,7 @@
 		return convertJekyllPost(path, relPath, targetDir, draft)
 	}
 
-	err = filepath.Walk(jekyllRoot, callback)
+	err = helpers.SymbolicWalk(hugofs.OsFs, jekyllRoot, callback)
 
 	if err != nil {
 		return err
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -428,6 +428,24 @@
 	return path, nil
 }
 
+// SymbolicWalk is like filepath.Walk, but it supports the root being a
+// symbolic link. It will still not follow symbolic links deeper down in
+// the file structure
+func SymbolicWalk(fs afero.Fs, root string, walker filepath.WalkFunc) error {
+	rootContent, err := afero.ReadDir(fs, root)
+
+	if err != nil {
+		return walker(root, nil, err)
+	}
+
+	for _, fi := range rootContent {
+		afero.Walk(fs, filepath.Join(root, fi.Name()), walker)
+	}
+
+	return nil
+
+}
+
 // Same as WriteToDisk but checks to see if file/directory already exists.
 func SafeWriteToDisk(inpath string, r io.Reader, fs afero.Fs) (err error) {
 	return afero.SafeWriteReader(fs, inpath, r)
--- a/source/filesystem.go
+++ b/source/filesystem.go
@@ -14,6 +14,7 @@
 package source
 
 import (
+	"github.com/spf13/hugo/hugofs"
 	"io"
 	"os"
 	"path/filepath"
@@ -92,7 +93,12 @@
 		return err
 	}
 
-	filepath.Walk(f.Base, walker)
+	err := helpers.SymbolicWalk(hugofs.SourceFs, f.Base, walker)
+
+	if err != nil {
+		jww.ERROR.Println(err)
+	}
+
 }
 
 func (f *Filesystem) shouldRead(filePath string, fi os.FileInfo) (bool, error) {