From: spf13 Date: Mon, 25 Aug 2014 17:13:11 +0000 (-0400) Subject: go fmt site.go X-Git-Tag: v0.12~37 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1b5f59b071bfe7dd66b02a900fbd78296d7baf81;p=brevno-suite%2Fhugo go fmt site.go --- diff --git a/hugolib/site.go b/hugolib/site.go index aef7c38f..f849bf6f 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -56,21 +56,21 @@ var DefaultTimer *nitro.B // // 5. The entire collection of files is written to disk. type Site struct { - Pages Pages - Tmpl Template - Taxonomies TaxonomyList - Source source.Input - Sections Taxonomy - Info SiteInfo - Shortcodes map[string]ShortcodeFunc - Menus Menus - timer *nitro.B - Target target.Output - Alias target.AliasPublisher - Completed chan bool - RunMode runmode - params map[string]interface{} - draftCount int + Pages Pages + Tmpl Template + Taxonomies TaxonomyList + Source source.Input + Sections Taxonomy + Info SiteInfo + Shortcodes map[string]ShortcodeFunc + Menus Menus + timer *nitro.B + Target target.Output + Alias target.AliasPublisher + Completed chan bool + RunMode runmode + params map[string]interface{} + draftCount int futureCount int } @@ -353,7 +353,7 @@ func (s *Site) CreatePages() (err error) { if page.IsDraft() { s.draftCount += 1 } - + if page.IsFuture() { s.futureCount += 1 } @@ -827,7 +827,7 @@ func (s *Site) RenderSitemap() error { func (s *Site) Stats() { jww.FEEDBACK.Println(s.draftStats()) jww.FEEDBACK.Println(s.futureStats()) - jww.FEEDBACK.Printf("%d pages created \n", len(s.Pages)) + jww.FEEDBACK.Printf("%d pages created \n", len(s.Pages)) taxonomies := viper.GetStringMapString("Taxonomies") @@ -987,26 +987,26 @@ func (s *Site) draftStats() string { if viper.GetBool("BuildDrafts") { return fmt.Sprintf("%d of ", s.draftCount) + msg - } + } return "0 of " + msg } func (s *Site) futureStats() string { - var msg string - - switch s.futureCount { - case 0: - return "0 future content " - case 1: - msg = "1 future rendered " - default: - msg = fmt.Sprintf("%d future rendered", s.draftCount) - } - - if viper.GetBool("BuildFuture") { - return fmt.Sprintf("%d of ", s.futureCount) + msg - } - - return "0 of " + msg + var msg string + + switch s.futureCount { + case 0: + return "0 future content " + case 1: + msg = "1 future rendered " + default: + msg = fmt.Sprintf("%d future rendered", s.draftCount) + } + + if viper.GetBool("BuildFuture") { + return fmt.Sprintf("%d of ", s.futureCount) + msg + } + + return "0 of " + msg }