Remake directory structure, with _posts, _site, and _templates

ifo · Aug 4, 2015 · be94d04 · be94d04
1 parent 034f3dc
commit be94d04
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-goall/**/site
+**/_site
 goall/goall
diff --git a/goall/examples/basic/posts/first.md → goall/examples/basic/_posts/first.md b/goall/examples/basic/posts/first.md → goall/examples/basic/_posts/first.md
diff --git a/goall/examples/basic/post.html → goall/examples/basic/_templates/post.html b/goall/examples/basic/post.html → goall/examples/basic/_templates/post.html
diff --git a/goall/main.go b/goall/main.go
@@ -10,17 +10,17 @@ import (
 
 func main() {
 	// ensure example/site directory exists
-	err := os.MkdirAll("./site/posts", 0755)
+	err := os.MkdirAll("./_site/posts", 0755)
 	if err != nil {
 		log.Printf("Warn: %v\n", err)
 	}
 
-	errIndex := CreateIndexPage(".", "./posts")
+	errIndex := CreateIndexPage(".", "./_posts")
 	if errIndex != nil {
 		log.Fatalln("Could not assemble index page", errIndex)
 	}
 
-	CreatePosts("./posts", "./site/posts")
+	CreatePosts("./_posts", "./_site/posts")
 }
 
 func CreateIndexPage(rootDir, postsDir string) error {
@@ -29,7 +29,7 @@ func CreateIndexPage(rootDir, postsDir string) error {
 		return err
 	}
 
-	goall.OverwriteFile("site/index.html", index)
+	goall.OverwriteFile("_site/index.html", index)
 	return nil
 }
 
@@ -38,7 +38,7 @@ func CreatePosts(postsDir, siteDir string) {
 
 	for _, p := range posts {
 		prefix := p[:len(p)-len(path.Ext(p))]
-		b, err := goall.ParseMarkdown(postsDir + p)
+		b, err := goall.ParseMarkdown(postsDir + "/" + p)
 		if err != nil {
 			log.Println(err)
 			continue
@@ -48,6 +48,6 @@ func CreatePosts(postsDir, siteDir string) {
 			log.Println(err)
 			continue
 		}
-		goall.WriteFile(siteDir+prefix+".html", post)
+		goall.WriteFile(siteDir+"/"+prefix+".html", post)
 	}
 }
diff --git a/templates.go b/templates.go
@@ -41,7 +41,7 @@ func AssembleIndex(index Index) ([]byte, error) {
 }
 
 func AssemblePost(post []byte) ([]byte, error) {
-	page, err := template.ParseFiles("post.html")
+	page, err := template.ParseFiles("_templates/post.html")
 	if err != nil {
 		log.Fatalln("template.ParseFiles", err)
 	}