2015-12-07 13:57:01 -05:00
|
|
|
// Copyright 2015 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 (
|
2014-09-10 06:21:22 -04:00
|
|
|
"errors"
|
2014-04-05 01:26:43 -04:00
|
|
|
"fmt"
|
2014-05-01 13:13:11 -04:00
|
|
|
"io"
|
2014-02-27 18:32:09 -05:00
|
|
|
"os"
|
2014-04-05 01:26:43 -04:00
|
|
|
"path/filepath"
|
2014-02-27 18:32:09 -05:00
|
|
|
"regexp"
|
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
|
|
|
"sort"
|
2014-02-27 18:32:09 -05:00
|
|
|
"strings"
|
|
|
|
"unicode"
|
2015-12-08 16:41:36 -05:00
|
|
|
|
2018-08-13 05:01:57 -04:00
|
|
|
"github.com/gohugoio/hugo/common/hugio"
|
2015-12-08 16:41:36 -05:00
|
|
|
"github.com/spf13/afero"
|
|
|
|
"golang.org/x/text/transform"
|
|
|
|
"golang.org/x/text/unicode/norm"
|
2014-02-27 18:32:09 -05:00
|
|
|
)
|
|
|
|
|
2016-12-22 23:44:35 -05:00
|
|
|
var (
|
|
|
|
// ErrThemeUndefined is returned when a theme has not be defined by the user.
|
|
|
|
ErrThemeUndefined = errors.New("no theme set")
|
|
|
|
)
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
// filepathPathBridge is a bridge for common functionality in filepath vs path
|
|
|
|
type filepathPathBridge interface {
|
2015-01-27 05:44:41 -05:00
|
|
|
Base(in string) string
|
|
|
|
Clean(in string) string
|
|
|
|
Dir(in string) string
|
|
|
|
Ext(in string) string
|
|
|
|
Join(elem ...string) string
|
|
|
|
Separator() string
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
type filepathBridge struct {
|
2015-01-27 05:44:41 -05:00
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
func (filepathBridge) Base(in string) string {
|
2015-01-27 05:44:41 -05:00
|
|
|
return filepath.Base(in)
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
func (filepathBridge) Clean(in string) string {
|
2015-01-27 05:44:41 -05:00
|
|
|
return filepath.Clean(in)
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
func (filepathBridge) Dir(in string) string {
|
2015-01-27 05:44:41 -05:00
|
|
|
return filepath.Dir(in)
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
func (filepathBridge) Ext(in string) string {
|
2015-01-27 05:44:41 -05:00
|
|
|
return filepath.Ext(in)
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
func (filepathBridge) Join(elem ...string) string {
|
2015-01-27 05:44:41 -05:00
|
|
|
return filepath.Join(elem...)
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
func (filepathBridge) Separator() string {
|
2015-01-27 05:44:41 -05:00
|
|
|
return FilePathSeparator
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
var fpb filepathBridge
|
2014-02-27 18:32:09 -05:00
|
|
|
|
2018-08-22 01:18:37 -04:00
|
|
|
// segmentReplacer replaces some URI-reserved characters in a path segments.
|
|
|
|
var segmentReplacer = strings.NewReplacer("/", "-", "#", "-")
|
|
|
|
|
|
|
|
// MakeSegment returns a copy of string s that is appropriate for a path
|
|
|
|
// segment. MakeSegment is similar to MakePath but disallows the '/' and
|
|
|
|
// '#' characters because of their reserved meaning in URIs.
|
|
|
|
func (p *PathSpec) MakeSegment(s string) string {
|
|
|
|
s = p.MakePathSanitized(strings.Trim(segmentReplacer.Replace(s), "- "))
|
|
|
|
|
|
|
|
var pos int
|
|
|
|
var last byte
|
|
|
|
b := make([]byte, len(s))
|
|
|
|
|
|
|
|
for i := 0; i < len(s); i++ {
|
|
|
|
// consolidate dashes
|
|
|
|
if s[i] == '-' && last == '-' {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
b[pos], last = s[i], s[i]
|
|
|
|
pos++
|
|
|
|
}
|
|
|
|
|
|
|
|
if p.DisablePathToLower {
|
|
|
|
return string(b[:pos])
|
|
|
|
}
|
|
|
|
return strings.ToLower(string(b[:pos]))
|
|
|
|
}
|
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// MakePath takes a string with any characters and replace it
|
|
|
|
// so the string could be used in a path.
|
|
|
|
// It does so by creating a Unicode-sanitized string, with the spaces replaced,
|
|
|
|
// whilst preserving the original casing of the string.
|
2014-08-21 19:01:34 -04:00
|
|
|
// E.g. Social Media -> Social-Media
|
2016-10-24 07:45:30 -04:00
|
|
|
func (p *PathSpec) MakePath(s string) string {
|
|
|
|
return p.UnicodeSanitize(strings.Replace(strings.TrimSpace(s), " ", "-", -1))
|
2014-08-21 19:01:34 -04:00
|
|
|
}
|
|
|
|
|
2015-09-01 08:53:25 -04:00
|
|
|
// MakePathSanitized creates a Unicode-sanitized string, with the spaces replaced
|
2016-10-24 07:45:30 -04:00
|
|
|
func (p *PathSpec) MakePathSanitized(s string) string {
|
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
|
|
|
if p.DisablePathToLower {
|
2016-10-24 07:45:30 -04:00
|
|
|
return p.MakePath(s)
|
2015-09-01 08:53:25 -04:00
|
|
|
}
|
2016-10-24 07:45:30 -04:00
|
|
|
return strings.ToLower(p.MakePath(s))
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
|
|
|
|
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
|
|
|
// ToSlashTrimLeading is just a filepath.ToSlaas with an added / prefix trimmer.
|
|
|
|
func ToSlashTrimLeading(s string) string {
|
|
|
|
return strings.TrimPrefix(filepath.ToSlash(s), "/")
|
|
|
|
}
|
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
// MakeTitle converts the path given to a suitable title, trimming whitespace
|
|
|
|
// and replacing hyphens with whitespace.
|
2014-05-02 01:04:14 -04:00
|
|
|
func MakeTitle(inpath string) string {
|
|
|
|
return strings.Replace(strings.TrimSpace(inpath), "-", " ", -1)
|
|
|
|
}
|
|
|
|
|
2016-07-11 04:06:40 -04:00
|
|
|
// From https://golang.org/src/net/url/url.go
|
|
|
|
func ishex(c rune) bool {
|
|
|
|
switch {
|
|
|
|
case '0' <= c && c <= '9':
|
|
|
|
return true
|
|
|
|
case 'a' <= c && c <= 'f':
|
|
|
|
return true
|
|
|
|
case 'A' <= c && c <= 'F':
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
// UnicodeSanitize sanitizes string to be used in Hugo URL's, allowing only
|
|
|
|
// a predefined set of special Unicode characters.
|
|
|
|
// If RemovePathAccents configuration flag is enabled, Uniccode accents
|
|
|
|
// are also removed.
|
2016-10-24 07:45:30 -04:00
|
|
|
func (p *PathSpec) UnicodeSanitize(s string) string {
|
2014-02-27 18:32:09 -05:00
|
|
|
source := []rune(s)
|
|
|
|
target := make([]rune, 0, len(source))
|
|
|
|
|
2016-07-11 04:06:40 -04:00
|
|
|
for i, r := range source {
|
|
|
|
if r == '%' && i+2 < len(source) && ishex(source[i+1]) && ishex(source[i+2]) {
|
|
|
|
target = append(target, r)
|
2017-01-07 13:29:20 -05:00
|
|
|
} else if unicode.IsLetter(r) || unicode.IsDigit(r) || unicode.IsMark(r) || r == '.' || r == '/' || r == '\\' || r == '_' || r == '-' || r == '#' || r == '+' || r == '~' {
|
2014-02-27 18:32:09 -05:00
|
|
|
target = append(target, r)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-16 13:25:48 -04:00
|
|
|
var result string
|
|
|
|
|
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
|
|
|
if p.RemovePathAccents {
|
2015-06-16 13:25:48 -04:00
|
|
|
// remove accents - see https://blog.golang.org/normalization
|
|
|
|
t := transform.Chain(norm.NFD, transform.RemoveFunc(isMn), norm.NFC)
|
|
|
|
result, _, _ = transform.String(t, string(target))
|
|
|
|
} else {
|
|
|
|
result = string(target)
|
|
|
|
}
|
|
|
|
|
2015-05-30 08:46:58 -04:00
|
|
|
return result
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
|
|
|
|
2015-05-30 08:46:58 -04:00
|
|
|
func isMn(r rune) bool {
|
|
|
|
return unicode.Is(unicode.Mn, r) // Mn: nonspacing marks
|
|
|
|
}
|
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// ReplaceExtension takes a path and an extension, strips the old extension
|
|
|
|
// and returns the path with the new extension.
|
2014-02-27 18:32:09 -05:00
|
|
|
func ReplaceExtension(path string, newExt string) string {
|
2015-08-26 15:29:32 -04:00
|
|
|
f, _ := fileAndExt(path, fpb)
|
2014-02-27 18:32:09 -05:00
|
|
|
return f + "." + newExt
|
|
|
|
}
|
|
|
|
|
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
|
|
|
// GetFirstThemeDir gets the root directory of the first theme, if there is one.
|
|
|
|
// If there is no theme, returns the empty string.
|
|
|
|
func (p *PathSpec) GetFirstThemeDir() string {
|
|
|
|
if p.ThemeSet() {
|
|
|
|
return p.AbsPathify(filepath.Join(p.ThemesDir, p.Themes()[0]))
|
2014-04-05 01:26:43 -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
|
|
|
return ""
|
2016-12-14 14:12:03 -05: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
|
|
|
// GetThemesDir gets the absolute root theme dir path.
|
|
|
|
func (p *PathSpec) GetThemesDir() string {
|
2017-02-04 22:20:06 -05:00
|
|
|
if p.ThemeSet() {
|
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 p.AbsPathify(p.ThemesDir)
|
2015-06-19 09:26:32 -04:00
|
|
|
}
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
2016-12-14 14:12:03 -05:00
|
|
|
// GetRelativeThemeDir gets the relative root directory of the current theme, if there is one.
|
|
|
|
// If there is no theme, returns the empty string.
|
2017-02-04 22:20:06 -05:00
|
|
|
func (p *PathSpec) GetRelativeThemeDir() string {
|
|
|
|
if p.ThemeSet() {
|
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 strings.TrimPrefix(filepath.Join(p.ThemesDir, p.Themes()[0]), FilePathSeparator)
|
2016-12-14 14:12:03 -05:00
|
|
|
}
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
func makePathRelative(inPath string, possibleDirectories ...string) (string, error) {
|
2014-09-10 06:21:22 -04:00
|
|
|
|
|
|
|
for _, currentPath := range possibleDirectories {
|
|
|
|
if strings.HasPrefix(inPath, currentPath) {
|
|
|
|
return strings.TrimPrefix(inPath, currentPath), nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return inPath, errors.New("Can't extract relative path, unknown prefix")
|
|
|
|
}
|
|
|
|
|
2015-05-15 18:11:39 -04:00
|
|
|
// Should be good enough for Hugo.
|
2016-11-23 12:54:57 -05:00
|
|
|
var isFileRe = regexp.MustCompile(`.*\..{1,6}$`)
|
2015-05-15 18:11:39 -04:00
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
// GetDottedRelativePath expects a relative path starting after the content directory.
|
|
|
|
// It returns a relative path with dots ("..") navigating up the path structure.
|
2015-05-15 18:11:39 -04:00
|
|
|
func GetDottedRelativePath(inPath string) string {
|
|
|
|
inPath = filepath.Clean(filepath.FromSlash(inPath))
|
2016-03-19 12:17:17 -04:00
|
|
|
|
2015-05-15 18:11:39 -04:00
|
|
|
if inPath == "." {
|
|
|
|
return "./"
|
|
|
|
}
|
2016-03-19 12:17:17 -04:00
|
|
|
|
|
|
|
if !isFileRe.MatchString(inPath) && !strings.HasSuffix(inPath, FilePathSeparator) {
|
|
|
|
inPath += FilePathSeparator
|
2015-05-15 18:11:39 -04:00
|
|
|
}
|
2016-03-19 12:17:17 -04:00
|
|
|
|
2015-05-15 18:11:39 -04:00
|
|
|
if !strings.HasPrefix(inPath, FilePathSeparator) {
|
|
|
|
inPath = FilePathSeparator + inPath
|
|
|
|
}
|
2016-03-19 12:17:17 -04:00
|
|
|
|
2015-05-15 18:11:39 -04:00
|
|
|
dir, _ := filepath.Split(inPath)
|
|
|
|
|
|
|
|
sectionCount := strings.Count(dir, FilePathSeparator)
|
|
|
|
|
|
|
|
if sectionCount == 0 || dir == FilePathSeparator {
|
|
|
|
return "./"
|
|
|
|
}
|
|
|
|
|
|
|
|
var dottedPath string
|
|
|
|
|
|
|
|
for i := 1; i < sectionCount; i++ {
|
|
|
|
dottedPath += "../"
|
|
|
|
}
|
|
|
|
|
|
|
|
return dottedPath
|
|
|
|
}
|
|
|
|
|
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
|
|
|
// ExtNoDelimiter takes a path and returns the extension, excluding the delmiter, i.e. "md".
|
|
|
|
func ExtNoDelimiter(in string) string {
|
|
|
|
return strings.TrimPrefix(Ext(in), ".")
|
|
|
|
}
|
|
|
|
|
2017-06-20 06:46:03 -04:00
|
|
|
// Ext takes a path and returns the extension, including the delmiter, i.e. ".md".
|
|
|
|
func Ext(in string) string {
|
|
|
|
_, ext := fileAndExt(in, fpb)
|
|
|
|
return ext
|
|
|
|
}
|
|
|
|
|
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
|
|
|
// PathAndExt is the same as FileAndExt, but it uses the path package.
|
|
|
|
func PathAndExt(in string) (string, string) {
|
|
|
|
return fileAndExt(in, pb)
|
|
|
|
}
|
|
|
|
|
: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
|
|
|
// FileAndExt takes a path and returns the file and extension separated,
|
|
|
|
// the extension including the delmiter, i.e. ".md".
|
|
|
|
func FileAndExt(in string) (string, string) {
|
|
|
|
return fileAndExt(in, fpb)
|
|
|
|
}
|
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// Filename takes a path, strips out the extension,
|
|
|
|
// and returns the name of the file.
|
2014-05-02 01:04:14 -04:00
|
|
|
func Filename(in string) (name string) {
|
2015-08-26 15:29:32 -04:00
|
|
|
name, _ = fileAndExt(in, fpb)
|
2014-05-02 01:04:14 -04:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2014-09-22 13:40:09 -04:00
|
|
|
// FileAndExt returns the filename and any extension of a file path as
|
|
|
|
// two separate strings.
|
2014-12-26 10:07:03 -05:00
|
|
|
//
|
|
|
|
// If the path, in, contains a directory name ending in a slash,
|
|
|
|
// then both name and ext will be empty strings.
|
|
|
|
//
|
2014-09-22 13:40:09 -04:00
|
|
|
// If the path, in, is either the current directory, the parent
|
2014-12-26 10:07:03 -05:00
|
|
|
// directory or the root directory, or an empty string,
|
|
|
|
// then both name and ext will be empty strings.
|
|
|
|
//
|
|
|
|
// If the path, in, represents the path of a file without an extension,
|
2014-09-22 13:40:09 -04:00
|
|
|
// then name will be the name of the file and ext will be an empty string.
|
2014-12-26 10:07:03 -05:00
|
|
|
//
|
|
|
|
// If the path, in, represents a filename with an extension,
|
2014-09-22 13:40:09 -04:00
|
|
|
// then name will be the filename minus any extension - including the dot
|
|
|
|
// and ext will contain the extension - minus the dot.
|
2015-08-26 15:29:32 -04:00
|
|
|
func fileAndExt(in string, b filepathPathBridge) (name string, ext string) {
|
2015-01-27 05:44:41 -05:00
|
|
|
ext = b.Ext(in)
|
|
|
|
base := b.Base(in)
|
2014-09-22 13:40:09 -04:00
|
|
|
|
2015-01-27 05:44:41 -05:00
|
|
|
return extractFilename(in, ext, base, b.Separator()), ext
|
2014-12-07 13:48:00 -05:00
|
|
|
}
|
|
|
|
|
2015-01-20 14:45:03 -05:00
|
|
|
func extractFilename(in, ext, base, pathSeparator string) (name string) {
|
2014-12-07 13:48:00 -05:00
|
|
|
|
2014-09-22 13:40:09 -04:00
|
|
|
// No file name cases. These are defined as:
|
2014-12-07 13:48:00 -05:00
|
|
|
// 1. any "in" path that ends in a pathSeparator
|
|
|
|
// 2. any "base" consisting of just an pathSeparator
|
2014-09-22 13:40:09 -04:00
|
|
|
// 3. any "base" consisting of just an empty string
|
|
|
|
// 4. any "base" consisting of just the current directory i.e. "."
|
|
|
|
// 5. any "base" consisting of just the parent directory i.e. ".."
|
2014-12-07 13:48:00 -05:00
|
|
|
if (strings.LastIndex(in, pathSeparator) == len(in)-1) || base == "" || base == "." || base == ".." || base == pathSeparator {
|
2014-09-22 13:40:09 -04:00
|
|
|
name = "" // there is NO filename
|
|
|
|
} else if ext != "" { // there was an Extension
|
|
|
|
// return the filename minus the extension (and the ".")
|
2014-02-27 18:32:09 -05:00
|
|
|
name = base[:strings.LastIndex(base, ".")]
|
|
|
|
} else {
|
2014-09-22 13:40:09 -04:00
|
|
|
// no extension case so just return base, which willi
|
|
|
|
// be the filename
|
|
|
|
name = base
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
|
|
|
return
|
2014-12-07 13:48:00 -05:00
|
|
|
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// GetRelativePath returns the relative path of a given path.
|
2014-10-16 20:20:09 -04:00
|
|
|
func GetRelativePath(path, base string) (final string, err error) {
|
|
|
|
if filepath.IsAbs(path) && base == "" {
|
|
|
|
return "", errors.New("source: missing base directory")
|
|
|
|
}
|
|
|
|
name := filepath.Clean(path)
|
|
|
|
base = filepath.Clean(base)
|
|
|
|
|
|
|
|
name, err = filepath.Rel(base, name)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
2015-05-27 14:41:25 -04:00
|
|
|
|
2015-05-28 17:05:13 -04:00
|
|
|
if strings.HasSuffix(filepath.FromSlash(path), FilePathSeparator) && !strings.HasSuffix(name, FilePathSeparator) {
|
|
|
|
name += FilePathSeparator
|
2015-05-27 14:41:25 -04:00
|
|
|
}
|
2014-10-16 20:20:09 -04:00
|
|
|
return name, nil
|
|
|
|
}
|
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
// PathPrep prepares the path using the uglify setting to create paths on
|
|
|
|
// either the form /section/name/index.html or /section/name.html.
|
2014-02-27 18:32:09 -05:00
|
|
|
func PathPrep(ugly bool, in string) string {
|
|
|
|
if ugly {
|
|
|
|
return Uglify(in)
|
|
|
|
}
|
2015-03-06 18:02:06 -05:00
|
|
|
return PrettifyPath(in)
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
// PrettifyPath is the same as PrettifyURLPath but for file paths.
|
2014-12-26 10:07:03 -05:00
|
|
|
// /section/name.html becomes /section/name/index.html
|
|
|
|
// /section/name/ becomes /section/name/index.html
|
|
|
|
// /section/name/index.html becomes /section/name/index.html
|
2014-02-27 18:32:09 -05:00
|
|
|
func PrettifyPath(in string) string {
|
2015-10-15 04:15:26 -04:00
|
|
|
return prettifyPath(in, fpb)
|
2015-01-27 05:44:41 -05:00
|
|
|
}
|
|
|
|
|
2015-10-15 04:15:26 -04:00
|
|
|
func prettifyPath(in string, b filepathPathBridge) string {
|
2014-11-06 12:03:24 -05:00
|
|
|
if filepath.Ext(in) == "" {
|
2014-02-27 18:32:09 -05:00
|
|
|
// /section/name/ -> /section/name/index.html
|
|
|
|
if len(in) < 2 {
|
2015-01-27 05:44:41 -05:00
|
|
|
return b.Separator()
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
2017-05-08 11:56:22 -04:00
|
|
|
return b.Join(in, "index.html")
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
2015-08-26 15:29:32 -04:00
|
|
|
name, ext := fileAndExt(in, b)
|
2015-03-06 18:02:06 -05:00
|
|
|
if name == "index" {
|
|
|
|
// /section/name/index.html -> /section/name/index.html
|
|
|
|
return b.Clean(in)
|
|
|
|
}
|
|
|
|
// /section/name.html -> /section/name/index.html
|
|
|
|
return b.Join(b.Dir(in), name, "index"+ext)
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
2014-04-05 01:26:43 -04:00
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
// ExtractRootPaths extracts the root paths from the supplied list of paths.
|
2015-11-23 10:32:06 -05:00
|
|
|
// The resulting root path will not contain any file separators, but there
|
|
|
|
// may be duplicates.
|
|
|
|
// So "/content/section/" becomes "content"
|
|
|
|
func ExtractRootPaths(paths []string) []string {
|
|
|
|
r := make([]string, len(paths))
|
|
|
|
for i, p := range paths {
|
|
|
|
root := filepath.ToSlash(p)
|
2015-11-23 16:35:54 -05:00
|
|
|
sections := strings.Split(root, "/")
|
|
|
|
for _, section := range sections {
|
|
|
|
if section != "" {
|
|
|
|
root = section
|
|
|
|
break
|
2015-04-02 00:40:29 -04:00
|
|
|
}
|
|
|
|
}
|
2015-11-23 10:32:06 -05:00
|
|
|
r[i] = root
|
2015-04-02 00:40:29 -04:00
|
|
|
}
|
2015-11-23 10:32:06 -05:00
|
|
|
return r
|
2015-04-02 00:40:29 -04:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// FindCWD returns the current working directory from where the Hugo
|
|
|
|
// executable is run.
|
2014-04-05 01:26:43 -04:00
|
|
|
func FindCWD() (string, error) {
|
|
|
|
serverFile, err := filepath.Abs(os.Args[0])
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
return "", fmt.Errorf("Can't get absolute path for executable: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
path := filepath.Dir(serverFile)
|
|
|
|
realFile, err := filepath.EvalSymlinks(serverFile)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
if _, err = os.Stat(serverFile + ".exe"); err == nil {
|
|
|
|
realFile = filepath.Clean(serverFile + ".exe")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if err == nil && realFile != serverFile {
|
|
|
|
path = filepath.Dir(realFile)
|
|
|
|
}
|
|
|
|
|
|
|
|
return path, nil
|
|
|
|
}
|
2014-05-01 13:13:11 -04:00
|
|
|
|
2016-02-14 06:16:03 -05:00
|
|
|
// SymbolicWalk is like filepath.Walk, but it supports the root being a
|
|
|
|
// symbolic link. It will still not follow symbolic links deeper down in
|
2017-08-02 08:25:05 -04:00
|
|
|
// the file structure.
|
2016-02-14 06:16:03 -05:00
|
|
|
func SymbolicWalk(fs afero.Fs, root string, walker filepath.WalkFunc) error {
|
2016-03-25 07:47:57 -04:00
|
|
|
|
2016-07-30 13:54:07 -04:00
|
|
|
// Sanity check
|
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
|
|
|
if root != "" && len(root) < 4 {
|
|
|
|
return errors.New("Path is too short")
|
2016-07-30 13:54:07 -04:00
|
|
|
}
|
|
|
|
|
2016-03-25 07:47:57 -04:00
|
|
|
// Handle the root first
|
2016-07-10 13:37:27 -04:00
|
|
|
fileInfo, realPath, err := getRealFileInfo(fs, root)
|
2016-03-25 07:47:57 -04:00
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
return walker(root, nil, err)
|
|
|
|
}
|
|
|
|
|
2016-03-25 13:18:39 -04:00
|
|
|
if !fileInfo.IsDir() {
|
2016-07-10 13:37:27 -04:00
|
|
|
return fmt.Errorf("Cannot walk regular file %s", root)
|
2016-03-25 13:18:39 -04:00
|
|
|
}
|
|
|
|
|
2016-07-10 13:37:27 -04:00
|
|
|
if err := walker(realPath, fileInfo, err); err != nil && err != filepath.SkipDir {
|
2016-03-25 07:47:57 -04:00
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
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
|
|
|
// Some of Hugo's filesystems represents an ordered root folder, i.e. project first, then theme folders.
|
|
|
|
// Make sure that order is preserved. afero.Walk will sort the directories down in the file tree,
|
|
|
|
// but we don't care about that.
|
|
|
|
rootContent, err := readDir(fs, root, false)
|
2016-02-14 06:16:03 -05:00
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
return walker(root, nil, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, fi := range rootContent {
|
2016-07-30 08:02:53 -04:00
|
|
|
if err := afero.Walk(fs, filepath.Join(root, fi.Name()), walker); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2016-02-14 06:16:03 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
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
|
|
|
func readDir(fs afero.Fs, dirname string, doSort bool) ([]os.FileInfo, error) {
|
|
|
|
f, err := fs.Open(dirname)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
list, err := f.Readdir(-1)
|
|
|
|
f.Close()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if doSort {
|
|
|
|
sort.Slice(list, func(i, j int) bool { return list[i].Name() < list[j].Name() })
|
|
|
|
}
|
|
|
|
return list, nil
|
|
|
|
}
|
|
|
|
|
2016-07-10 13:37:27 -04:00
|
|
|
func getRealFileInfo(fs afero.Fs, path string) (os.FileInfo, string, error) {
|
2018-03-21 12:21:46 -04:00
|
|
|
fileInfo, err := LstatIfPossible(fs, path)
|
2016-07-10 13:37:27 -04:00
|
|
|
realPath := path
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
return nil, "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
if fileInfo.Mode()&os.ModeSymlink == os.ModeSymlink {
|
|
|
|
link, err := filepath.EvalSymlinks(path)
|
|
|
|
if err != nil {
|
|
|
|
return nil, "", fmt.Errorf("Cannot read symbolic link '%s', error was: %s", path, err)
|
|
|
|
}
|
2018-03-21 12:21:46 -04:00
|
|
|
fileInfo, err = LstatIfPossible(fs, link)
|
2016-07-10 13:37:27 -04:00
|
|
|
if err != nil {
|
|
|
|
return nil, "", fmt.Errorf("Cannot stat '%s', error was: %s", link, err)
|
|
|
|
}
|
|
|
|
realPath = link
|
|
|
|
}
|
|
|
|
return fileInfo, realPath, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetRealPath returns the real file path for the given path, whether it is a
|
|
|
|
// symlink or not.
|
|
|
|
func GetRealPath(fs afero.Fs, path string) (string, error) {
|
|
|
|
_, realPath, err := getRealFileInfo(fs, path)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
return realPath, nil
|
|
|
|
}
|
|
|
|
|
2018-03-21 12:21:46 -04:00
|
|
|
// LstatIfPossible can be used to call Lstat if possible, else Stat.
|
|
|
|
func LstatIfPossible(fs afero.Fs, path string) (os.FileInfo, error) {
|
|
|
|
if lstater, ok := fs.(afero.Lstater); ok {
|
|
|
|
fi, _, err := lstater.LstatIfPossible(path)
|
|
|
|
return fi, err
|
2016-03-25 07:47:57 -04:00
|
|
|
}
|
2018-03-21 12:21:46 -04:00
|
|
|
|
|
|
|
return fs.Stat(path)
|
2016-03-25 07:47:57 -04:00
|
|
|
}
|
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
// SafeWriteToDisk is the same as WriteToDisk
|
|
|
|
// but it also checks to see if file/directory already exists.
|
2014-11-01 11:57:29 -04:00
|
|
|
func SafeWriteToDisk(inpath string, r io.Reader, fs afero.Fs) (err error) {
|
2015-12-08 16:41:36 -05:00
|
|
|
return afero.SafeWriteReader(fs, inpath, r)
|
2014-05-02 01:04:14 -04:00
|
|
|
}
|
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
// WriteToDisk writes content to disk.
|
2014-11-01 11:57:29 -04:00
|
|
|
func WriteToDisk(inpath string, r io.Reader, fs afero.Fs) (err error) {
|
2015-12-08 16:41:36 -05:00
|
|
|
return afero.WriteReader(fs, inpath, r)
|
|
|
|
}
|
2014-05-01 13:13:11 -04:00
|
|
|
|
2018-08-13 05:01:57 -04:00
|
|
|
// OpenFileForWriting opens all the given filenames for writing.
|
|
|
|
func OpenFilesForWriting(fs afero.Fs, filenames ...string) (io.WriteCloser, error) {
|
|
|
|
var writeClosers []io.WriteCloser
|
|
|
|
for _, filename := range filenames {
|
|
|
|
f, err := OpenFileForWriting(fs, filename)
|
|
|
|
if err != nil {
|
|
|
|
for _, wc := range writeClosers {
|
|
|
|
wc.Close()
|
|
|
|
}
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
writeClosers = append(writeClosers, f)
|
|
|
|
}
|
|
|
|
|
|
|
|
return hugio.NewMultiWriteCloser(writeClosers...), nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2018-08-05 05:13:49 -04:00
|
|
|
// OpenFileForWriting opens or creates the given file. If the target directory
|
|
|
|
// does not exist, it gets created.
|
|
|
|
func OpenFileForWriting(fs afero.Fs, filename string) (afero.File, error) {
|
|
|
|
filename = filepath.Clean(filename)
|
|
|
|
// Create will truncate if file already exists.
|
|
|
|
f, err := fs.Create(filename)
|
|
|
|
if err != nil {
|
|
|
|
if !os.IsNotExist(err) {
|
|
|
|
return nil, err
|
|
|
|
}
|
2018-08-28 11:08:52 -04:00
|
|
|
if err = fs.MkdirAll(filepath.Dir(filename), 0777); err != nil { // rwx, rw, r before umask
|
2018-08-05 05:13:49 -04:00
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
f, err = fs.Create(filename)
|
|
|
|
}
|
|
|
|
|
|
|
|
return f, err
|
|
|
|
}
|
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
// GetTempDir returns a temporary directory with the given sub path.
|
2015-12-08 16:41:36 -05:00
|
|
|
func GetTempDir(subPath string, fs afero.Fs) string {
|
|
|
|
return afero.GetTempDir(fs, subPath)
|
|
|
|
}
|
2014-05-01 13:13:11 -04:00
|
|
|
|
2015-12-08 16:41:36 -05:00
|
|
|
// DirExists checks if a path exists and is a directory.
|
|
|
|
func DirExists(path string, fs afero.Fs) (bool, error) {
|
|
|
|
return afero.DirExists(fs, path)
|
2014-05-01 13:13:11 -04:00
|
|
|
}
|
2014-12-26 22:40:10 -05:00
|
|
|
|
2015-12-08 16:41:36 -05:00
|
|
|
// IsDir checks if a given path is a directory.
|
|
|
|
func IsDir(path string, fs afero.Fs) (bool, error) {
|
|
|
|
return afero.IsDir(fs, path)
|
|
|
|
}
|
2015-02-18 17:19:35 -05:00
|
|
|
|
2015-12-08 16:41:36 -05:00
|
|
|
// IsEmpty checks if a given path is empty.
|
|
|
|
func IsEmpty(path string, fs afero.Fs) (bool, error) {
|
|
|
|
return afero.IsEmpty(fs, path)
|
|
|
|
}
|
2014-12-26 22:40:10 -05:00
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
// FileContains checks if a file contains a specified string.
|
2015-12-08 16:41:36 -05:00
|
|
|
func FileContains(filename string, subslice []byte, fs afero.Fs) (bool, error) {
|
|
|
|
return afero.FileContainsBytes(fs, filename, subslice)
|
|
|
|
}
|
2014-12-26 22:40:10 -05:00
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
// FileContainsAny checks if a file contains any of the specified strings.
|
2016-02-09 12:39:17 -05:00
|
|
|
func FileContainsAny(filename string, subslices [][]byte, fs afero.Fs) (bool, error) {
|
|
|
|
return afero.FileContainsAnyBytes(fs, filename, subslices)
|
|
|
|
}
|
|
|
|
|
2016-03-23 05:03:29 -04:00
|
|
|
// Exists checks if a file or directory exists.
|
2015-12-08 16:41:36 -05:00
|
|
|
func Exists(path string, fs afero.Fs) (bool, error) {
|
|
|
|
return afero.Exists(fs, path)
|
2014-12-26 22:40:10 -05:00
|
|
|
}
|