mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-20 21:31:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Create a TargetPath() method that provides OutFile

Browse Source 
Moved the generation of the target path to the page breaking all
dependecies on Site.
This commit is contained in:
Noah Campbell
2013-09-20 17:24:25 -07:00
parent 52e8c7a0ac
commit bffe4baf42
4 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
hugolib/site.go
View File

@@ -26,7 +26,6 @@ import (
"html/template"
"io"
"os"
"path"
"strings"
"time"
)
@@ -265,9 +264,6 @@ func (s *Site) CreatePages() (err error) {
page.Tmpl = s.Tmpl
page.Section = file.Section
page.Dir = file.Dir
if err = s.setUrlPath(page); err != nil {
return err
}
if s.Config.BuildDrafts || !page.Draft {
s.Pages = append(s.Pages, page)
}
@@ -277,34 +273,6 @@ func (s *Site) CreatePages() (err error) {
return
}
// Set p.Section and p.OutFile relying on p.FileName as the source.
// Filename is broken apart for a "Section" which basically equates to
// the folder the file exists in.
func (s *Site) setUrlPath(p *Page) (err error) {
// Always use Url if it's specified
if len(strings.TrimSpace(p.Url)) > 2 {
p.OutFile = strings.TrimSpace(p.Url)
if strings.HasSuffix(p.OutFile, "/") {
p.OutFile = p.OutFile + "index.html"
}
return
}
var outfile string
if len(strings.TrimSpace(p.Slug)) > 0 {
outfile = strings.TrimSpace(p.Slug) + "." + p.Extension
} else {
// Fall back to filename
_, t := path.Split(p.FileName)
outfile = replaceExtension(strings.TrimSpace(t), p.Extension)
}
p.OutFile = p.Dir + "/" + strings.TrimSpace(outfile)
return
}
func (s *Site) BuildSiteMeta() (err error) {
s.Indexes = make(IndexList)
s.Sections = make(Index)
@@ -389,7 +357,7 @@ func (s *Site) RenderPages() (err error) {
var layout string
if !p.IsRenderable() {
layout = "__" + p.FileName
layout = "__" + p.TargetPath()
_, err := s.Tmpl.New(layout).Parse(string(p.Content))
if err != nil {
return err
@@ -402,7 +370,7 @@ func (s *Site) RenderPages() (err error) {
if err != nil {
return err
}
err = s.WritePublic(p.OutFile, content)
err = s.WritePublic(p.TargetPath(), content)
if err != nil {
return err
}
@@ -514,6 +482,8 @@ func (s *Site) RenderLists() error {
}
func (s *Site) RenderHomePage() error {
return nil
n := s.NewNode()
n.Title = n.Site.Title
n.Url = helpers.Urlize(string(n.Site.BaseUrl))