github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

26
hugolib/page.go
View file

@ -52,7 +52,7 @@ type Page struct {
}
type File struct {
FileName, OutFile, Extension, Dir string
FileName, Extension, Dir string
}
type PageMeta struct {
@ -432,3 +432,27 @@ func (page *Page) convertRestructuredText(lines io.Reader) {
page.Summary = template.HTML(getRstContent(summary))
}
}
func (p *Page) TargetPath() (outfile string) {
// Always use Url if it's specified
if len(strings.TrimSpace(p.Url)) > 2 {
outfile = strings.TrimSpace(p.Url)
if strings.HasSuffix(outfile, "/") {
outfile = outfile + "index.html"
}
return
}
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)
}
return path.Join(p.Dir, strings.TrimSpace(outfile))
}

2
hugolib/planner.go
View file

@ -27,7 +27,7 @@ func (s *Site) ShowPlan(out io.Writer) (err error) {
continue
}
trns, err := s.Target.Translate(p.OutFile)
trns, err := s.Target.Translate(p.TargetPath())
if err != nil {
return err
}

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))

12
hugolib/site_test.go
View file

@ -158,7 +158,7 @@ func TestRenderThingOrDefault(t *testing.T) {
}
}
func TestSetOutFile(t *testing.T) {
func TestTargetPath(t *testing.T) {
tests := []struct {
doc string
content string
@ -175,19 +175,15 @@ func TestSetOutFile(t *testing.T) {
return
}
for _, test := range tests {
var err error
s := &Site{
Config: Config{ContentDir: "content"},
}
p := pageMust(ReadFrom(strings.NewReader(test.content), s.Config.GetAbsPath(test.doc)))
if err = s.setUrlPath(p); err != nil {
t.Fatalf("Unable to set urlpath: %s", err)
}
expected := test.expectedOutFile
if p.OutFile != expected {
t.Errorf("%s => p.OutFile expected: '%s', got: '%s'", test.doc, expected, p.OutFile)
if p.TargetPath() != expected {
t.Errorf("%s => OutFile expected: '%s', got: '%s'", test.doc, expected, p.TargetPath())
}
if p.Section != test.expectedSection {
@ -240,7 +236,7 @@ func TestSkipRender(t *testing.T) {
{"sect/doc3.html", "<html><head></head><body><h1>doc3</h1>\n\n<p><em>some</em> content</p>\n</body></html>"},
{"sect/doc4.html", "<html><head></head><body><h1>doc4</h1>\n\n<p><em>some content</em></p>\n</body></html>"},
{"sect/doc5.html", "<!DOCTYPE html><html><head><script src=\"http://auth/bub/script.js\"></script></head><body>body5</body></html>"},
{"./doc7.html", "<html><head></head><body>doc7 content</body></html>"},
{"doc7.html", "<html><head></head><body>doc7 content</body></html>"},
}
for _, test := range tests {