phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-02 15:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing the use of slash

Browse source 
An oversight on my behalf.  The FromSlash method is used when writing
out the public file name.  There is one place where the slashes are
required which is setting the output file.  I replaced those instances
with filepath.Join which should do the right thing depending on the OS.
This commit is contained in:
Noah Campbell 2013-08-13 14:47:14 -07:00 committed by spf13
parent 8eca8f8aa0
commit ec821739bc
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
hugolib/site.go
View file

@ -28,8 +28,6 @@ import (
//"sync" //"sync"
) )
const slash = string(os.PathSeparator)
var DefaultTimer = nitro.Initalize() var DefaultTimer = nitro.Initalize()
type Site struct { type Site struct {
@ -452,7 +450,7 @@ func (s *Site) RenderIndexes() error {
for k, o := range s.Indexes[plural] { for k, o := range s.Indexes[plural] {
n := s.NewNode() n := s.NewNode()
n.Title = strings.Title(k) n.Title = strings.Title(k)
url := Urlize(plural + slash + k) url := Urlize(plural + "/" + k)
plink := url plink := url
if s.Config.UglyUrls { if s.Config.UglyUrls {
n.Url = url + ".html" n.Url = url + ".html"
@ -465,7 +463,7 @@ func (s *Site) RenderIndexes() error {
n.Date = o[0].Date n.Date = o[0].Date
n.Data[singular] = o n.Data[singular] = o
n.Data["Pages"] = o n.Data["Pages"] = o
layout := "indexes" + slash + singular + ".html" layout := "indexes/" + singular + ".html"
x, err := s.RenderThing(n, layout) x, err := s.RenderThing(n, layout)
if err != nil { if err != nil {
return err return err
@ -498,7 +496,7 @@ func (s *Site) RenderIndexes() error {
} }
func (s *Site) RenderIndexesIndexes() (err error) { func (s *Site) RenderIndexesIndexes() (err error) {
layout := "indexes" + slash + "indexes.html" layout := "indexes/indexes.html"
if s.Tmpl.Lookup(layout) != nil { if s.Tmpl.Lookup(layout) != nil {
for singular, plural := range s.Config.Indexes { for singular, plural := range s.Config.Indexes {
n := s.NewNode() n := s.NewNode()
@ -512,7 +510,7 @@ func (s *Site) RenderIndexesIndexes() (err error) {
n.Data["OrderedIndex"] = s.Info.Indexes[plural] n.Data["OrderedIndex"] = s.Info.Indexes[plural]
x, err := s.RenderThing(n, layout) x, err := s.RenderThing(n, layout)
s.WritePublic(plural+slash+"index.html", x.Bytes()) s.WritePublic(plural+"/index.html", x.Bytes())
return err return err
} }
} }
@ -528,13 +526,13 @@ func (s *Site) RenderLists() error {
n.RSSlink = template.HTML(MakePermalink(string(n.Site.BaseUrl), string(section+".xml"))) n.RSSlink = template.HTML(MakePermalink(string(n.Site.BaseUrl), string(section+".xml")))
n.Date = data[0].Date n.Date = data[0].Date
n.Data["Pages"] = data n.Data["Pages"] = data
layout := "indexes" + slash + section + ".html" layout := "indexes/" + section + ".html"
x, err := s.RenderThing(n, layout) x, err := s.RenderThing(n, layout)
if err != nil { if err != nil {
return err return err
} }
s.WritePublic(section+slash+"index.html", x.Bytes()) s.WritePublic(section+"/index.html", x.Bytes())
if a := s.Tmpl.Lookup("rss.xml"); a != nil { if a := s.Tmpl.Lookup("rss.xml"); a != nil {
// XML Feed // XML Feed
@ -546,7 +544,7 @@ func (s *Site) RenderLists() error {
n.Permalink = template.HTML(string(n.Site.BaseUrl) + n.Url) n.Permalink = template.HTML(string(n.Site.BaseUrl) + n.Url)
y := s.NewXMLBuffer() y := s.NewXMLBuffer()
s.Tmpl.ExecuteTemplate(y, "rss.xml", n) s.Tmpl.ExecuteTemplate(y, "rss.xml", n)
s.WritePublic(section+slash+"index.xml", y.Bytes()) s.WritePublic(section+"/index.xml", y.Bytes())
} }
} }
return nil return nil
@ -587,7 +585,7 @@ func (s *Site) RenderHomePage() error {
func (s *Site) Stats() { func (s *Site) Stats() {
fmt.Printf("%d pages created \n", len(s.Pages)) fmt.Printf("%d pages created \n", len(s.Pages))
for _, pl := range s.Config.Indexes { for _, pl := range s.Config.Indexes {
fmt.Printf("%d %s created\n", len(s.Indexes[pl]), pl) fmt.Printf("%d %s index created\n", len(s.Indexes[pl]), pl)
} }
} }