Move HugoSites to hugolib

It will get more involved in the build process in a minute.

See #2309
This commit is contained in:
Bjørn Erik Pedersen
2016-07-27 10:03:45 +02:00
parent 3a02807970
commit 5b9c2a40f1
4 changed files with 28 additions and 13 deletions

View File

@@ -46,20 +46,10 @@ import (
"github.com/spf13/viper"
)
type HugoSites []*hugolib.Site
// Reset resets the sites, making it ready for a full rebuild.
// TODO(bep) multilingo
func (h HugoSites) Reset() {
for i, s := range h {
h[i] = s.Reset()
}
}
// Hugo represents the Hugo sites to build. This variable is exported as it
// is used by at least one external library (the Hugo caddy plugin). We should
// provide a cleaner external API, but until then, this is it.
var Hugo HugoSites
var Hugo hugolib.HugoSites
// Reset resets Hugo ready for a new full build. This is mainly only useful
// for benchmark testing etc. via the CLI commands.

View File

@@ -11,8 +11,8 @@ import (
"github.com/spf13/viper"
)
func readMultilingualConfiguration() (HugoSites, error) {
h := make(HugoSites, 0)
func readMultilingualConfiguration() (hugolib.HugoSites, error) {
h := make(hugolib.HugoSites, 0)
multilingual := viper.GetStringMap("Multilingual")
if len(multilingual) == 0 {
// TODO(bep) multilingo langConfigsList = append(langConfigsList, hugolib.NewLanguage("en"))