From 0f143dcf1498897d2f7b83fad6830fd964b3ef95 Mon Sep 17 00:00:00 2001 From: Ross Lawley Date: Thu, 15 Aug 2013 19:58:34 +0100 Subject: [PATCH] Skip Static directory if its in your content directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allows organisation where all source files are in one directory: ``` `config.yaml`: contentdir: "source" staticdir: "source/static" ... . └── source ├── post | ├── firstpost.md // <- http://site.com/post/firstpost.html | └── secondpost.md // <- http://site.com/post/secondpost.html └── static └── css └── site.css // <- http://site.com/css/site.css ``` --- hugolib/site.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hugolib/site.go b/hugolib/site.go index c0bce9f06..45c461303 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -192,6 +192,8 @@ func (s *Site) initialize() { s.checkDirectories() + staticDir := s.Config.GetAbsPath(s.Config.StaticDir+"/") + walker := func(path string, fi os.FileInfo, err error) error { if err != nil { PrintErr("Walker: ", err) @@ -199,6 +201,9 @@ func (s *Site) initialize() { } if fi.IsDir() { + if (path == staticDir) { + return filepath.SkipDir + } site.Directories = append(site.Directories, path) return nil } else { @@ -211,7 +216,6 @@ func (s *Site) initialize() { } filepath.Walk(s.absContentDir(), walker) - s.Info = SiteInfo{ BaseUrl: template.URL(s.Config.BaseUrl), Title: s.Config.Title,