github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-03-25 09:23:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

hugolib: Simplify

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2016-11-23 18:28:14 +01:00
parent f1ed89fec4
commit 4360452001
6 changed files with 13 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hugolib/hugo_sites.go
View file

@ -167,12 +167,8 @@ func (h *HugoSites) renderCrossSitesArtifacts() error {
smLayouts := []string{"sitemapindex.xml", "_default/sitemapindex.xml", "_internal/_default/sitemapindex.xml"} smLayouts := []string{"sitemapindex.xml", "_default/sitemapindex.xml", "_internal/_default/sitemapindex.xml"}
if err := s.renderAndWriteXML("sitemapindex", sitemapDefault.Filename, return s.renderAndWriteXML("sitemapindex",
h.toSiteInfos(), s.appendThemeTemplates(smLayouts)...); err != nil { sitemapDefault.Filename, h.toSiteInfos(), s.appendThemeTemplates(smLayouts)...)
return err
}
return nil
} }
func (h *HugoSites) assignMissingTranslations() error { func (h *HugoSites) assignMissingTranslations() error {

6
hugolib/page.go
View file

@ -1351,11 +1351,7 @@ func (p *Page) saveSourceAs(path string, safe bool) error {
bc := make([]byte, b.Len(), b.Len()) bc := make([]byte, b.Len(), b.Len())
copy(bc, b.Bytes()) copy(bc, b.Bytes())
err := p.saveSource(bc, path, safe) return p.saveSource(bc, path, safe)
if err != nil {
return err
}
return nil
} }
func (p *Page) saveSource(by []byte, inpath string, safe bool) (err error) { func (p *Page) saveSource(by []byte, inpath string, safe bool) (err error) {

2
hugolib/permalinks.go
View file

@ -197,5 +197,5 @@ func init() {
"filename": pageToPermalinkFilename, "filename": pageToPermalinkFilename,
} }
attributeRegexp = regexp.MustCompile(":\\w+") attributeRegexp = regexp.MustCompile(`:\w+`)
} }

8
hugolib/shortcode_test.go
View file

@ -72,12 +72,8 @@ title: "Title"
require.Len(t, h.Sites[0].RegularPages, 1) require.Len(t, h.Sites[0].RegularPages, 1)
output := strings.TrimSpace(string(h.Sites[0].RegularPages[0].Content)) output := strings.TrimSpace(string(h.Sites[0].RegularPages[0].Content))
if strings.HasPrefix(output, "<p>") { output = strings.TrimPrefix(output, "<p>")
output = output[3:] output = strings.TrimSuffix(output, "</p>")
}
if strings.HasSuffix(output, "</p>") {
output = output[:len(output)-4]
}
expected = strings.TrimSpace(expected) expected = strings.TrimSpace(expected)

2
hugolib/site.go
View file

@ -1797,7 +1797,7 @@ Your rendered home page is blank: /index.html is zero-length
func (s *Site) renderForLayouts(name string, d interface{}, w io.Writer, layouts ...string) error { func (s *Site) renderForLayouts(name string, d interface{}, w io.Writer, layouts ...string) error {
layout, found := s.findFirstLayout(layouts...) layout, found := s.findFirstLayout(layouts...)
if found == false { if !found {
jww.WARN.Printf("Unable to locate layout for %s: %s\n", name, layouts) jww.WARN.Printf("Unable to locate layout for %s: %s\n", name, layouts)
return nil return nil
} }

19
hugolib/site_render.go
View file

@ -159,11 +159,8 @@ func (s *Site) renderRSS(p *Page) error {
rssPath := path.Join(rssPage.URLPath.URL, rssURI) rssPath := path.Join(rssPage.URLPath.URL, rssURI)
s.setPageURLs(rssPage, rssPath) s.setPageURLs(rssPage, rssPath)
if err := s.renderAndWriteXML(rssPage.Title, rssPage.addLangFilepathPrefix(rssPath), rssPage, s.appendThemeTemplates(layouts)...); err != nil { return s.renderAndWriteXML(rssPage.Title,
return err rssPage.addLangFilepathPrefix(rssPath), rssPage, s.appendThemeTemplates(layouts)...)
}
return nil
} }
func (s *Site) render404() error { func (s *Site) render404() error {
@ -178,11 +175,9 @@ func (s *Site) render404() error {
s.setPageURLs(p, "404.html") s.setPageURLs(p, "404.html")
nfLayouts := []string{"404.html"} nfLayouts := []string{"404.html"}
if nfErr := s.renderAndWritePage("404 page", "404.html", p, s.appendThemeTemplates(nfLayouts)...); nfErr != nil {
return nfErr
}
return nil return s.renderAndWritePage("404 page", "404.html", p, s.appendThemeTemplates(nfLayouts)...)
} }
func (s *Site) renderSitemap() error { func (s *Site) renderSitemap() error {
@ -223,11 +218,9 @@ func (s *Site) renderSitemap() error {
smLayouts := []string{"sitemap.xml", "_default/sitemap.xml", "_internal/_default/sitemap.xml"} smLayouts := []string{"sitemap.xml", "_default/sitemap.xml", "_internal/_default/sitemap.xml"}
addLanguagePrefix := n.Site.IsMultiLingual() addLanguagePrefix := n.Site.IsMultiLingual()
if err := s.renderAndWriteXML("sitemap", n.addLangPathPrefixIfFlagSet(page.Sitemap.Filename, addLanguagePrefix), n, s.appendThemeTemplates(smLayouts)...); err != nil {
return err
}
return nil return s.renderAndWriteXML("sitemap",
n.addLangPathPrefixIfFlagSet(page.Sitemap.Filename, addLanguagePrefix), n, s.appendThemeTemplates(smLayouts)...)
} }
func (s *Site) renderRobotsTXT() error { func (s *Site) renderRobotsTXT() error {