mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-05-06 18:56:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

simplified buildSite & better error handling around it

Browse source
This commit is contained in:
spf13 2013-10-09 19:06:47 -04:00
parent 0318f7c149
commit f5fda80486
4 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
commands/hugo.go
View file

@ -49,7 +49,7 @@ var Source, Destination, BaseUrl, CfgFile string
func Execute() {
AddCommands()
Hugo := HugoCmd.ToCommander()
utils.CheckErrExit(Hugo.Execute())
utils.StopOnErr(Hugo.Execute())
}
func AddCommands() {
@ -86,9 +86,7 @@ func InitializeConfig() {
func build() {
utils.CheckErr(copyStatic(), fmt.Sprintf("Error copying static files to %s", Config.GetAbsPath(Config.PublishDir)))
_, e := buildSite()
utils.CheckErrExit(e)
utils.StopOnErr(buildSite())
if BuildWatch {
fmt.Println("Watching for changes in", Config.GetAbsPath(Config.ContentDir))
@ -123,16 +121,16 @@ func getDirList() []string {
return a
}
func buildSite() (site *hugolib.Site, err error) {
func buildSite() (err error) {
startTime := time.Now()
site = &hugolib.Site{Config: *Config}
site := &hugolib.Site{Config: *Config}
err = site.Build()
if err != nil {
return
}
site.Stats()
fmt.Printf("in %v ms\n", int(1000*time.Since(startTime).Seconds()))
return site, nil
return nil
}
func NewWatcher(port int) error {
@ -181,9 +179,9 @@ func NewWatcher(port int) error {
func watchChange(ev *fsnotify.FileEvent) {
if strings.HasPrefix(ev.Name, Config.GetAbsPath(Config.StaticDir)) {
fmt.Println("Static file changed, syncing\n")
copyStatic()
utils.CheckErr(copyStatic(), fmt.Sprintf("Error copying static files to %s", Config.GetAbsPath(Config.PublishDir)))
} else {
fmt.Println("Change detected, rebuilding site\n")
buildSite()
utils.StopOnErr(buildSite())
}
}