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

Move AbUrlify to post content transformation

Browse Source 
Currently the a@href and script@src elements will have BaseUrl applied
to their elements prior to being written to disk.
This commit is contained in:
Noah Campbell
2013-09-17 14:16:06 -07:00
parent c6fe87b14e
commit 6b0752e8c0
4 changed files with 69 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
hugolib/site.go
View File

@@ -14,6 +14,7 @@
package hugolib
import (
"io"
"bitbucket.org/pkg/inflect"
"bytes"
"fmt"
@@ -21,6 +22,7 @@ import (
"github.com/spf13/hugo/target"
helpers "github.com/spf13/hugo/template"
"github.com/spf13/hugo/template/bundle"
"github.com/spf13/hugo/transform"
"github.com/spf13/nitro"
"html/template"
"os"
@@ -75,6 +77,7 @@ type Site struct {
Info SiteInfo
Shortcodes map[string]ShortcodeFunc
timer *nitro.B
Transformer *transform.Transformer
Target target.Output
Alias target.AliasPublisher
}
@@ -154,7 +157,6 @@ func (s *Site) Render() (err error) {
s.timerStep("render and write aliases")
s.ProcessShortcodes()
s.timerStep("render shortcodes")
s.AbsUrlify()
s.timerStep("absolute URLify")
if err = s.RenderIndexes(); err != nil {
return
@@ -246,20 +248,6 @@ func (s *Site) ProcessShortcodes() {
}
}
func (s *Site) AbsUrlify() {
baseWithoutTrailingSlash := strings.TrimRight(s.Config.BaseUrl, "/")
baseWithSlash := baseWithoutTrailingSlash + "/"
for _, page := range s.Pages {
content := string(page.Content)
content = strings.Replace(content, " src=\"/", " src=\""+baseWithSlash, -1)
content = strings.Replace(content, " src='/", " src='"+baseWithSlash, -1)
content = strings.Replace(content, " href='/", " href='"+baseWithSlash, -1)
content = strings.Replace(content, " href=\"/", " href=\""+baseWithSlash, -1)
content = strings.Replace(content, baseWithoutTrailingSlash+"//", baseWithSlash, -1)
page.Content = template.HTML(content)
}
}
func (s *Site) CreatePages() (err error) {
for _, file := range s.Source.Files() {
page, err := ReadFrom(file.Contents, file.Name)
@@ -418,7 +406,7 @@ func (s *Site) RenderPages() error {
if err != nil {
return err
}
err = s.WritePublic(p.OutFile, content.Bytes())
err = s.WritePublic(p.OutFile, content)
if err != nil {
return err
}
@@ -447,7 +435,7 @@ func (s *Site) RenderIndexes() error {
var base string
base = plural + "/" + k
err = s.WritePublic(base+".html", x.Bytes())
err = s.WritePublic(base+".html", x)
if err != nil {
return err
}
@@ -458,7 +446,7 @@ func (s *Site) RenderIndexes() error {
n.Url = helpers.Urlize(plural + "/" + k + ".xml")
n.Permalink = permalink(s, n.Url)
s.Tmpl.ExecuteTemplate(y, "rss.xml", n)
err = s.WritePublic(base+".xml", y.Bytes())
err = s.WritePublic(base+".xml", y)
if err != nil {
return err
}
@@ -487,7 +475,7 @@ func (s *Site) RenderIndexesIndexes() (err error) {
return err
}
err = s.WritePublic(plural+"/index.html", x.Bytes())
err = s.WritePublic(plural+"/index.html", x)
if err != nil {
return err
}
@@ -511,7 +499,7 @@ func (s *Site) RenderLists() error {
if err != nil {
return err
}
err = s.WritePublic(section, content.Bytes())
err = s.WritePublic(section, content)
if err != nil {
return err
}
@@ -522,7 +510,7 @@ func (s *Site) RenderLists() error {
n.Permalink = template.HTML(string(n.Site.BaseUrl) + n.Url)
y := s.NewXMLBuffer()
s.Tmpl.ExecuteTemplate(y, "rss.xml", n)
err = s.WritePublic(section+"/index.xml", y.Bytes())
err = s.WritePublic(section+"/index.xml", y)
return err
}
}
@@ -547,7 +535,7 @@ func (s *Site) RenderHomePage() error {
if err != nil {
return err
}
err = s.WritePublic("/", x.Bytes())
err = s.WritePublic("/", x)
if err != nil {
return err
}
@@ -559,7 +547,7 @@ func (s *Site) RenderHomePage() error {
n.Permalink = permalink(s, "index.xml")
y := s.NewXMLBuffer()
s.Tmpl.ExecuteTemplate(y, "rss.xml", n)
err = s.WritePublic("index.xml", y.Bytes())
err = s.WritePublic("index.xml", y)
return err
}
@@ -571,7 +559,7 @@ func (s *Site) RenderHomePage() error {
if err != nil {
return err
}
err = s.WritePublic("404.html", x.Bytes())
err = s.WritePublic("404.html", x)
return err
}
@@ -631,14 +619,19 @@ func (s *Site) initTarget() {
}
}
func (s *Site) WritePublic(path string, content []byte) (err error) {
func (s *Site) WritePublic(path string, content io.Reader) (err error) {
s.initTarget()
if s.Config.Verbose {
fmt.Println(path)
}
return s.Target.Publish(path, bytes.NewReader(content))
if s.Transformer == nil {
s.Transformer = &transform.Transformer{BaseURL: s.Config.BaseUrl}
}
final := new(bytes.Buffer)
s.Transformer.Apply(content, final)
return s.Target.Publish(path, final)
}
func (s *Site) WriteAlias(path string, permalink template.HTML) (err error) {