mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
597e418cb0
The main motivation of this commit is to add a `page.Page` interface to replace the very file-oriented `hugolib.Page` struct. This is all a preparation step for issue #5074, "pages from other data sources". But this also fixes a set of annoying limitations, especially related to custom output formats, and shortcodes. Most notable changes: * The inner content of shortcodes using the `{{%` as the outer-most delimiter will now be sent to the content renderer, e.g. Blackfriday. This means that any markdown will partake in the global ToC and footnote context etc. * The Custom Output formats are now "fully virtualized". This removes many of the current limitations. * The taxonomy list type now has a reference to the `Page` object. This improves the taxonomy template `.Title` situation and make common template constructs much simpler. See #5074 Fixes #5763 Fixes #5758 Fixes #5090 Fixes #5204 Fixes #4695 Fixes #5607 Fixes #5707 Fixes #5719 Fixes #3113 Fixes #5706 Fixes #5767 Fixes #5723 Fixes #5769 Fixes #5770 Fixes #5771 Fixes #5759 Fixes #5776 Fixes #5777 Fixes #5778
154 lines
3.5 KiB
Go
154 lines
3.5 KiB
Go
// Copyright 2019 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// 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 paths
|
|
|
|
import (
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/gohugoio/hugo/config"
|
|
"github.com/spf13/afero"
|
|
"github.com/spf13/cast"
|
|
)
|
|
|
|
type ThemeConfig struct {
|
|
// The theme name as provided by the folder name below /themes.
|
|
Name string
|
|
|
|
// Optional configuration filename (e.g. "/themes/mytheme/config.json").
|
|
ConfigFilename string
|
|
|
|
// Optional config read from the ConfigFile above.
|
|
Cfg config.Provider
|
|
}
|
|
|
|
// Create file system, an ordered theme list from left to right, no duplicates.
|
|
type themesCollector struct {
|
|
themesDir string
|
|
fs afero.Fs
|
|
seen map[string]bool
|
|
themes []ThemeConfig
|
|
}
|
|
|
|
func (c *themesCollector) isSeen(theme string) bool {
|
|
loki := strings.ToLower(theme)
|
|
if c.seen[loki] {
|
|
return true
|
|
}
|
|
c.seen[loki] = true
|
|
return false
|
|
}
|
|
|
|
func (c *themesCollector) addAndRecurse(themes ...string) error {
|
|
for i := 0; i < len(themes); i++ {
|
|
theme := themes[i]
|
|
configFilename := c.getConfigFileIfProvided(theme)
|
|
if !c.isSeen(theme) {
|
|
tc, err := c.add(theme, configFilename)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := c.addThemeNamesFromTheme(tc); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (c *themesCollector) add(name, configFilename string) (ThemeConfig, error) {
|
|
var cfg config.Provider
|
|
var tc ThemeConfig
|
|
|
|
if configFilename != "" {
|
|
var err error
|
|
cfg, err = config.FromFile(c.fs, configFilename)
|
|
if err != nil {
|
|
return tc, err
|
|
}
|
|
}
|
|
|
|
tc = ThemeConfig{Name: name, ConfigFilename: configFilename, Cfg: cfg}
|
|
c.themes = append(c.themes, tc)
|
|
return tc, nil
|
|
|
|
}
|
|
|
|
func collectThemeNames(p *Paths) ([]ThemeConfig, error) {
|
|
return CollectThemes(p.Fs.Source, p.AbsPathify(p.ThemesDir), p.Themes())
|
|
|
|
}
|
|
|
|
func CollectThemes(fs afero.Fs, themesDir string, themes []string) ([]ThemeConfig, error) {
|
|
if len(themes) == 0 {
|
|
return nil, nil
|
|
}
|
|
|
|
c := &themesCollector{
|
|
fs: fs,
|
|
themesDir: themesDir,
|
|
seen: make(map[string]bool)}
|
|
|
|
for i := 0; i < len(themes); i++ {
|
|
theme := themes[i]
|
|
if err := c.addAndRecurse(theme); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
return c.themes, nil
|
|
|
|
}
|
|
|
|
func (c *themesCollector) getConfigFileIfProvided(theme string) string {
|
|
configDir := filepath.Join(c.themesDir, theme)
|
|
|
|
var (
|
|
configFilename string
|
|
exists bool
|
|
)
|
|
|
|
// Viper supports more, but this is the sub-set supported by Hugo.
|
|
for _, configFormats := range config.ValidConfigFileExtensions {
|
|
configFilename = filepath.Join(configDir, "config."+configFormats)
|
|
exists, _ = afero.Exists(c.fs, configFilename)
|
|
if exists {
|
|
break
|
|
}
|
|
}
|
|
|
|
if !exists {
|
|
// No theme config set.
|
|
return ""
|
|
}
|
|
|
|
return configFilename
|
|
|
|
}
|
|
|
|
func (c *themesCollector) addThemeNamesFromTheme(theme ThemeConfig) error {
|
|
if theme.Cfg != nil && theme.Cfg.IsSet("theme") {
|
|
v := theme.Cfg.Get("theme")
|
|
switch vv := v.(type) {
|
|
case []string:
|
|
return c.addAndRecurse(vv...)
|
|
case []interface{}:
|
|
return c.addAndRecurse(cast.ToStringSlice(vv)...)
|
|
default:
|
|
return c.addAndRecurse(cast.ToString(vv))
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|