mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
Add ByLastmod page sort
This commit is contained in:
parent
fbca53ac32
commit
10af906371
2 changed files with 26 additions and 3 deletions
|
@ -158,6 +158,24 @@ func (p Pages) ByPublishDate() Pages {
|
||||||
return pages
|
return pages
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ByLastmod sorts the Pages by the last modification date and returns a copy.
|
||||||
|
//
|
||||||
|
// Adjacent invocactions on the same receiver will return a cached result.
|
||||||
|
//
|
||||||
|
// This may safely be executed in parallel.
|
||||||
|
func (p Pages) ByLastmod() Pages {
|
||||||
|
|
||||||
|
key := "pageSort.ByLastmod"
|
||||||
|
|
||||||
|
date := func(p1, p2 *Page) bool {
|
||||||
|
return p1.Lastmod.Unix() < p2.Lastmod.Unix()
|
||||||
|
}
|
||||||
|
|
||||||
|
pages, _ := spc.get(key, p, pageBy(date).Sort)
|
||||||
|
|
||||||
|
return pages
|
||||||
|
}
|
||||||
|
|
||||||
// ByLength sorts the Pages by length and returns a copy.
|
// ByLength sorts the Pages by length and returns a copy.
|
||||||
//
|
//
|
||||||
// Adjacent invocactions on the same receiver will return a cached result.
|
// Adjacent invocactions on the same receiver will return a cached result.
|
||||||
|
|
|
@ -15,12 +15,13 @@ package hugolib
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/spf13/hugo/source"
|
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"html/template"
|
"html/template"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/spf13/hugo/source"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestDefaultSort(t *testing.T) {
|
func TestDefaultSort(t *testing.T) {
|
||||||
|
@ -67,6 +68,7 @@ func TestSortByN(t *testing.T) {
|
||||||
{(Pages).ByLinkTitle, func(p Pages) bool { return p[0].LinkTitle() == "abl" }},
|
{(Pages).ByLinkTitle, func(p Pages) bool { return p[0].LinkTitle() == "abl" }},
|
||||||
{(Pages).ByDate, func(p Pages) bool { return p[0].Date == d3 }},
|
{(Pages).ByDate, func(p Pages) bool { return p[0].Date == d3 }},
|
||||||
{(Pages).ByPublishDate, func(p Pages) bool { return p[0].PublishDate == d3 }},
|
{(Pages).ByPublishDate, func(p Pages) bool { return p[0].PublishDate == d3 }},
|
||||||
|
{(Pages).ByLastmod, func(p Pages) bool { return p[1].Lastmod == d2 }},
|
||||||
{(Pages).ByLength, func(p Pages) bool { return p[0].Content == "b_content" }},
|
{(Pages).ByLength, func(p Pages) bool { return p[0].Content == "b_content" }},
|
||||||
} {
|
} {
|
||||||
setSortVals([3]time.Time{d1, d2, d3}, [3]string{"b", "ab", "cde"}, [3]int{3, 2, 1}, p)
|
setSortVals([3]time.Time{d1, d2, d3}, [3]string{"b", "ab", "cde"}, [3]int{3, 2, 1}, p)
|
||||||
|
@ -114,6 +116,7 @@ func BenchmarkSortByWeightAndReverse(b *testing.B) {
|
||||||
func setSortVals(dates [3]time.Time, titles [3]string, weights [3]int, pages Pages) {
|
func setSortVals(dates [3]time.Time, titles [3]string, weights [3]int, pages Pages) {
|
||||||
for i := range dates {
|
for i := range dates {
|
||||||
pages[i].Date = dates[i]
|
pages[i].Date = dates[i]
|
||||||
|
pages[i].Lastmod = dates[i]
|
||||||
pages[i].Weight = weights[i]
|
pages[i].Weight = weights[i]
|
||||||
pages[i].Title = titles[i]
|
pages[i].Title = titles[i]
|
||||||
// make sure we compare apples and ... apples ...
|
// make sure we compare apples and ... apples ...
|
||||||
|
@ -121,7 +124,9 @@ func setSortVals(dates [3]time.Time, titles [3]string, weights [3]int, pages Pag
|
||||||
pages[len(dates)-1-i].PublishDate = dates[i]
|
pages[len(dates)-1-i].PublishDate = dates[i]
|
||||||
pages[len(dates)-1-i].Content = template.HTML(titles[i] + "_content")
|
pages[len(dates)-1-i].Content = template.HTML(titles[i] + "_content")
|
||||||
}
|
}
|
||||||
|
lastLastMod := pages[2].Lastmod
|
||||||
|
pages[2].Lastmod = pages[1].Lastmod
|
||||||
|
pages[1].Lastmod = lastLastMod
|
||||||
}
|
}
|
||||||
|
|
||||||
func createSortTestPages(num int) Pages {
|
func createSortTestPages(num int) Pages {
|
||||||
|
|
Loading…
Reference in a new issue