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-08-22 07:59:59 -04:00
|
|
|
"fmt"
|
2014-02-27 18:32:09 -05:00
|
|
|
"net/url"
|
2014-12-07 13:48:00 -05:00
|
|
|
"path"
|
2017-03-09 13:19:29 -05:00
|
|
|
"path/filepath"
|
2014-08-22 07:59:59 -04:00
|
|
|
"strings"
|
2015-01-28 02:18:09 -05:00
|
|
|
|
|
|
|
"github.com/PuerkitoBio/purell"
|
2014-02-27 18:32:09 -05:00
|
|
|
)
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
type pathBridge struct {
|
2015-01-27 05:44:41 -05:00
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
func (pathBridge) Base(in string) string {
|
2015-01-27 05:44:41 -05:00
|
|
|
return path.Base(in)
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
func (pathBridge) Clean(in string) string {
|
2015-01-27 05:44:41 -05:00
|
|
|
return path.Clean(in)
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
func (pathBridge) Dir(in string) string {
|
2015-01-27 05:44:41 -05:00
|
|
|
return path.Dir(in)
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
func (pathBridge) Ext(in string) string {
|
2015-01-27 05:44:41 -05:00
|
|
|
return path.Ext(in)
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
func (pathBridge) Join(elem ...string) string {
|
2015-01-27 05:44:41 -05:00
|
|
|
return path.Join(elem...)
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
func (pathBridge) Separator() string {
|
2015-01-27 05:44:41 -05:00
|
|
|
return "/"
|
|
|
|
}
|
|
|
|
|
2015-05-25 07:10:26 -04:00
|
|
|
var pb pathBridge
|
2015-01-27 05:44:41 -05:00
|
|
|
|
2015-03-11 13:34:57 -04:00
|
|
|
func sanitizeURLWithFlags(in string, f purell.NormalizationFlags) string {
|
2015-02-28 12:45:02 -05:00
|
|
|
s, err := purell.NormalizeURLString(in, f)
|
2014-04-07 22:02:08 -04:00
|
|
|
if err != nil {
|
|
|
|
return in
|
|
|
|
}
|
2015-02-16 13:26:54 -05:00
|
|
|
|
|
|
|
// Temporary workaround for the bug fix and resulting
|
|
|
|
// behavioral change in purell.NormalizeURLString():
|
2015-11-22 11:40:22 -05:00
|
|
|
// a leading '/' was inadvertently added to relative links,
|
2015-02-16 13:26:54 -05:00
|
|
|
// but no longer, see #878.
|
|
|
|
//
|
|
|
|
// I think the real solution is to allow Hugo to
|
|
|
|
// make relative URL with relative path,
|
|
|
|
// e.g. "../../post/hello-again/", as wished by users
|
|
|
|
// in issues #157, #622, etc., without forcing
|
|
|
|
// relative URLs to begin with '/'.
|
|
|
|
// Once the fixes are in, let's remove this kludge
|
2015-03-18 01:16:54 -04:00
|
|
|
// and restore SanitizeURL() to the way it was.
|
2015-02-16 13:26:54 -05:00
|
|
|
// -- @anthonyfok, 2015-02-16
|
|
|
|
//
|
|
|
|
// Begin temporary kludge
|
|
|
|
u, err := url.Parse(s)
|
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
2015-05-05 10:02:52 -04:00
|
|
|
if len(u.Path) > 0 && !strings.HasPrefix(u.Path, "/") {
|
2015-02-16 13:26:54 -05:00
|
|
|
u.Path = "/" + u.Path
|
|
|
|
}
|
|
|
|
return u.String()
|
|
|
|
// End temporary kludge
|
|
|
|
|
2020-12-02 07:23:25 -05:00
|
|
|
// return s
|
2015-02-28 12:45:02 -05:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2015-03-18 01:16:54 -04:00
|
|
|
// SanitizeURL sanitizes the input URL string.
|
2015-03-11 13:34:57 -04:00
|
|
|
func SanitizeURL(in string) string {
|
|
|
|
return sanitizeURLWithFlags(in, purell.FlagsSafe|purell.FlagRemoveTrailingSlash|purell.FlagRemoveDotSegments|purell.FlagRemoveDuplicateSlashes|purell.FlagRemoveUnnecessaryHostDots|purell.FlagRemoveEmptyPortSeparator)
|
2015-02-28 12:45:02 -05:00
|
|
|
}
|
|
|
|
|
2015-03-18 01:16:54 -04:00
|
|
|
// SanitizeURLKeepTrailingSlash is the same as SanitizeURL, but will keep any trailing slash.
|
2015-03-11 13:34:57 -04:00
|
|
|
func SanitizeURLKeepTrailingSlash(in string) string {
|
|
|
|
return sanitizeURLWithFlags(in, purell.FlagsSafe|purell.FlagRemoveDotSegments|purell.FlagRemoveDuplicateSlashes|purell.FlagRemoveUnnecessaryHostDots|purell.FlagRemoveEmptyPortSeparator)
|
2014-04-07 22:02:08 -04:00
|
|
|
}
|
|
|
|
|
2016-03-24 18:16:18 -04:00
|
|
|
// URLize is similar to MakePath, but with Unicode handling
|
2014-02-27 18:32:09 -05:00
|
|
|
// Example:
|
|
|
|
// uri: Vim (text editor)
|
|
|
|
// urlize: vim-text-editor
|
2016-10-24 07:45:30 -04:00
|
|
|
func (p *PathSpec) URLize(uri string) string {
|
2017-03-09 13:19:29 -05:00
|
|
|
return p.URLEscape(p.MakePathSanitized(uri))
|
|
|
|
}
|
|
|
|
|
2020-12-16 06:11:32 -05:00
|
|
|
// URLizeFilename creates an URL from a filename by escaping unicode letters
|
2017-03-09 13:19:29 -05:00
|
|
|
// and turn any filepath separator into forward slashes.
|
|
|
|
func (p *PathSpec) URLizeFilename(filename string) string {
|
|
|
|
return p.URLEscape(filepath.ToSlash(filename))
|
|
|
|
}
|
2014-02-27 18:32:09 -05:00
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
// URLEscape escapes unicode letters.
|
|
|
|
func (p *PathSpec) URLEscape(uri string) string {
|
2014-02-27 18:32:09 -05:00
|
|
|
// escape unicode letters
|
2017-03-09 13:19:29 -05:00
|
|
|
parsedURI, err := url.Parse(uri)
|
2014-02-27 18:32:09 -05:00
|
|
|
if err != nil {
|
2016-08-13 09:09:51 -04:00
|
|
|
// if net/url can not parse URL it means Sanitize works incorrectly
|
2014-02-27 18:32:09 -05:00
|
|
|
panic(err)
|
|
|
|
}
|
2016-03-24 18:16:18 -04:00
|
|
|
x := parsedURI.String()
|
2014-02-27 18:32:09 -05:00
|
|
|
return x
|
|
|
|
}
|
|
|
|
|
2016-03-24 18:16:18 -04:00
|
|
|
// MakePermalink combines base URL with content path to create full URL paths.
|
2014-02-27 18:32:09 -05:00
|
|
|
// Example
|
|
|
|
// base: http://spf13.com/
|
|
|
|
// path: post/how-i-blog
|
|
|
|
// result: http://spf13.com/post/how-i-blog
|
|
|
|
func MakePermalink(host, plink string) *url.URL {
|
|
|
|
base, err := url.Parse(host)
|
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
|
|
|
|
2014-08-22 07:59:59 -04:00
|
|
|
p, err := url.Parse(plink)
|
2014-02-27 18:32:09 -05:00
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
2014-08-22 07:59:59 -04:00
|
|
|
|
|
|
|
if p.Host != "" {
|
2019-03-24 05:11:16 -04:00
|
|
|
panic(fmt.Errorf("can't make permalink from absolute link %q", plink))
|
2014-08-22 07:59:59 -04:00
|
|
|
}
|
|
|
|
|
2014-12-07 13:48:00 -05:00
|
|
|
base.Path = path.Join(base.Path, p.Path)
|
2014-08-22 07:59:59 -04:00
|
|
|
|
|
|
|
// path.Join will strip off the last /, so put it back if it was there.
|
2015-05-11 06:28:44 -04:00
|
|
|
hadTrailingSlash := (plink == "" && strings.HasSuffix(host, "/")) || strings.HasSuffix(p.Path, "/")
|
|
|
|
if hadTrailingSlash && !strings.HasSuffix(base.Path, "/") {
|
2014-08-22 07:59:59 -04:00
|
|
|
base.Path = base.Path + "/"
|
|
|
|
}
|
|
|
|
|
|
|
|
return base
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
|
|
|
|
2016-11-24 14:30:17 -05:00
|
|
|
// AbsURL creates an absolute URL from the relative path given and the BaseURL set in config.
|
2016-10-24 07:45:30 -04:00
|
|
|
func (p *PathSpec) AbsURL(in string, addLanguage bool) string {
|
2016-08-07 16:01:55 -04:00
|
|
|
url, err := url.Parse(in)
|
2016-04-27 10:54:44 -04:00
|
|
|
if err != nil {
|
2016-08-07 16:01:55 -04:00
|
|
|
return in
|
2016-04-27 10:54:44 -04:00
|
|
|
}
|
|
|
|
|
2016-08-07 16:01:55 -04:00
|
|
|
if url.IsAbs() || strings.HasPrefix(in, "//") {
|
|
|
|
return in
|
2015-05-11 06:28:44 -04:00
|
|
|
}
|
2015-11-02 15:28:29 -05:00
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
var baseURL string
|
2016-08-07 16:01:55 -04:00
|
|
|
if strings.HasPrefix(in, "/") {
|
2017-03-09 13:19:29 -05:00
|
|
|
u := p.BaseURL.URL()
|
|
|
|
u.Path = ""
|
|
|
|
baseURL = u.String()
|
|
|
|
} else {
|
|
|
|
baseURL = p.BaseURL.String()
|
2015-11-02 15:28:29 -05:00
|
|
|
}
|
2016-08-07 16:01:55 -04:00
|
|
|
|
|
|
|
if addLanguage {
|
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
|
|
|
prefix := p.GetLanguagePrefix()
|
2016-09-13 17:44:16 -04:00
|
|
|
if prefix != "" {
|
|
|
|
hasPrefix := false
|
|
|
|
// avoid adding language prefix if already present
|
2020-12-02 06:47:01 -05:00
|
|
|
in2 := in
|
2016-09-13 17:44:16 -04:00
|
|
|
if strings.HasPrefix(in, "/") {
|
2020-12-02 06:47:01 -05:00
|
|
|
in2 = in[1:]
|
|
|
|
}
|
|
|
|
if in2 == prefix {
|
|
|
|
hasPrefix = true
|
2016-09-13 17:44:16 -04:00
|
|
|
} else {
|
2020-12-02 06:47:01 -05:00
|
|
|
hasPrefix = strings.HasPrefix(in2, prefix+"/")
|
2016-09-13 17:44:16 -04:00
|
|
|
}
|
2016-08-07 16:01:55 -04:00
|
|
|
|
2016-09-13 17:44:16 -04:00
|
|
|
if !hasPrefix {
|
|
|
|
addSlash := in == "" || strings.HasSuffix(in, "/")
|
|
|
|
in = path.Join(prefix, in)
|
2016-08-08 07:55:18 -04:00
|
|
|
|
2016-09-13 17:44:16 -04:00
|
|
|
if addSlash {
|
|
|
|
in += "/"
|
|
|
|
}
|
2016-08-08 07:55:18 -04:00
|
|
|
}
|
2016-08-07 16:01:55 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return MakePermalink(baseURL, in).String()
|
|
|
|
}
|
|
|
|
|
2016-07-28 03:30:58 -04:00
|
|
|
// IsAbsURL determines whether the given path points to an absolute URL.
|
|
|
|
func IsAbsURL(path string) bool {
|
|
|
|
url, err := url.Parse(path)
|
|
|
|
if err != nil {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
return url.IsAbs() || strings.HasPrefix(path, "//")
|
|
|
|
}
|
|
|
|
|
2015-05-11 07:59:06 -04:00
|
|
|
// RelURL creates a URL relative to the BaseURL root.
|
|
|
|
// Note: The result URL will not include the context root if canonifyURLs is enabled.
|
2016-10-24 07:45:30 -04:00
|
|
|
func (p *PathSpec) RelURL(in string, addLanguage bool) string {
|
2017-03-09 13:19:29 -05:00
|
|
|
baseURL := p.BaseURL.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
|
|
|
canonifyURLs := p.CanonifyURLs
|
2016-08-07 16:01:55 -04:00
|
|
|
if (!strings.HasPrefix(in, baseURL) && strings.HasPrefix(in, "http")) || strings.HasPrefix(in, "//") {
|
|
|
|
return in
|
2015-05-11 07:59:06 -04:00
|
|
|
}
|
|
|
|
|
2016-08-07 16:01:55 -04:00
|
|
|
u := in
|
2015-05-11 07:59:06 -04:00
|
|
|
|
2016-08-07 16:01:55 -04:00
|
|
|
if strings.HasPrefix(in, baseURL) {
|
2015-05-11 07:59:06 -04:00
|
|
|
u = strings.TrimPrefix(u, baseURL)
|
|
|
|
}
|
|
|
|
|
2016-08-07 16:01:55 -04:00
|
|
|
if addLanguage {
|
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
|
|
|
prefix := p.GetLanguagePrefix()
|
2016-09-13 17:44:16 -04:00
|
|
|
if prefix != "" {
|
|
|
|
hasPrefix := false
|
|
|
|
// avoid adding language prefix if already present
|
2020-12-02 06:47:01 -05:00
|
|
|
in2 := in
|
2016-09-13 17:44:16 -04:00
|
|
|
if strings.HasPrefix(in, "/") {
|
2020-12-02 06:47:01 -05:00
|
|
|
in2 = in[1:]
|
|
|
|
}
|
|
|
|
if in2 == prefix {
|
|
|
|
hasPrefix = true
|
2016-09-13 17:44:16 -04:00
|
|
|
} else {
|
2020-12-02 06:47:01 -05:00
|
|
|
hasPrefix = strings.HasPrefix(in2, prefix+"/")
|
2016-09-13 17:44:16 -04:00
|
|
|
}
|
2016-09-13 15:37:27 -04:00
|
|
|
|
2016-09-13 17:44:16 -04:00
|
|
|
if !hasPrefix {
|
|
|
|
hadSlash := strings.HasSuffix(u, "/")
|
2016-08-07 16:01:55 -04:00
|
|
|
|
2016-09-13 17:44:16 -04:00
|
|
|
u = path.Join(prefix, u)
|
2016-08-07 16:01:55 -04:00
|
|
|
|
2016-09-13 17:44:16 -04:00
|
|
|
if hadSlash {
|
|
|
|
u += "/"
|
|
|
|
}
|
2016-08-08 07:55:18 -04:00
|
|
|
}
|
2016-08-07 16:01:55 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-11 07:59:06 -04:00
|
|
|
if !canonifyURLs {
|
|
|
|
u = AddContextRoot(baseURL, u)
|
|
|
|
}
|
2016-08-07 16:01:55 -04:00
|
|
|
|
|
|
|
if in == "" && !strings.HasSuffix(u, "/") && strings.HasSuffix(baseURL, "/") {
|
2015-05-11 07:59:06 -04:00
|
|
|
u += "/"
|
|
|
|
}
|
|
|
|
|
|
|
|
if !strings.HasPrefix(u, "/") {
|
|
|
|
u = "/" + u
|
|
|
|
}
|
|
|
|
|
|
|
|
return u
|
2015-05-11 06:28:44 -04:00
|
|
|
}
|
|
|
|
|
2014-12-12 14:28:28 -05:00
|
|
|
// AddContextRoot adds the context root to an URL if it's not already set.
|
|
|
|
// For relative URL entries on sites with a base url with a context root set (i.e. http://example.com/mysite),
|
2015-03-18 01:16:54 -04:00
|
|
|
// relative URLs must not include the context root if canonifyURLs is enabled. But if it's disabled, it must be set.
|
2015-03-11 13:34:57 -04:00
|
|
|
func AddContextRoot(baseURL, relativePath string) string {
|
|
|
|
url, err := url.Parse(baseURL)
|
2014-12-12 14:28:28 -05:00
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
newPath := path.Join(url.Path, relativePath)
|
|
|
|
|
2020-12-16 06:11:32 -05:00
|
|
|
// path strips trailing slash, ignore root path.
|
2015-01-28 02:18:09 -05:00
|
|
|
if newPath != "/" && strings.HasSuffix(relativePath, "/") {
|
2014-12-12 14:28:28 -05:00
|
|
|
newPath += "/"
|
|
|
|
}
|
|
|
|
return newPath
|
|
|
|
}
|
|
|
|
|
2017-03-09 13:19:29 -05:00
|
|
|
// PrependBasePath prepends any baseURL sub-folder to the given resource
|
2018-11-15 07:35:28 -05:00
|
|
|
func (p *PathSpec) PrependBasePath(rel string, isAbs bool) string {
|
|
|
|
basePath := p.GetBasePath(!isAbs)
|
|
|
|
if basePath != "" {
|
2017-03-09 13:19:29 -05:00
|
|
|
rel = filepath.ToSlash(rel)
|
|
|
|
// Need to prepend any path from the baseURL
|
|
|
|
hadSlash := strings.HasSuffix(rel, "/")
|
2018-11-15 07:35:28 -05:00
|
|
|
rel = path.Join(basePath, rel)
|
2017-03-09 13:19:29 -05:00
|
|
|
if hadSlash {
|
|
|
|
rel += "/"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return rel
|
|
|
|
}
|
|
|
|
|
2016-11-05 12:05:33 -04:00
|
|
|
// URLizeAndPrep applies misc sanitation to the given URL to get it in line
|
|
|
|
// with the Hugo standard.
|
2016-10-24 07:45:30 -04:00
|
|
|
func (p *PathSpec) URLizeAndPrep(in string) string {
|
2016-11-26 09:50:32 -05:00
|
|
|
return p.URLPrep(p.URLize(in))
|
2014-12-27 08:11:19 -05:00
|
|
|
}
|
|
|
|
|
2016-11-05 12:05:33 -04:00
|
|
|
// URLPrep applies misc sanitation to the given URL.
|
2016-11-26 09:50:32 -05:00
|
|
|
func (p *PathSpec) URLPrep(in 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.UglyURLs {
|
2017-03-01 18:21:02 -05:00
|
|
|
return Uglify(SanitizeURL(in))
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
2017-03-01 18:21:02 -05:00
|
|
|
pretty := PrettifyURL(SanitizeURL(in))
|
|
|
|
if path.Ext(pretty) == ".xml" {
|
|
|
|
return pretty
|
2015-03-06 18:02:06 -05:00
|
|
|
}
|
2017-03-01 18:21:02 -05:00
|
|
|
url, err := purell.NormalizeURLString(pretty, purell.FlagAddTrailingSlash)
|
2015-03-06 18:02:06 -05:00
|
|
|
if err != nil {
|
2017-03-01 18:21:02 -05:00
|
|
|
return pretty
|
2015-03-06 18:02:06 -05:00
|
|
|
}
|
|
|
|
return url
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
|
|
|
|
2015-03-18 01:16:54 -04:00
|
|
|
// PrettifyURL takes a URL string and returns a semantic, clean URL.
|
2015-03-11 13:34:57 -04:00
|
|
|
func PrettifyURL(in string) string {
|
|
|
|
x := PrettifyURLPath(in)
|
2014-02-27 18:32:09 -05:00
|
|
|
|
2014-12-07 13:48:00 -05:00
|
|
|
if path.Base(x) == "index.html" {
|
|
|
|
return path.Dir(x)
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if in == "" {
|
|
|
|
return "/"
|
|
|
|
}
|
|
|
|
|
|
|
|
return x
|
|
|
|
}
|
|
|
|
|
2015-03-18 01:16:54 -04:00
|
|
|
// PrettifyURLPath takes a URL path to a content and converts it
|
2014-12-26 10:07:03 -05:00
|
|
|
// to enable pretty URLs.
|
|
|
|
// /section/name.html becomes /section/name/index.html
|
|
|
|
// /section/name/ becomes /section/name/index.html
|
|
|
|
// /section/name/index.html becomes /section/name/index.html
|
2015-03-11 13:34:57 -04:00
|
|
|
func PrettifyURLPath(in string) string {
|
2015-10-15 04:15:26 -04:00
|
|
|
return prettifyPath(in, pb)
|
2014-12-07 13:48:00 -05:00
|
|
|
}
|
|
|
|
|
2015-03-18 01:16:54 -04:00
|
|
|
// Uglify does the opposite of PrettifyURLPath().
|
2014-12-26 10:07:03 -05:00
|
|
|
// /section/name/index.html becomes /section/name.html
|
|
|
|
// /section/name/ becomes /section/name.html
|
|
|
|
// /section/name.html becomes /section/name.html
|
2014-02-27 18:32:09 -05:00
|
|
|
func Uglify(in string) string {
|
2014-12-07 13:48:00 -05:00
|
|
|
if path.Ext(in) == "" {
|
2014-02-27 18:32:09 -05:00
|
|
|
if len(in) < 2 {
|
|
|
|
return "/"
|
|
|
|
}
|
|
|
|
// /section/name/ -> /section/name.html
|
2014-12-07 13:48:00 -05:00
|
|
|
return path.Clean(in) + ".html"
|
2015-03-06 18:02:06 -05:00
|
|
|
}
|
|
|
|
|
2015-08-26 15:29:32 -04:00
|
|
|
name, ext := fileAndExt(in, pb)
|
2015-03-06 18:02:06 -05:00
|
|
|
if name == "index" {
|
|
|
|
// /section/name/index.html -> /section/name.html
|
|
|
|
d := path.Dir(in)
|
|
|
|
if len(d) > 1 {
|
|
|
|
return d + ext
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
2015-03-06 18:02:06 -05:00
|
|
|
return in
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|
2015-12-07 00:34:09 -05:00
|
|
|
// /.xml -> /index.xml
|
|
|
|
if name == "" {
|
|
|
|
return path.Dir(in) + "index" + ext
|
|
|
|
}
|
2015-03-06 18:02:06 -05:00
|
|
|
// /section/name.html -> /section/name.html
|
|
|
|
return path.Clean(in)
|
2014-02-27 18:32:09 -05:00
|
|
|
}
|