Add error handling and rename index to welcome

We now use a welcome page instead of an index page for the events.

Signed-off-by: Matt Stratton <matt.stratton@gmail.com>

Author: mattstratton

event/event.go

@@ -2,7 +2,6 @@
 package event
 
 import (
-	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -12,6 +11,8 @@ import (
 
 	"text/template"
 
+	"github.com/pkg/errors"
+
 	helpers "github.com/devopsdays/devopsdays-cli/helpers"
 	paths "github.com/devopsdays/devopsdays-cli/helpers/paths"
 	"github.com/devopsdays/devopsdays-cli/images"
@@ -227,14 +228,14 @@ func CreateEvent(city, year string) (err error) {
 	NewEvent(myEvent, CityClean(city), year)
 
 	// create the event content files
-	contentfiles := []string{"index", "conduct", "contact", "location", "program", "propose", "registration", "sponsor"}
+	contentfiles := []string{"welcome", "conduct", "contact", "location", "program", "propose", "registration", "sponsor"}
 	for _, contentFile := range contentfiles {
 
-		if result, err := createEventContentFile(city, year, contentFile); err != nil {
+		if err := createEventContentFile(city, year, contentFile); err != nil {
 			fmt.Printf("Error: %s\n", err)
-		} else {
-			fmt.Printf("Event content file created for %s!!!\n", result)
+			os.Exit(1)
 		}
+		fmt.Printf("Event content file created for %s!!!\n", city)
 
 	}
 	if answers.LogoPath != "" {
@@ -280,8 +281,7 @@ func Logo(srcPath, city, year string) (err error) {
 	err = helpers.CopyFile(srcPath, filepath.Join(eventStaticPath, "logo.png"))
 
 	if err != nil {
-		fmt.Println(err)
-		return err
+		return errors.Wrapf(err, "cannot copy logo for %s %s", city, year)
 	}
 	return nil
 
@@ -294,9 +294,10 @@ func LogoSquare(srcPath, city, year string) (err error) {
 		log.Fatal(err)
 	}
 	destPath := filepath.Join(eventStaticPath, "logo-square.png")
-	images.ResizeImage(srcPath, destPath, "png", 600, 600)
-
-	// @todo update helpers.ResizeImage to return error code and do something with it here
+	err = images.ResizeImage(srcPath, destPath, "png", 600, 600)
+	if err != nil {
+		return errors.Wrap(err, "cannot resize image")
+	}
 
 	return nil
 }

event/make_event_files.go

@@ -1,8 +1,6 @@
 package event
 
 import (
-	"fmt"
-	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -11,32 +9,33 @@ import (
 
 	rice "github.com/GeertJohan/go.rice"
 	"github.com/devopsdays/devopsdays-cli/helpers/paths"
+	"github.com/pkg/errors"
 )
 
-func createEventContentFile(city, year, page string) (string, error) {
+func createEventContentFile(city, year, page string) error {
 
 	err := os.MkdirAll((paths.EventContentPath(city, year)), 0755)
 	if err != nil {
-		return "", err
+		return errors.Wrap(err, "make event content directory failed")
 	}
 
 	// find a rice.Box
 	// to compile, cd to event directory and run `rice embed-go`
 	templateBox, err := rice.FindBox("templates")
 	if err != nil {
-		log.Fatal(err)
+		return errors.Wrap(err, "content template find failed")
 	}
 	templateName := page + ".md.tmpl"
 	// get file contents as string
 	templateString, err := templateBox.String(templateName)
 	if err != nil {
-		log.Fatal(err)
+		return errors.Wrapf(err, "cannot load template for %s", templateName)
 	}
 	s := []string{strings.TrimSpace(year), "-", strings.Replace(strings.TrimSpace(strings.ToLower(city)), " ", "-", 10)}
 	slug := strings.Join(s, "")
 	t, err := template.New(page+".md").Delims("[[", "]]").Parse(templateString)
 	if err != nil {
-		log.Fatal(err)
+		return errors.Wrapf(err, "template parse failed for %s", templateName)
 	}
 	data := struct {
 		City      string
@@ -52,15 +51,13 @@ func createEventContentFile(city, year, page string) (string, error) {
 	filePath := filepath.Join((paths.EventContentPath(city, year)), (page + ".md"))
 	f, err := os.Create(filePath)
 	if err != nil {
-		return "Cannot create", err
+		return errors.Wrapf(err, "cannot create file for %s", filePath)
 	}
 	defer f.Close()
 	t.Execute(f, data)
 	if err != nil {
-		fmt.Println(err, "template execute error")
-	} else {
-		fmt.Println("Created event content file for", city, "for year", year, "at", filePath)
+		return errors.Wrapf(err, "template execute error for %s", templateName)
 	}
-	return city, nil
+	return nil
 
 }