aboutsummaryrefslogtreecommitdiff
path: root/page
diff options
context:
space:
mode:
authorMitchell Riedstra <mitch@riedstra.dev>2021-07-12 23:06:42 -0400
committerMitchell Riedstra <mitch@riedstra.dev>2021-07-12 23:06:42 -0400
commit2734c671324e980ef7424e367461ebaa4e0034a5 (patch)
treed4ee457c18002011b9e5a5927baa34e5b6d7b16c /page
parent3f47f136de6a79adedbe16329586944c6a90ee65 (diff)
downloadgo-website-2734c671324e980ef7424e367461ebaa4e0034a5.tar.gz
go-website-2734c671324e980ef7424e367461ebaa4e0034a5.tar.xz
Add atom feed to site, require config.yml
Diffstat (limited to 'page')
-rw-r--r--page/index.go3
-rw-r--r--page/page.go9
-rw-r--r--page/pagelist.go16
-rw-r--r--page/render.go2
4 files changed, 18 insertions, 12 deletions
diff --git a/page/index.go b/page/index.go
index a453335..f9f2df5 100644
--- a/page/index.go
+++ b/page/index.go
@@ -1,7 +1,6 @@
package page
import (
- "fmt"
"os"
"path/filepath"
"strings"
@@ -49,7 +48,7 @@ func (p *Page) Index() (map[string]PageList, error) {
err = p2.Read()
if err != nil {
- fmt.Fprintln(os.Stderr, "Error encountered: ", err)
+ Logger.Println("Error encountered: ", err)
return err
}
diff --git a/page/page.go b/page/page.go
index ecd2268..8b84099 100644
--- a/page/page.go
+++ b/page/page.go
@@ -61,10 +61,6 @@ type Page struct {
// .Global care must be taken when utilizing this functionality
var Global interface{}
-// CachePages determines whether or not the rendered page will be stored in
-// memory
-var CachePages = true
-
// CacheIndex determines whether or not the index will be cached in memory
// or rebuilt on each call
var CacheIndex = true
@@ -105,11 +101,6 @@ func (p *Page) Global() interface{} {
return Global
}
-// SetVars Will set to `nil` if provided
-func (p *Page) SetVars(vars map[string]interface{}) {
- p.Vars = vars
-}
-
// Renders a page
func (p *Page) Render(wr io.Writer) error {
if err := p.Read(); err != nil {
diff --git a/page/pagelist.go b/page/pagelist.go
index a5cf844..f2140f9 100644
--- a/page/pagelist.go
+++ b/page/pagelist.go
@@ -8,6 +8,22 @@ import (
// by the date, or date reversed
type PageList []*Page
+// RemoveDateless returns two PageLists, the first with valid dates,
+// and the second without. This is useful if you need a PageList which
+// will run SortDate and SortDateReverse without issue
+func (p PageList) RemoveDateless() (PageList, PageList) {
+ with := PageList{}
+ without := PageList{}
+ for _, p := range p {
+ if p.Date != nil {
+ with = append(with, p)
+ } else {
+ without = append(without, p)
+ }
+ }
+ return with, without
+}
+
func (p PageList) SortDate() PageList {
sort.Slice(p, func(i, j int) bool {
return p[i].Time().After(p[j].Time())
diff --git a/page/render.go b/page/render.go
index 4378675..07b1b88 100644
--- a/page/render.go
+++ b/page/render.go
@@ -21,7 +21,7 @@ func Render(w http.ResponseWriter, r *http.Request,
p := NewPage(path)
if vars != nil {
- p.SetVars(vars)
+ p.Vars = vars
}
err := p.Render(w)