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" "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 // 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 // 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. // 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 // Reset resets Hugo ready for a new full build. This is mainly only useful
// for benchmark testing etc. via the CLI commands. // for benchmark testing etc. via the CLI commands.

View file

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

25
hugolib/hugo_sites.go Normal file
View file

@ -0,0 +1,25 @@
// Copyright 2016-present 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 hugolib
// HugoSites represents the sites to build. Each site represents a language.
type HugoSites []*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()
}
}