pagr

commit 2eef4905f1a7deb29f2a0488bcda2827dec3c890
parent 3d2fc97a0d12205e2c0021522e25c0169c9e7d7f
Author: gearsix <gearsix@tuta.io>
Date:   Tue, 27 Jul 2021 15:13:56 +0100

removed type Content (excessive)

Diffstat:
M
content.go
 | 
14
++++++--------
M
content_test.go
 | 
16
++++++++--------
M
pagr.go
 | 
4
++--

3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/content.go b/content.go
@@ -60,11 +60,9 @@ func lastFileMod(fpath string) time.Time {
 	return t
 }
 
-type Content []Page
-
 // Sitemap parses `pages` to determine the `.PageNav` values for each element in `pages`
 // based on their `.Path` value. These values will be set in the returned Content
-func BuildSitemap(pages Content) Content {
+func BuildSitemap(pages []Page) []Page {
 	var root *Page
 	for i, p := range pages {
 		if p.Path == "/" {
@@ -122,7 +120,7 @@ func BuildSitemap(pages Content) Content {
 // filetype found in `SupportedContent`, will be parsed into a string of HTML
 // and appended to the `.Content` of the `Page` generated for it's parent
 // directory.
-func LoadContentDir(dir string) (c Content, e error) {
+func LoadContentDir(dir string) (p []Page, e error) {
 	if _, e = os.Stat(dir); e != nil {
 		return
 	}
@@ -187,13 +185,13 @@ func LoadContentDir(dir string) (c Content, e error) {
 	})
 
 	for _, page := range pages {
-		c = append(c, page)
+		p = append(p, page)
 	}
-	sort.SliceStable(c, func(i, j int) bool { return c[i].Updated.Before(c[j].Updated) })
+	sort.SliceStable(p, func(i, j int) bool { return p[i].Updated.Before(p[j].Updated) })
 
-	c = BuildSitemap(c)
+	p = BuildSitemap(p)
 
-	return c, e
+	return
 }
 
 func isSupportedContentExt(ext string) int {
diff --git a/content_test.go b/content_test.go
@@ -16,22 +16,22 @@ func TestLoadContentDir(t *testing.T) {
 		t.Errorf("failed to create test content: %s", err)
 	}
 
-	var c Content
-	if c, err = LoadContentDir(tdir); err != nil {
+	var p []Page
+	if p, err = LoadContentDir(tdir); err != nil {
 		t.Fatalf("LoadContentDir failed: %s", err)
 	}
 
-	validateContents(t, c, err)
+	validateContents(t, p, err)
 }
 
-func validateContents(t *testing.T, c Content, e error) {
-	if len(c) != len(contents)-1 {
+func validateContents(t *testing.T, pages []Page, e error) {
+	if len(pages) != len(contents)-1 {
 		t.Fatalf("invalid number of pages returned (%d should be %d)",
-			len(c), len(contents))
+			len(pages), len(contents))
 	}
 
 	var last time.Time
-	for i, p := range c {
+	for i, p := range pages {
 		if len(p.Title) == 0 {
 			t.Fatal("empty Title for page:", p)
 		}
@@ -51,7 +51,7 @@ func validateContents(t *testing.T, c Content, e error) {
 		if i == 0 {
 			last = p.Updated
 		} else if p.Updated.Before(last) {
-			for _, pp := range c {
+			for _, pp := range pages {
 				t.Log(pp.Updated)
 			}
 			t.Fatal("Contents Pages returned in wrong order")
diff --git a/pagr.go b/pagr.go
@@ -53,7 +53,7 @@ func main() {
 	}
 	vlog("loaded config: %s\n", config)
 
-	var c Content
+	var c []Page
 	c, err = LoadContentDir(config.Contents)
 	check(err)
 	log.Printf("loaded %d content pages", len(c))
@@ -69,7 +69,7 @@ func main() {
 	return
 }
 
-func build(config Config, pages Content, templates []suti.Template) {
+func build(config Config, pages []Page, templates []suti.Template) {
 	var err error
 	var out bytes.Buffer