2019-01-02 06:33:26 -05:00
|
|
|
// Copyright 2019 The Hugo Authors. All rights reserved.
|
2014-02-27 18:32:09 -05:00
|
|
|
//
|
2015-11-23 22:16:36 -05:00
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
2014-02-27 18:32:09 -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-02-27 18:32:09 -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 helpers
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
2014-10-16 20:20:09 -04:00
|
|
|
"crypto/md5"
|
|
|
|
"encoding/hex"
|
2014-05-15 15:07:46 -04:00
|
|
|
"fmt"
|
2014-10-16 20:20:09 -04:00
|
|
|
"io"
|
2014-05-15 15:07:46 -04:00
|
|
|
"net"
|
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
|
|
|
"os"
|
2014-12-07 13:48:00 -05:00
|
|
|
"path/filepath"
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
"sort"
|
2019-12-02 15:10:27 -05:00
|
|
|
"strconv"
|
2014-02-27 18:32:09 -05:00
|
|
|
"strings"
|
2015-03-12 11:10:14 -04:00
|
|
|
"sync"
|
2015-05-28 17:05:13 -04:00
|
|
|
"unicode"
|
|
|
|
"unicode/utf8"
|
2015-01-30 09:17:50 -05:00
|
|
|
|
2019-12-02 15:10:27 -05:00
|
|
|
"github.com/mitchellh/hashstructure"
|
|
|
|
|
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
|
|
|
"github.com/gohugoio/hugo/hugofs"
|
|
|
|
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
"github.com/gohugoio/hugo/common/hugo"
|
|
|
|
|
2017-12-27 13:31:42 -05:00
|
|
|
"github.com/spf13/afero"
|
|
|
|
|
2017-07-30 11:46:04 -04:00
|
|
|
"github.com/jdkato/prose/transform"
|
|
|
|
|
2017-06-13 12:42:45 -04:00
|
|
|
bp "github.com/gohugoio/hugo/bufferpool"
|
2015-01-30 09:17:50 -05:00
|
|
|
jww "github.com/spf13/jwalterweatherman"
|
2015-09-09 01:05:11 -04:00
|
|
|
"github.com/spf13/pflag"
|
2014-02-27 18:32:09 -05:00
|
|
|
)
|
|
|
|
|
2016-03-22 18:53:19 -04:00
|
|
|
// FilePathSeparator as defined by os.Separator.
|
2014-12-07 13:48:00 -05:00
|
|
|
const FilePathSeparator = string(filepath.Separator)
|
|
|
|
|
2015-03-06 18:02:06 -05:00
|
|
|
// FindAvailablePort returns an available and valid TCP port.
|
2014-05-15 15:07:46 -04:00
|
|
|
func FindAvailablePort() (*net.TCPAddr, error) {
|
|
|
|
l, err := net.Listen("tcp", ":0")
|
|
|
|
if err == nil {
|
|
|
|
defer l.Close()
|
|
|
|
addr := l.Addr()
|
|
|
|
if a, ok := addr.(*net.TCPAddr); ok {
|
|
|
|
return a, nil
|
|
|
|
}
|
2019-03-24 05:11:16 -04:00
|
|
|
return nil, fmt.Errorf("unable to obtain a valid tcp port: %v", addr)
|
2014-05-15 15:07:46 -04:00
|
|
|
}
|
|
|
|
return nil, err
|
|
|
|
}
|
2014-10-16 20:20:09 -04:00
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// InStringArray checks if a string is an element of a slice of strings
|
|
|
|
// and returns a boolean value.
|
2014-10-20 20:15:33 -04:00
|
|
|
func InStringArray(arr []string, el string) bool {
|
|
|
|
for _, v := range arr {
|
|
|
|
if v == el {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2015-05-28 17:05:13 -04:00
|
|
|
// FirstUpper returns a string with the first character as upper case.
|
|
|
|
func FirstUpper(s string) string {
|
|
|
|
if s == "" {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
r, n := utf8.DecodeRuneInString(s)
|
|
|
|
return string(unicode.ToUpper(r)) + s[n:]
|
|
|
|
}
|
|
|
|
|
2015-11-23 10:32:06 -05:00
|
|
|
// UniqueStrings returns a new slice with any duplicates removed.
|
|
|
|
func UniqueStrings(s []string) []string {
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
unique := make([]string, 0, len(s))
|
2015-11-23 10:32:06 -05:00
|
|
|
set := map[string]interface{}{}
|
|
|
|
for _, val := range s {
|
|
|
|
if _, ok := set[val]; !ok {
|
|
|
|
unique = append(unique, val)
|
|
|
|
set[val] = val
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return unique
|
|
|
|
}
|
|
|
|
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
// UniqueStringsReuse returns a slice with any duplicates removed.
|
|
|
|
// It will modify the input slice.
|
|
|
|
func UniqueStringsReuse(s []string) []string {
|
|
|
|
set := map[string]interface{}{}
|
|
|
|
result := s[:0]
|
|
|
|
for _, val := range s {
|
|
|
|
if _, ok := set[val]; !ok {
|
|
|
|
result = append(result, val)
|
|
|
|
set[val] = val
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result
|
|
|
|
}
|
|
|
|
|
|
|
|
// UniqueStringsReuse returns a sorted slice with any duplicates removed.
|
|
|
|
// It will modify the input slice.
|
|
|
|
func UniqueStringsSorted(s []string) []string {
|
|
|
|
if len(s) == 0 {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
ss := sort.StringSlice(s)
|
|
|
|
ss.Sort()
|
|
|
|
i := 0
|
|
|
|
for j := 1; j < len(s); j++ {
|
|
|
|
if !ss.Less(i, j) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
i++
|
|
|
|
s[i] = s[j]
|
|
|
|
}
|
|
|
|
|
|
|
|
return s[:i+1]
|
|
|
|
}
|
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// ReaderToBytes takes an io.Reader argument, reads from it
|
|
|
|
// and returns bytes.
|
2014-10-16 20:20:09 -04:00
|
|
|
func ReaderToBytes(lines io.Reader) []byte {
|
2015-03-12 15:50:44 -04:00
|
|
|
if lines == nil {
|
|
|
|
return []byte{}
|
|
|
|
}
|
2015-01-30 14:12:07 -05:00
|
|
|
b := bp.GetBuffer()
|
|
|
|
defer bp.PutBuffer(b)
|
|
|
|
|
2014-10-16 20:20:09 -04:00
|
|
|
b.ReadFrom(lines)
|
2015-01-30 14:12:07 -05:00
|
|
|
|
2019-03-24 05:11:16 -04:00
|
|
|
bc := make([]byte, b.Len())
|
2015-01-30 14:12:07 -05:00
|
|
|
copy(bc, b.Bytes())
|
|
|
|
return bc
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// ReaderToString is the same as ReaderToBytes, but returns a string.
|
2014-11-04 00:26:56 -05:00
|
|
|
func ReaderToString(lines io.Reader) string {
|
2015-03-12 15:50:44 -04:00
|
|
|
if lines == nil {
|
|
|
|
return ""
|
|
|
|
}
|
2015-01-30 14:12:07 -05:00
|
|
|
b := bp.GetBuffer()
|
|
|
|
defer bp.PutBuffer(b)
|
2014-11-04 00:26:56 -05:00
|
|
|
b.ReadFrom(lines)
|
|
|
|
return b.String()
|
|
|
|
}
|
|
|
|
|
2015-03-29 15:12:13 -04:00
|
|
|
// ReaderContains reports whether subslice is within r.
|
|
|
|
func ReaderContains(r io.Reader, subslice []byte) bool {
|
|
|
|
|
2015-03-29 19:22:08 -04:00
|
|
|
if r == nil || len(subslice) == 0 {
|
2015-03-29 15:12:13 -04:00
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
bufflen := len(subslice) * 4
|
|
|
|
halflen := bufflen / 2
|
|
|
|
buff := make([]byte, bufflen)
|
|
|
|
var err error
|
|
|
|
var n, i int
|
|
|
|
|
|
|
|
for {
|
|
|
|
i++
|
|
|
|
if i == 1 {
|
|
|
|
n, err = io.ReadAtLeast(r, buff[:halflen], halflen)
|
|
|
|
} else {
|
|
|
|
if i != 2 {
|
|
|
|
// shift left to catch overlapping matches
|
|
|
|
copy(buff[:], buff[halflen:])
|
|
|
|
}
|
|
|
|
n, err = io.ReadAtLeast(r, buff[halflen:], halflen)
|
|
|
|
}
|
|
|
|
|
|
|
|
if n > 0 && bytes.Contains(buff, subslice) {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2017-07-30 11:46:04 -04:00
|
|
|
// GetTitleFunc returns a func that can be used to transform a string to
|
|
|
|
// title case.
|
|
|
|
//
|
|
|
|
// The supported styles are
|
|
|
|
//
|
|
|
|
// - "Go" (strings.Title)
|
|
|
|
// - "AP" (see https://www.apstylebook.com/)
|
|
|
|
// - "Chicago" (see http://www.chicagomanualofstyle.org/home.html)
|
|
|
|
//
|
|
|
|
// If an unknown or empty style is provided, AP style is what you get.
|
|
|
|
func GetTitleFunc(style string) func(s string) string {
|
|
|
|
switch strings.ToLower(style) {
|
|
|
|
case "go":
|
|
|
|
return strings.Title
|
|
|
|
case "chicago":
|
|
|
|
tc := transform.NewTitleConverter(transform.ChicagoStyle)
|
|
|
|
return tc.Title
|
|
|
|
default:
|
|
|
|
tc := transform.NewTitleConverter(transform.APStyle)
|
|
|
|
return tc.Title
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-02 14:14:06 -04:00
|
|
|
// HasStringsPrefix tests whether the string slice s begins with prefix slice s.
|
|
|
|
func HasStringsPrefix(s, prefix []string) bool {
|
|
|
|
return len(s) >= len(prefix) && compareStringSlices(s[0:len(prefix)], prefix)
|
|
|
|
}
|
|
|
|
|
|
|
|
// HasStringsSuffix tests whether the string slice s ends with suffix slice s.
|
|
|
|
func HasStringsSuffix(s, suffix []string) bool {
|
|
|
|
return len(s) >= len(suffix) && compareStringSlices(s[len(s)-len(suffix):], suffix)
|
|
|
|
}
|
|
|
|
|
|
|
|
func compareStringSlices(a, b []string) bool {
|
|
|
|
if a == nil && b == nil {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
if a == nil || b == nil {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(a) != len(b) {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
for i := range a {
|
|
|
|
if a[i] != b[i] {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
2018-05-23 04:03:11 -04:00
|
|
|
// LogPrinter is the common interface of the JWWs loggers.
|
|
|
|
type LogPrinter interface {
|
2016-01-28 09:31:25 -05:00
|
|
|
// Println is the only common method that works in all of JWWs loggers.
|
2016-01-28 08:00:03 -05:00
|
|
|
Println(a ...interface{})
|
|
|
|
}
|
|
|
|
|
|
|
|
// DistinctLogger ignores duplicate log statements.
|
|
|
|
type DistinctLogger struct {
|
2015-03-12 11:10:14 -04:00
|
|
|
sync.RWMutex
|
2019-11-25 14:04:49 -05:00
|
|
|
getLogger func() LogPrinter
|
|
|
|
m map[string]bool
|
2015-03-31 16:33:24 -04:00
|
|
|
}
|
2015-03-12 11:10:14 -04:00
|
|
|
|
2019-10-10 08:14:55 -04:00
|
|
|
func (l *DistinctLogger) Reset() {
|
|
|
|
l.Lock()
|
|
|
|
defer l.Unlock()
|
|
|
|
|
|
|
|
l.m = make(map[string]bool)
|
|
|
|
}
|
|
|
|
|
2016-01-28 09:31:25 -05:00
|
|
|
// Println will log the string returned from fmt.Sprintln given the arguments,
|
|
|
|
// but not if it has been logged before.
|
|
|
|
func (l *DistinctLogger) Println(v ...interface{}) {
|
|
|
|
// fmt.Sprint doesn't add space between string arguments
|
|
|
|
logStatement := strings.TrimSpace(fmt.Sprintln(v...))
|
|
|
|
l.print(logStatement)
|
|
|
|
}
|
|
|
|
|
2016-01-28 08:00:03 -05:00
|
|
|
// Printf will log the string returned from fmt.Sprintf given the arguments,
|
2015-04-03 16:29:57 -04:00
|
|
|
// but not if it has been logged before.
|
2016-01-28 09:31:25 -05:00
|
|
|
// Note: A newline is appended.
|
2016-01-28 08:00:03 -05:00
|
|
|
func (l *DistinctLogger) Printf(format string, v ...interface{}) {
|
2015-03-31 16:33:24 -04:00
|
|
|
logStatement := fmt.Sprintf(format, v...)
|
2016-01-28 09:31:25 -05:00
|
|
|
l.print(logStatement)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (l *DistinctLogger) print(logStatement string) {
|
2015-03-31 16:33:24 -04:00
|
|
|
l.RLock()
|
2015-04-03 15:16:36 -04:00
|
|
|
if l.m[logStatement] {
|
|
|
|
l.RUnlock()
|
2015-03-12 11:10:14 -04:00
|
|
|
return
|
|
|
|
}
|
2015-04-03 15:16:36 -04:00
|
|
|
l.RUnlock()
|
|
|
|
|
2015-03-31 16:33:24 -04:00
|
|
|
l.Lock()
|
|
|
|
if !l.m[logStatement] {
|
2019-11-25 14:04:49 -05:00
|
|
|
l.getLogger().Println(logStatement)
|
2015-03-31 16:33:24 -04:00
|
|
|
l.m[logStatement] = true
|
2015-03-12 13:51:31 -04:00
|
|
|
}
|
2015-03-31 16:33:24 -04:00
|
|
|
l.Unlock()
|
|
|
|
}
|
|
|
|
|
2016-01-28 08:00:03 -05:00
|
|
|
// NewDistinctErrorLogger creates a new DistinctLogger that logs ERRORs
|
|
|
|
func NewDistinctErrorLogger() *DistinctLogger {
|
2019-11-25 14:04:49 -05:00
|
|
|
return &DistinctLogger{m: make(map[string]bool), getLogger: func() LogPrinter { return jww.ERROR }}
|
2015-03-31 16:33:24 -04:00
|
|
|
}
|
|
|
|
|
2018-05-23 04:03:11 -04:00
|
|
|
// NewDistinctLogger creates a new DistinctLogger that logs to the provided logger.
|
|
|
|
func NewDistinctLogger(logger LogPrinter) *DistinctLogger {
|
2019-11-25 14:04:49 -05:00
|
|
|
return &DistinctLogger{m: make(map[string]bool), getLogger: func() LogPrinter { return logger }}
|
2018-05-23 04:03:11 -04:00
|
|
|
}
|
|
|
|
|
2017-03-29 02:08:45 -04:00
|
|
|
// NewDistinctWarnLogger creates a new DistinctLogger that logs WARNs
|
|
|
|
func NewDistinctWarnLogger() *DistinctLogger {
|
2019-11-25 14:04:49 -05:00
|
|
|
return &DistinctLogger{m: make(map[string]bool), getLogger: func() LogPrinter { return jww.WARN }}
|
2017-03-29 02:08:45 -04:00
|
|
|
}
|
|
|
|
|
2016-03-22 18:53:19 -04:00
|
|
|
// NewDistinctFeedbackLogger creates a new DistinctLogger that can be used
|
2016-01-28 09:31:25 -05:00
|
|
|
// to give feedback to the user while not spamming with duplicates.
|
|
|
|
func NewDistinctFeedbackLogger() *DistinctLogger {
|
2019-11-25 14:04:49 -05:00
|
|
|
return &DistinctLogger{m: make(map[string]bool), getLogger: func() LogPrinter { return jww.FEEDBACK }}
|
2016-01-28 09:31:25 -05:00
|
|
|
}
|
|
|
|
|
2016-11-23 11:26:13 -05:00
|
|
|
var (
|
|
|
|
// DistinctErrorLog can be used to avoid spamming the logs with errors.
|
|
|
|
DistinctErrorLog = NewDistinctErrorLogger()
|
|
|
|
|
2017-03-29 02:08:45 -04:00
|
|
|
// DistinctWarnLog can be used to avoid spamming the logs with warnings.
|
|
|
|
DistinctWarnLog = NewDistinctWarnLogger()
|
|
|
|
|
2016-11-23 11:26:13 -05:00
|
|
|
// DistinctFeedbackLog can be used to avoid spamming the logs with info messages.
|
|
|
|
DistinctFeedbackLog = NewDistinctFeedbackLogger()
|
|
|
|
)
|
2015-03-31 16:33:24 -04:00
|
|
|
|
2019-10-10 08:14:55 -04:00
|
|
|
// InitLoggers resets the global distinct loggers.
|
2016-09-08 10:04:04 -04:00
|
|
|
func InitLoggers() {
|
2019-10-10 08:14:55 -04:00
|
|
|
DistinctErrorLog.Reset()
|
|
|
|
DistinctWarnLog.Reset()
|
|
|
|
DistinctFeedbackLog.Reset()
|
2016-09-08 10:04:04 -04:00
|
|
|
}
|
|
|
|
|
2016-11-23 11:26:13 -05:00
|
|
|
// Deprecated informs about a deprecation, but only once for a given set of arguments' values.
|
|
|
|
// If the err flag is enabled, it logs as an ERROR (will exit with -1) and the text will
|
|
|
|
// point at the next Hugo release.
|
|
|
|
// The idea is two remove an item in two Hugo releases to give users and theme authors
|
|
|
|
// plenty of time to fix their templates.
|
2019-11-25 14:04:49 -05:00
|
|
|
func Deprecated(item, alternative string, err bool) {
|
2016-11-23 11:26:13 -05:00
|
|
|
if err {
|
2019-11-25 14:04:49 -05:00
|
|
|
DistinctErrorLog.Printf("%s is deprecated and will be removed in Hugo %s. %s", item, hugo.CurrentVersion.Next().ReleaseVersion(), alternative)
|
2016-11-23 11:26:13 -05:00
|
|
|
|
|
|
|
} else {
|
2019-11-25 14:04:49 -05:00
|
|
|
DistinctWarnLog.Printf("%s is deprecated and will be removed in a future release. %s", item, alternative)
|
2016-11-23 11:26:13 -05:00
|
|
|
}
|
2015-03-12 11:10:14 -04:00
|
|
|
}
|
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// SliceToLower goes through the source slice and lowers all values.
|
2014-10-16 20:20:09 -04:00
|
|
|
func SliceToLower(s []string) []string {
|
|
|
|
if s == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
l := make([]string, len(s))
|
|
|
|
for i, v := range s {
|
|
|
|
l[i] = strings.ToLower(v)
|
|
|
|
}
|
|
|
|
|
|
|
|
return l
|
|
|
|
}
|
|
|
|
|
: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
|
|
|
// MD5String takes a string and returns its MD5 hash.
|
|
|
|
func MD5String(f string) string {
|
2014-10-16 20:20:09 -04:00
|
|
|
h := md5.New()
|
|
|
|
h.Write([]byte(f))
|
|
|
|
return hex.EncodeToString(h.Sum([]byte{}))
|
|
|
|
}
|
2014-12-26 15:18:26 -05:00
|
|
|
|
2017-12-27 13:31:42 -05:00
|
|
|
// MD5FromFileFast creates a MD5 hash from the given file. It only reads parts of
|
|
|
|
// the file for speed, so don't use it if the files are very subtly different.
|
|
|
|
// It will not close the file.
|
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
|
|
|
func MD5FromFileFast(r io.ReadSeeker) (string, error) {
|
2017-12-27 13:31:42 -05:00
|
|
|
const (
|
|
|
|
// Do not change once set in stone!
|
|
|
|
maxChunks = 8
|
|
|
|
peekSize = 64
|
|
|
|
seek = 2048
|
|
|
|
)
|
|
|
|
|
|
|
|
h := md5.New()
|
|
|
|
buff := make([]byte, peekSize)
|
|
|
|
|
|
|
|
for i := 0; i < maxChunks; i++ {
|
|
|
|
if i > 0 {
|
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
|
|
|
_, err := r.Seek(seek, 0)
|
2017-12-27 13:31:42 -05:00
|
|
|
if err != nil {
|
|
|
|
if err == io.EOF {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
_, err := io.ReadAtLeast(r, buff, peekSize)
|
2017-12-27 13:31:42 -05:00
|
|
|
if err != nil {
|
|
|
|
if err == io.EOF || err == io.ErrUnexpectedEOF {
|
|
|
|
h.Write(buff)
|
|
|
|
break
|
|
|
|
}
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
h.Write(buff)
|
|
|
|
}
|
|
|
|
|
|
|
|
return hex.EncodeToString(h.Sum(nil)), nil
|
|
|
|
}
|
|
|
|
|
2018-12-21 10:21:13 -05:00
|
|
|
// MD5FromReader creates a MD5 hash from the given reader.
|
|
|
|
func MD5FromReader(r io.Reader) (string, error) {
|
2017-12-27 13:31:42 -05:00
|
|
|
h := md5.New()
|
2018-12-21 10:21:13 -05:00
|
|
|
if _, err := io.Copy(h, r); err != nil {
|
2017-12-27 13:31:42 -05:00
|
|
|
return "", nil
|
|
|
|
}
|
|
|
|
return hex.EncodeToString(h.Sum(nil)), nil
|
|
|
|
}
|
|
|
|
|
2015-07-12 05:05:37 -04:00
|
|
|
// IsWhitespace determines if the given rune is whitespace.
|
|
|
|
func IsWhitespace(r rune) bool {
|
|
|
|
return r == ' ' || r == '\t' || r == '\n' || r == '\r'
|
|
|
|
}
|
|
|
|
|
2015-10-06 18:58:58 -04:00
|
|
|
// NormalizeHugoFlags facilitates transitions of Hugo command-line flags,
|
2015-09-09 01:05:11 -04:00
|
|
|
// e.g. --baseUrl to --baseURL, --uglyUrls to --uglyURLs
|
2015-10-02 00:47:34 -04:00
|
|
|
func NormalizeHugoFlags(f *pflag.FlagSet, name string) pflag.NormalizedName {
|
2015-09-09 01:05:11 -04:00
|
|
|
switch name {
|
|
|
|
case "baseUrl":
|
|
|
|
name = "baseURL"
|
|
|
|
case "uglyUrls":
|
|
|
|
name = "uglyURLs"
|
|
|
|
}
|
|
|
|
return pflag.NormalizedName(name)
|
|
|
|
}
|
2016-08-04 04:36:44 -04:00
|
|
|
|
|
|
|
// DiffStringSlices returns the difference between two string slices.
|
|
|
|
// Useful in tests.
|
|
|
|
// See:
|
|
|
|
// http://stackoverflow.com/questions/19374219/how-to-find-the-difference-between-two-slices-of-strings-in-golang
|
|
|
|
func DiffStringSlices(slice1 []string, slice2 []string) []string {
|
|
|
|
diffStr := []string{}
|
|
|
|
m := map[string]int{}
|
|
|
|
|
|
|
|
for _, s1Val := range slice1 {
|
|
|
|
m[s1Val] = 1
|
|
|
|
}
|
|
|
|
for _, s2Val := range slice2 {
|
|
|
|
m[s2Val] = m[s2Val] + 1
|
|
|
|
}
|
|
|
|
|
|
|
|
for mKey, mVal := range m {
|
|
|
|
if mVal == 1 {
|
|
|
|
diffStr = append(diffStr, mKey)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return diffStr
|
|
|
|
}
|
2018-02-09 03:21:46 -05:00
|
|
|
|
2018-09-06 14:34:29 -04:00
|
|
|
// DiffStrings splits the strings into fields and runs it into DiffStringSlices.
|
2018-02-09 03:21:46 -05:00
|
|
|
// Useful for tests.
|
|
|
|
func DiffStrings(s1, s2 string) []string {
|
|
|
|
return DiffStringSlices(strings.Fields(s1), strings.Fields(s2))
|
|
|
|
}
|
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
|
|
|
|
|
|
|
// PrintFs prints the given filesystem to the given writer starting from the given path.
|
|
|
|
// This is useful for debugging.
|
|
|
|
func PrintFs(fs afero.Fs, path string, w io.Writer) {
|
|
|
|
if fs == nil {
|
|
|
|
return
|
|
|
|
}
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
|
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
|
|
|
afero.Walk(fs, path, func(path string, info os.FileInfo, err error) error {
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
var filename string
|
|
|
|
var meta interface{}
|
|
|
|
if fim, ok := info.(hugofs.FileMetaInfo); ok {
|
|
|
|
filename = fim.Meta().Filename()
|
|
|
|
meta = fim.Meta()
|
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
|
|
|
}
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
fmt.Fprintf(w, " %q %q\t\t%v\n", path, filename, meta)
|
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
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
2019-12-02 15:10:27 -05:00
|
|
|
|
|
|
|
// HashString returns a hash from the given elements.
|
|
|
|
// It will panic if the hash cannot be calculated.
|
|
|
|
func HashString(elements ...interface{}) string {
|
|
|
|
var o interface{}
|
|
|
|
if len(elements) == 1 {
|
|
|
|
o = elements[0]
|
|
|
|
} else {
|
|
|
|
o = elements
|
|
|
|
}
|
|
|
|
|
|
|
|
hash, err := hashstructure.Hash(o, nil)
|
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
|
|
|
return strconv.FormatUint(hash, 10)
|
|
|
|
}
|