From 90fb5943f4f1f34b67ff0450401560bd8c9d6405 Mon Sep 17 00:00:00 2001
From: Rob Saunders <rob@wearebrandnew.com>
Date: Thu, 27 Jul 2017 12:55:02 +0800
Subject: [PATCH] pages in subdirectories are created correctly.

---
 src/cmd/gen/ace.go        | 31 -------------------------------
 src/cmd/gen/build.go      |  4 ++++
 src/cmd/gen/filesystem.go |  2 --
 3 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/src/cmd/gen/ace.go b/src/cmd/gen/ace.go
index 9e61546..6f8f333 100644
--- a/src/cmd/gen/ace.go
+++ b/src/cmd/gen/ace.go
@@ -48,34 +48,3 @@ func aceOutputFilePath(from string) string {
 	toMake = strings.Replace(toMake, "ace", "html", 1)
 	return strings.Replace(toMake, "pages/", "", 1)
 }
-
-// func compileAce(filename string) error {
-// 	var doc bytes.Buffer
-// 	var siteName = filepathToSitename(filename)
-
-// 	funcMap := template.FuncMap{
-// 		"current_template": func() string { return filename },
-// 		"copy":             func(rel string) string { return helperCopyFile(rel, findSharedFile(siteName, rel), siteName) },
-// 	}
-
-// 	if tpl, err := ace.Load(aceInputFilePath(filename), "", &ace.Options{
-// 		FuncMap:       funcMap,
-// 		DynamicReload: true,
-// 		BaseDir:       filepath.Join("sites", filepathToSitename(filename), "pages"),
-// 	}); err == nil {
-
-// 		if err := tpl.Execute(&doc, nil); err != nil {
-// 			return err
-// 		}
-
-// 		writeStringToFile(aceOutputFilePath(filename), doc.String())
-
-// 	} else {
-// 		return err
-// 	}
-// 	return nil
-// }
-
-// func aceInputFilePath(from string) string {
-// 	return trimExt(strings.Replace(from, filepath.Join("sites", filepathToSitename(from), "pages"), "", 1))
-// }
diff --git a/src/cmd/gen/build.go b/src/cmd/gen/build.go
index 18dc50e..504b0f3 100644
--- a/src/cmd/gen/build.go
+++ b/src/cmd/gen/build.go
@@ -84,6 +84,10 @@ func (cfg *config) processDir(srcdir string, filetype string, processor Processo
 
 	if files, err := FileTypeGlob(srcdir, filetype); err == nil {
 		for _, name := range files {
+			// create directories if needed
+			dir, _ := filepath.Split(processor.dstfile(name))
+			makeDirIfMissing(dir)
+
 			tpl := NewTemplateWriter(name, processor.dstfile(name))
 			if tpl.err != nil {
 				return tpl.err
diff --git a/src/cmd/gen/filesystem.go b/src/cmd/gen/filesystem.go
index 5f13fca..e8e3532 100644
--- a/src/cmd/gen/filesystem.go
+++ b/src/cmd/gen/filesystem.go
@@ -185,8 +185,6 @@ func helperCopyFile(rel string, sitename string) string {
 	src := findFile(rel, sitename)
 	dest := filepath.Clean(filepath.Join("public", sitename, rel))
 
-	println("copying", src, dest)
-
 	dir, _ := filepath.Split(dest)
 	makeDirIfMissing(dir)