2015-12-07 13:57:01 -05:00
|
|
|
// Copyright 2015 The Hugo Authors. All rights reserved.
|
2014-12-27 08:11:19 -05:00
|
|
|
//
|
2015-11-23 22:16:36 -05:00
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
2014-12-27 08:11:19 -05:00
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
2015-11-23 22:16:36 -05:00
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
2014-12-27 08:11:19 -05:00
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package hugolib
|
|
|
|
|
|
|
|
import (
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
|
|
|
"html/template"
|
|
|
|
"math"
|
2015-03-31 16:33:24 -04:00
|
|
|
"reflect"
|
2017-03-09 13:19:29 -05:00
|
|
|
"strings"
|
2016-07-26 13:04:10 -04:00
|
|
|
|
2017-06-13 12:42:45 -04:00
|
|
|
"github.com/gohugoio/hugo/config"
|
2017-02-04 22:20:06 -05:00
|
|
|
|
2016-07-26 13:04:10 -04:00
|
|
|
"github.com/spf13/cast"
|
2014-12-27 08:11:19 -05:00
|
|
|
)
|
|
|
|
|
2016-03-24 09:18:47 -04:00
|
|
|
// Pager represents one of the elements in a paginator.
|
|
|
|
// The number, starting on 1, represents its place.
|
2015-04-21 15:25:42 -04:00
|
|
|
type Pager struct {
|
2014-12-27 08:11:19 -05:00
|
|
|
number int
|
|
|
|
*paginator
|
|
|
|
}
|
|
|
|
|
2016-11-13 08:27:10 -05:00
|
|
|
func (p Pager) String() string {
|
|
|
|
return fmt.Sprintf("Pager %d", p.number)
|
|
|
|
}
|
|
|
|
|
2015-07-16 07:17:54 -04:00
|
|
|
type paginatedElement interface {
|
|
|
|
Len() int
|
|
|
|
}
|
|
|
|
|
2016-03-24 09:18:47 -04:00
|
|
|
// Len returns the number of pages in the list.
|
2015-07-16 07:17:54 -04:00
|
|
|
func (p Pages) Len() int {
|
|
|
|
return len(p)
|
|
|
|
}
|
|
|
|
|
2016-03-24 09:18:47 -04:00
|
|
|
// Len returns the number of pages in the page group.
|
2015-07-16 07:17:54 -04:00
|
|
|
func (psg PagesGroup) Len() int {
|
|
|
|
l := 0
|
|
|
|
for _, pg := range psg {
|
|
|
|
l += len(pg.Pages)
|
|
|
|
}
|
|
|
|
return l
|
|
|
|
}
|
|
|
|
|
2015-04-21 15:25:42 -04:00
|
|
|
type pagers []*Pager
|
2014-12-27 08:11:19 -05:00
|
|
|
|
2016-01-08 16:55:19 -05:00
|
|
|
var (
|
|
|
|
paginatorEmptyPages Pages
|
|
|
|
paginatorEmptyPageGroups PagesGroup
|
|
|
|
)
|
2015-03-05 18:30:51 -05:00
|
|
|
|
2014-12-27 08:11:19 -05:00
|
|
|
type paginator struct {
|
2015-07-16 07:17:54 -04:00
|
|
|
paginatedElements []paginatedElement
|
2014-12-27 08:11:19 -05:00
|
|
|
pagers
|
2015-03-11 13:34:57 -04:00
|
|
|
paginationURLFactory
|
2015-03-31 16:33:24 -04:00
|
|
|
total int
|
|
|
|
size int
|
|
|
|
source interface{}
|
|
|
|
options []interface{}
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
2015-03-11 13:34:57 -04:00
|
|
|
type paginationURLFactory func(int) string
|
2014-12-27 08:11:19 -05:00
|
|
|
|
|
|
|
// PageNumber returns the current page's number in the pager sequence.
|
2015-04-21 15:25:42 -04:00
|
|
|
func (p *Pager) PageNumber() int {
|
2014-12-27 08:11:19 -05:00
|
|
|
return p.number
|
|
|
|
}
|
|
|
|
|
2015-03-18 01:16:54 -04:00
|
|
|
// URL returns the URL to the current page.
|
2015-04-21 15:25:42 -04:00
|
|
|
func (p *Pager) URL() template.HTML {
|
2015-03-11 13:34:57 -04:00
|
|
|
return template.HTML(p.paginationURLFactory(p.PageNumber()))
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
2015-07-16 07:17:54 -04:00
|
|
|
// Pages returns the Pages on this page.
|
|
|
|
// Note: If this return a non-empty result, then PageGroups() will return empty.
|
2015-04-21 15:25:42 -04:00
|
|
|
func (p *Pager) Pages() Pages {
|
2015-07-16 07:17:54 -04:00
|
|
|
if len(p.paginatedElements) == 0 {
|
|
|
|
return paginatorEmptyPages
|
|
|
|
}
|
|
|
|
|
|
|
|
if pages, ok := p.element().(Pages); ok {
|
|
|
|
return pages
|
|
|
|
}
|
|
|
|
|
|
|
|
return paginatorEmptyPages
|
|
|
|
}
|
|
|
|
|
|
|
|
// PageGroups return Page groups for this page.
|
|
|
|
// Note: If this return non-empty result, then Pages() will return empty.
|
|
|
|
func (p *Pager) PageGroups() PagesGroup {
|
|
|
|
if len(p.paginatedElements) == 0 {
|
|
|
|
return paginatorEmptyPageGroups
|
|
|
|
}
|
|
|
|
|
|
|
|
if groups, ok := p.element().(PagesGroup); ok {
|
|
|
|
return groups
|
|
|
|
}
|
|
|
|
|
|
|
|
return paginatorEmptyPageGroups
|
|
|
|
}
|
|
|
|
|
|
|
|
func (p *Pager) element() paginatedElement {
|
|
|
|
if len(p.paginatedElements) == 0 {
|
2015-03-05 18:30:51 -05:00
|
|
|
return paginatorEmptyPages
|
|
|
|
}
|
2015-07-16 07:17:54 -04:00
|
|
|
return p.paginatedElements[p.PageNumber()-1]
|
|
|
|
}
|
|
|
|
|
|
|
|
// page returns the Page with the given index
|
|
|
|
func (p *Pager) page(index int) (*Page, error) {
|
|
|
|
|
|
|
|
if pages, ok := p.element().(Pages); ok {
|
|
|
|
if pages != nil && len(pages) > index {
|
|
|
|
return pages[index], nil
|
|
|
|
}
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// must be PagesGroup
|
|
|
|
// this construction looks clumsy, but ...
|
|
|
|
// ... it is the difference between 99.5% and 100% test coverage :-)
|
|
|
|
groups := p.element().(PagesGroup)
|
|
|
|
|
|
|
|
i := 0
|
|
|
|
for _, v := range groups {
|
|
|
|
for _, page := range v.Pages {
|
|
|
|
if i == index {
|
|
|
|
return page, nil
|
|
|
|
}
|
|
|
|
i++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil, nil
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// NumberOfElements gets the number of elements on this page.
|
2015-04-21 15:25:42 -04:00
|
|
|
func (p *Pager) NumberOfElements() int {
|
2015-07-16 07:17:54 -04:00
|
|
|
return p.element().Len()
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// HasPrev tests whether there are page(s) before the current.
|
2015-04-21 15:25:42 -04:00
|
|
|
func (p *Pager) HasPrev() bool {
|
2014-12-27 08:11:19 -05:00
|
|
|
return p.PageNumber() > 1
|
|
|
|
}
|
|
|
|
|
|
|
|
// Prev returns the pager for the previous page.
|
2015-04-21 15:25:42 -04:00
|
|
|
func (p *Pager) Prev() *Pager {
|
2014-12-27 08:11:19 -05:00
|
|
|
if !p.HasPrev() {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
return p.pagers[p.PageNumber()-2]
|
|
|
|
}
|
|
|
|
|
|
|
|
// HasNext tests whether there are page(s) after the current.
|
2015-04-21 15:25:42 -04:00
|
|
|
func (p *Pager) HasNext() bool {
|
2015-07-16 07:17:54 -04:00
|
|
|
return p.PageNumber() < len(p.paginatedElements)
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Next returns the pager for the next page.
|
2015-04-21 15:25:42 -04:00
|
|
|
func (p *Pager) Next() *Pager {
|
2014-12-27 08:11:19 -05:00
|
|
|
if !p.HasNext() {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
return p.pagers[p.PageNumber()]
|
|
|
|
}
|
|
|
|
|
|
|
|
// First returns the pager for the first page.
|
2015-04-21 15:25:42 -04:00
|
|
|
func (p *Pager) First() *Pager {
|
2014-12-27 08:11:19 -05:00
|
|
|
return p.pagers[0]
|
|
|
|
}
|
|
|
|
|
|
|
|
// Last returns the pager for the last page.
|
2015-04-21 15:25:42 -04:00
|
|
|
func (p *Pager) Last() *Pager {
|
2014-12-27 08:11:19 -05:00
|
|
|
return p.pagers[len(p.pagers)-1]
|
|
|
|
}
|
|
|
|
|
|
|
|
// Pagers returns a list of pagers that can be used to build a pagination menu.
|
|
|
|
func (p *paginator) Pagers() pagers {
|
|
|
|
return p.pagers
|
|
|
|
}
|
|
|
|
|
|
|
|
// PageSize returns the size of each paginator page.
|
|
|
|
func (p *paginator) PageSize() int {
|
|
|
|
return p.size
|
|
|
|
}
|
|
|
|
|
|
|
|
// TotalPages returns the number of pages in the paginator.
|
|
|
|
func (p *paginator) TotalPages() int {
|
2015-07-16 07:17:54 -04:00
|
|
|
return len(p.paginatedElements)
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// TotalNumberOfElements returns the number of elements on all pages in this paginator.
|
|
|
|
func (p *paginator) TotalNumberOfElements() int {
|
|
|
|
return p.total
|
|
|
|
}
|
|
|
|
|
2015-07-16 07:17:54 -04:00
|
|
|
func splitPages(pages Pages, size int) []paginatedElement {
|
|
|
|
var split []paginatedElement
|
2014-12-27 08:11:19 -05:00
|
|
|
for low, j := 0, len(pages); low < j; low += size {
|
|
|
|
high := int(math.Min(float64(low+size), float64(len(pages))))
|
|
|
|
split = append(split, pages[low:high])
|
|
|
|
}
|
|
|
|
|
|
|
|
return split
|
|
|
|
}
|
|
|
|
|
2015-07-16 07:17:54 -04:00
|
|
|
func splitPageGroups(pageGroups PagesGroup, size int) []paginatedElement {
|
|
|
|
|
|
|
|
type keyPage struct {
|
|
|
|
key interface{}
|
|
|
|
page *Page
|
|
|
|
}
|
|
|
|
|
2016-01-08 16:55:19 -05:00
|
|
|
var (
|
|
|
|
split []paginatedElement
|
|
|
|
flattened []keyPage
|
|
|
|
)
|
2015-07-16 07:17:54 -04:00
|
|
|
|
|
|
|
for _, g := range pageGroups {
|
|
|
|
for _, p := range g.Pages {
|
|
|
|
flattened = append(flattened, keyPage{g.Key, p})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
numPages := len(flattened)
|
|
|
|
|
|
|
|
for low, j := 0, numPages; low < j; low += size {
|
|
|
|
high := int(math.Min(float64(low+size), float64(numPages)))
|
2016-01-08 16:55:19 -05:00
|
|
|
|
|
|
|
var (
|
|
|
|
pg PagesGroup
|
2016-03-24 09:18:47 -04:00
|
|
|
key interface{}
|
|
|
|
groupIndex = -1
|
2016-01-08 16:55:19 -05:00
|
|
|
)
|
|
|
|
|
2015-07-16 07:17:54 -04:00
|
|
|
for k := low; k < high; k++ {
|
|
|
|
kp := flattened[k]
|
|
|
|
if key == nil || key != kp.key {
|
|
|
|
key = kp.key
|
|
|
|
pg = append(pg, PageGroup{Key: key})
|
|
|
|
groupIndex++
|
|
|
|
}
|
|
|
|
pg[groupIndex].Pages = append(pg[groupIndex].Pages, kp.page)
|
|
|
|
}
|
|
|
|
split = append(split, pg)
|
|
|
|
}
|
|
|
|
|
|
|
|
return split
|
|
|
|
}
|
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
// Paginator get this Page's main output's paginator.
|
2016-11-13 08:27:10 -05:00
|
|
|
func (p *Page) Paginator(options ...interface{}) (*Pager, error) {
|
2017-03-09 13:19:29 -05:00
|
|
|
return p.mainPageOutput.Paginator(options...)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Paginator gets this PageOutput's paginator if it's already created.
|
|
|
|
// If it's not, one will be created with all pages in Data["Pages"].
|
|
|
|
func (p *PageOutput) Paginator(options ...interface{}) (*Pager, error) {
|
2016-11-13 08:27:10 -05:00
|
|
|
if !p.IsNode() {
|
2018-01-15 14:40:39 -05:00
|
|
|
return nil, fmt.Errorf("Paginators not supported for pages of type %q (%q)", p.Kind, p.title)
|
2016-10-31 05:23:01 -04:00
|
|
|
}
|
2017-02-04 22:20:06 -05:00
|
|
|
pagerSize, err := resolvePagerSize(p.s.Cfg, options...)
|
2015-03-31 13:12:54 -04:00
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2014-12-27 08:11:19 -05:00
|
|
|
|
|
|
|
var initError error
|
|
|
|
|
2016-11-13 08:27:10 -05:00
|
|
|
p.paginatorInit.Do(func() {
|
|
|
|
if p.paginator != nil {
|
2014-12-27 08:11:19 -05:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2017-11-12 04:03:56 -05:00
|
|
|
pathDescriptor := p.targetPathDescriptor
|
|
|
|
if p.s.owner.IsMultihost() {
|
|
|
|
pathDescriptor.LangPrefix = ""
|
|
|
|
}
|
Add Hugo Piper with SCSS support and much more
Before this commit, you would have to use page bundles to do image processing etc. in Hugo.
This commit adds
* A new `/assets` top-level project or theme dir (configurable via `assetDir`)
* A new template func, `resources.Get` which can be used to "get a resource" that can be further processed.
This means that you can now do this in your templates (or shortcodes):
```bash
{{ $sunset := (resources.Get "images/sunset.jpg").Fill "300x200" }}
```
This also adds a new `extended` build tag that enables powerful SCSS/SASS support with source maps. To compile this from source, you will also need a C compiler installed:
```
HUGO_BUILD_TAGS=extended mage install
```
Note that you can use output of the SCSS processing later in a non-SCSSS-enabled Hugo.
The `SCSS` processor is a _Resource transformation step_ and it can be chained with the many others in a pipeline:
```bash
{{ $css := resources.Get "styles.scss" | resources.ToCSS | resources.PostCSS | resources.Minify | resources.Fingerprint }}
<link rel="stylesheet" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Digest }}" media="screen">
```
The transformation funcs above have aliases, so it can be shortened to:
```bash
{{ $css := resources.Get "styles.scss" | toCSS | postCSS | minify | fingerprint }}
<link rel="stylesheet" href="{{ $styles.RelPermalink }}" integrity="{{ $styles.Data.Digest }}" media="screen">
```
A quick tip would be to avoid the fingerprinting part, and possibly also the not-superfast `postCSS` when you're doing development, as it allows Hugo to be smarter about the rebuilding.
Documentation will follow, but have a look at the demo repo in https://github.com/bep/hugo-sass-test
New functions to create `Resource` objects:
* `resources.Get` (see above)
* `resources.FromString`: Create a Resource from a string.
New `Resource` transformation funcs:
* `resources.ToCSS`: Compile `SCSS` or `SASS` into `CSS`.
* `resources.PostCSS`: Process your CSS with PostCSS. Config file support (project or theme or passed as an option).
* `resources.Minify`: Currently supports `css`, `js`, `json`, `html`, `svg`, `xml`.
* `resources.Fingerprint`: Creates a fingerprinted version of the given Resource with Subresource Integrity..
* `resources.Concat`: Concatenates a list of Resource objects. Think of this as a poor man's bundler.
* `resources.ExecuteAsTemplate`: Parses and executes the given Resource and data context (e.g. .Site) as a Go template.
Fixes #4381
Fixes #4903
Fixes #4858
2018-02-20 04:02:14 -05:00
|
|
|
pagers, err := paginatePages(pathDescriptor, p.data["Pages"], pagerSize)
|
2014-12-27 08:11:19 -05:00
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
initError = err
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(pagers) > 0 {
|
|
|
|
// the rest of the nodes will be created later
|
2016-11-13 08:27:10 -05:00
|
|
|
p.paginator = pagers[0]
|
|
|
|
p.paginator.source = "paginator"
|
|
|
|
p.paginator.options = options
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
if initError != nil {
|
|
|
|
return nil, initError
|
|
|
|
}
|
|
|
|
|
2016-11-13 08:27:10 -05:00
|
|
|
return p.paginator, nil
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
// Paginate invokes this Page's main output's Paginate method.
|
|
|
|
func (p *Page) Paginate(seq interface{}, options ...interface{}) (*Pager, error) {
|
|
|
|
return p.mainPageOutput.Paginate(seq, options...)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Paginate gets this PageOutput's paginator if it's already created.
|
2014-12-27 08:11:19 -05:00
|
|
|
// If it's not, one will be created with the qiven sequence.
|
|
|
|
// Note that repeated calls will return the same result, even if the sequence is different.
|
2017-03-09 13:19:29 -05:00
|
|
|
func (p *PageOutput) Paginate(seq interface{}, options ...interface{}) (*Pager, error) {
|
2017-01-08 10:54:05 -05:00
|
|
|
if !p.IsNode() {
|
2018-01-15 14:40:39 -05:00
|
|
|
return nil, fmt.Errorf("Paginators not supported for pages of type %q (%q)", p.Kind, p.title)
|
2016-10-31 05:23:01 -04:00
|
|
|
}
|
2015-03-31 13:12:54 -04:00
|
|
|
|
2017-02-04 22:20:06 -05:00
|
|
|
pagerSize, err := resolvePagerSize(p.s.Cfg, options...)
|
2015-03-31 13:12:54 -04:00
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2014-12-27 08:11:19 -05:00
|
|
|
|
|
|
|
var initError error
|
|
|
|
|
2017-01-08 10:54:05 -05:00
|
|
|
p.paginatorInit.Do(func() {
|
|
|
|
if p.paginator != nil {
|
2014-12-27 08:11:19 -05:00
|
|
|
return
|
|
|
|
}
|
2017-11-12 04:03:56 -05:00
|
|
|
|
|
|
|
pathDescriptor := p.targetPathDescriptor
|
|
|
|
if p.s.owner.IsMultihost() {
|
|
|
|
pathDescriptor.LangPrefix = ""
|
|
|
|
}
|
|
|
|
pagers, err := paginatePages(pathDescriptor, seq, pagerSize)
|
2014-12-27 08:11:19 -05:00
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
initError = err
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(pagers) > 0 {
|
|
|
|
// the rest of the nodes will be created later
|
2017-01-08 10:54:05 -05:00
|
|
|
p.paginator = pagers[0]
|
|
|
|
p.paginator.source = seq
|
|
|
|
p.paginator.options = options
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
if initError != nil {
|
|
|
|
return nil, initError
|
|
|
|
}
|
|
|
|
|
2017-01-08 10:54:05 -05:00
|
|
|
if p.paginator.source == "paginator" {
|
2015-03-31 16:33:24 -04:00
|
|
|
return nil, errors.New("a Paginator was previously built for this Node without filters; look for earlier .Paginator usage")
|
2015-04-21 15:25:42 -04:00
|
|
|
}
|
|
|
|
|
2017-01-08 10:54:05 -05:00
|
|
|
if !reflect.DeepEqual(options, p.paginator.options) || !probablyEqualPageLists(p.paginator.source, seq) {
|
2015-04-21 15:25:42 -04:00
|
|
|
return nil, errors.New("invoked multiple times with different arguments")
|
2015-03-31 16:33:24 -04:00
|
|
|
}
|
|
|
|
|
2017-01-08 10:54:05 -05:00
|
|
|
return p.paginator, nil
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
2017-02-04 22:20:06 -05:00
|
|
|
func resolvePagerSize(cfg config.Provider, options ...interface{}) (int, error) {
|
2015-03-31 13:12:54 -04:00
|
|
|
if len(options) == 0 {
|
2017-02-04 22:20:06 -05:00
|
|
|
return cfg.GetInt("paginate"), nil
|
2015-03-31 13:12:54 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if len(options) > 1 {
|
|
|
|
return -1, errors.New("too many arguments, 'pager size' is currently the only option")
|
|
|
|
}
|
|
|
|
|
|
|
|
pas, err := cast.ToIntE(options[0])
|
|
|
|
|
|
|
|
if err != nil || pas <= 0 {
|
|
|
|
return -1, errors.New(("'pager size' must be a positive integer"))
|
|
|
|
}
|
|
|
|
|
|
|
|
return pas, nil
|
|
|
|
}
|
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
func paginatePages(td targetPathDescriptor, seq interface{}, pagerSize int) (pagers, error) {
|
2014-12-27 08:11:19 -05:00
|
|
|
|
2015-03-31 13:12:54 -04:00
|
|
|
if pagerSize <= 0 {
|
2014-12-27 08:11:19 -05:00
|
|
|
return nil, errors.New("'paginate' configuration setting must be positive to paginate")
|
|
|
|
}
|
2015-03-31 13:12:54 -04:00
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
urlFactory := newPaginationURLFactory(td)
|
2015-07-16 07:17:54 -04:00
|
|
|
|
|
|
|
var paginator *paginator
|
|
|
|
|
|
|
|
if groups, ok := seq.(PagesGroup); ok {
|
|
|
|
paginator, _ = newPaginatorFromPageGroups(groups, pagerSize, urlFactory)
|
|
|
|
} else {
|
|
|
|
pages, err := toPages(seq)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
paginator, _ = newPaginatorFromPages(pages, pagerSize, urlFactory)
|
|
|
|
}
|
|
|
|
|
2015-03-31 16:33:24 -04:00
|
|
|
pagers := paginator.Pagers()
|
|
|
|
|
|
|
|
return pagers, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func toPages(seq interface{}) (Pages, error) {
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 03:00:23 -04:00
|
|
|
if seq == nil {
|
|
|
|
return Pages{}, nil
|
|
|
|
}
|
|
|
|
|
2014-12-27 08:11:19 -05:00
|
|
|
switch seq.(type) {
|
|
|
|
case Pages:
|
2015-03-31 16:33:24 -04:00
|
|
|
return seq.(Pages), nil
|
2014-12-27 08:11:19 -05:00
|
|
|
case *Pages:
|
2015-03-31 16:33:24 -04:00
|
|
|
return *(seq.(*Pages)), nil
|
2014-12-27 08:11:19 -05:00
|
|
|
case WeightedPages:
|
2015-03-31 16:33:24 -04:00
|
|
|
return (seq.(WeightedPages)).Pages(), nil
|
2014-12-27 08:11:19 -05:00
|
|
|
case PageGroup:
|
2015-03-31 16:33:24 -04:00
|
|
|
return (seq.(PageGroup)).Pages, nil
|
2014-12-27 08:11:19 -05:00
|
|
|
default:
|
2015-04-21 15:13:28 -04:00
|
|
|
return nil, fmt.Errorf("unsupported type in paginate, got %T", seq)
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
2015-03-31 16:33:24 -04:00
|
|
|
}
|
2014-12-27 08:11:19 -05:00
|
|
|
|
2015-03-31 16:33:24 -04:00
|
|
|
// probablyEqual checks page lists for probable equality.
|
|
|
|
// It may return false positives.
|
|
|
|
// The motivation behind this is to avoid potential costly reflect.DeepEqual
|
|
|
|
// when "probably" is good enough.
|
|
|
|
func probablyEqualPageLists(a1 interface{}, a2 interface{}) bool {
|
2014-12-27 08:11:19 -05:00
|
|
|
|
2015-03-31 16:33:24 -04:00
|
|
|
if a1 == nil || a2 == nil {
|
|
|
|
return a1 == a2
|
|
|
|
}
|
|
|
|
|
2015-07-16 07:17:54 -04:00
|
|
|
t1 := reflect.TypeOf(a1)
|
|
|
|
t2 := reflect.TypeOf(a2)
|
|
|
|
|
|
|
|
if t1 != t2 {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
if g1, ok := a1.(PagesGroup); ok {
|
|
|
|
g2 := a2.(PagesGroup)
|
|
|
|
if len(g1) != len(g2) {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
if len(g1) == 0 {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
if g1.Len() != g2.Len() {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
return g1[0].Pages[0] == g2[0].Pages[0]
|
|
|
|
}
|
|
|
|
|
2015-03-31 16:33:24 -04:00
|
|
|
p1, err1 := toPages(a1)
|
|
|
|
p2, err2 := toPages(a2)
|
|
|
|
|
|
|
|
// probably the same wrong type
|
|
|
|
if err1 != nil && err2 != nil {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(p1) != len(p2) {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(p1) == 0 {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
return p1[0] == p2[0]
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
2015-07-16 07:17:54 -04:00
|
|
|
func newPaginatorFromPages(pages Pages, size int, urlFactory paginationURLFactory) (*paginator, error) {
|
2014-12-27 08:11:19 -05:00
|
|
|
|
|
|
|
if size <= 0 {
|
2015-01-26 19:27:07 -05:00
|
|
|
return nil, errors.New("Paginator size must be positive")
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
split := splitPages(pages, size)
|
|
|
|
|
2015-07-16 07:17:54 -04:00
|
|
|
return newPaginator(split, len(pages), size, urlFactory)
|
|
|
|
}
|
|
|
|
|
|
|
|
func newPaginatorFromPageGroups(pageGroups PagesGroup, size int, urlFactory paginationURLFactory) (*paginator, error) {
|
|
|
|
|
|
|
|
if size <= 0 {
|
|
|
|
return nil, errors.New("Paginator size must be positive")
|
|
|
|
}
|
|
|
|
|
|
|
|
split := splitPageGroups(pageGroups, size)
|
|
|
|
|
|
|
|
return newPaginator(split, pageGroups.Len(), size, urlFactory)
|
|
|
|
}
|
|
|
|
|
|
|
|
func newPaginator(elements []paginatedElement, total, size int, urlFactory paginationURLFactory) (*paginator, error) {
|
|
|
|
p := &paginator{total: total, paginatedElements: elements, size: size, paginationURLFactory: urlFactory}
|
2014-12-27 08:11:19 -05:00
|
|
|
|
2015-03-05 18:30:51 -05:00
|
|
|
var ps pagers
|
|
|
|
|
2015-07-16 07:17:54 -04:00
|
|
|
if len(elements) > 0 {
|
|
|
|
ps = make(pagers, len(elements))
|
|
|
|
for i := range p.paginatedElements {
|
2015-04-21 15:25:42 -04:00
|
|
|
ps[i] = &Pager{number: (i + 1), paginator: p}
|
2015-03-05 18:30:51 -05:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ps = make(pagers, 1)
|
2015-04-21 15:25:42 -04:00
|
|
|
ps[0] = &Pager{number: 1, paginator: p}
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
2015-03-05 18:30:51 -05:00
|
|
|
p.pagers = ps
|
2014-12-27 08:11:19 -05:00
|
|
|
|
2015-01-26 19:27:07 -05:00
|
|
|
return p, nil
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
func newPaginationURLFactory(d targetPathDescriptor) paginationURLFactory {
|
2017-01-08 10:54:05 -05:00
|
|
|
|
2014-12-27 08:11:19 -05:00
|
|
|
return func(page int) string {
|
2017-03-09 13:19:29 -05:00
|
|
|
pathDescriptor := d
|
2014-12-27 08:11:19 -05:00
|
|
|
var rel string
|
2017-03-09 13:19:29 -05:00
|
|
|
if page > 1 {
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 09:01:25 -05:00
|
|
|
rel = fmt.Sprintf("/%s/%d/", d.PathSpec.PaginatePath, page)
|
2017-03-09 13:19:29 -05:00
|
|
|
pathDescriptor.Addends = rel
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
targetPath := createTargetPath(pathDescriptor)
|
|
|
|
targetPath = strings.TrimSuffix(targetPath, d.Type.BaseFilename())
|
|
|
|
link := d.PathSpec.PrependBasePath(targetPath)
|
|
|
|
// Note: The targetPath is massaged with MakePathSanitized
|
|
|
|
return d.PathSpec.URLizeFilename(link)
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
}
|