commit 4360452001af24088a4f72f6e1177b0a780aa3b8
parent f1ed89fec41302ef37ad86348063a7a9be4ef587
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Wed, 23 Nov 2016 18:28:14 +0100
hugolib: Simplify
Diffstat:
6 files changed, 13 insertions(+), 32 deletions(-)
diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
@@ -167,12 +167,8 @@ func (h *HugoSites) renderCrossSitesArtifacts() error {
smLayouts := []string{"sitemapindex.xml", "_default/sitemapindex.xml", "_internal/_default/sitemapindex.xml"}
- if err := s.renderAndWriteXML("sitemapindex", sitemapDefault.Filename,
- h.toSiteInfos(), s.appendThemeTemplates(smLayouts)...); err != nil {
- return err
- }
-
- return nil
+ return s.renderAndWriteXML("sitemapindex",
+ sitemapDefault.Filename, h.toSiteInfos(), s.appendThemeTemplates(smLayouts)...)
}
func (h *HugoSites) assignMissingTranslations() error {
diff --git a/hugolib/page.go b/hugolib/page.go
@@ -1351,11 +1351,7 @@ func (p *Page) saveSourceAs(path string, safe bool) error {
bc := make([]byte, b.Len(), b.Len())
copy(bc, b.Bytes())
- err := p.saveSource(bc, path, safe)
- if err != nil {
- return err
- }
- return nil
+ return p.saveSource(bc, path, safe)
}
func (p *Page) saveSource(by []byte, inpath string, safe bool) (err error) {
diff --git a/hugolib/permalinks.go b/hugolib/permalinks.go
@@ -197,5 +197,5 @@ func init() {
"filename": pageToPermalinkFilename,
}
- attributeRegexp = regexp.MustCompile(":\\w+")
+ attributeRegexp = regexp.MustCompile(`:\w+`)
}
diff --git a/hugolib/shortcode_test.go b/hugolib/shortcode_test.go
@@ -72,12 +72,8 @@ title: "Title"
require.Len(t, h.Sites[0].RegularPages, 1)
output := strings.TrimSpace(string(h.Sites[0].RegularPages[0].Content))
- if strings.HasPrefix(output, "<p>") {
- output = output[3:]
- }
- if strings.HasSuffix(output, "</p>") {
- output = output[:len(output)-4]
- }
+ output = strings.TrimPrefix(output, "<p>")
+ output = strings.TrimSuffix(output, "</p>")
expected = strings.TrimSpace(expected)
diff --git a/hugolib/site.go b/hugolib/site.go
@@ -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 {
layout, found := s.findFirstLayout(layouts...)
- if found == false {
+ if !found {
jww.WARN.Printf("Unable to locate layout for %s: %s\n", name, layouts)
return nil
}
diff --git a/hugolib/site_render.go b/hugolib/site_render.go
@@ -159,11 +159,8 @@ func (s *Site) renderRSS(p *Page) error {
rssPath := path.Join(rssPage.URLPath.URL, rssURI)
s.setPageURLs(rssPage, rssPath)
- if err := s.renderAndWriteXML(rssPage.Title, rssPage.addLangFilepathPrefix(rssPath), rssPage, s.appendThemeTemplates(layouts)...); err != nil {
- return err
- }
-
- return nil
+ return s.renderAndWriteXML(rssPage.Title,
+ rssPage.addLangFilepathPrefix(rssPath), rssPage, s.appendThemeTemplates(layouts)...)
}
func (s *Site) render404() error {
@@ -178,11 +175,9 @@ func (s *Site) render404() error {
s.setPageURLs(p, "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 {
@@ -223,11 +218,9 @@ func (s *Site) renderSitemap() error {
smLayouts := []string{"sitemap.xml", "_default/sitemap.xml", "_internal/_default/sitemap.xml"}
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 {