Refactor talk into smaller chunks

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

Author: mattstratton

talk/get_talk_info.go

@@ -8,14 +8,13 @@ import (
 
 	"github.com/BurntSushi/toml"
 	"github.com/devopsdays/devopsdays-cli/helpers/paths"
-	"github.com/devopsdays/devopsdays-cli/model"
 	"github.com/gernest/front"
 	"github.com/pkg/errors"
 )
 
 // GetTalkInfo loads in a talk file and returns a struct with the information, decoded
 // from the TOML in the frontmatter
-func GetTalkInfo(file, city, year string) (talk *model.Talk, err error) {
+func GetTalkInfo(file, city, year string) (talk *Talk, err error) {
 
 	filePath := filepath.Join(paths.EventContentPath(city, year), "program", file)
 	dat, err := ioutil.ReadFile(filePath)
@@ -30,7 +29,7 @@ func GetTalkInfo(file, city, year string) (talk *model.Talk, err error) {
 		return talk, errors.Wrap(err, "get list of talks failed")
 	}
 
-	talk = &model.Talk{
+	talk = &Talk{
 		Name:         file,
 		Title:        f["Title"].(string),
 		Description:  f["Description"].(string),
@@ -51,7 +50,7 @@ func GetTalkInfo(file, city, year string) (talk *model.Talk, err error) {
 // TOMLHandler decodes TOML string into a go map[string]interface{}
 func TOMLHandler(front string) (map[string]interface{}, error) {
 
-	var thisTalk model.Talk
+	var thisTalk Talk
 	if _, err := toml.Decode(front, &thisTalk); err != nil {
 
 		log.Fatal(err)
@@ -72,4 +71,5 @@ func TOMLHandler(front string) (map[string]interface{}, error) {
 	}
 
 	return x, nil
+
 }

talk/load_talks.go

@@ -0,0 +1,24 @@
+package talk
+
+import (
+	"io/ioutil"
+	"path/filepath"
+
+	"github.com/devopsdays/devopsdays-cli/helpers/paths"
+	"github.com/pkg/errors"
+)
+
+func loadTalks(city, year string) (talks []*Talk, err error) {
+	talksDir := filepath.Join(paths.EventContentPath(city, year), "program")
+	files, err := ioutil.ReadDir(talksDir)
+	if err != nil {
+		return nil, errors.Wrap(err, "read directory failed")
+	}
+
+	for _, f := range files {
+		thisTalk, _ := GetTalkInfo(f.Name(), city, year)
+		talks = append(talks, thisTalk)
+	}
+
+	return
+}

talk/show_talks.go

@@ -0,0 +1,59 @@
+package talk
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+
+	"github.com/AlecAivazis/survey"
+	"github.com/fatih/color"
+)
+
+func ShowTalks(city, year string) (err error) {
+	var selection string
+
+	myTalks, err := loadTalks(city, year)
+
+	var options2 []string
+
+	for _, d := range myTalks {
+		options2 = append(options2, d.Title)
+	}
+	options2 = append(options2, "Return to Main Menu")
+	for selection != "Return to Main Menu" {
+		prompt := &survey.Select{
+			Message: "Select a talk:",
+			Options: options2,
+		}
+		survey.AskOne(prompt, &selection, nil)
+		if selection == "Return to Main Menu" {
+			return
+		}
+		var myTalk *Talk
+		for _, d := range myTalks {
+			if d.Title == selection {
+				myTalk = d
+				break
+			}
+		}
+		s := reflect.ValueOf(myTalk).Elem()
+		typeOfT := s.Type()
+		fmt.Println()
+		color.Cyan("+-+-+-+-+-+-+-+-+-+-+-+-+-+-+")
+		for i := 0; i < s.NumField(); i++ {
+			f := s.Field(i)
+			if (typeOfT.Field(i).Name != "Name") && (f.Interface() != "") {
+				if f.Type() != reflect.TypeOf("") {
+					continue
+				}
+				str := f.Interface().(string)
+				str = strings.TrimSpace(str)
+				fmt.Fprintf(color.Output, "%s: %s\n", color.CyanString(typeOfT.Field(i).Name), color.GreenString(str))
+			}
+		}
+		color.Cyan("+-+-+-+-+-+-+-+-+-+-+-+-+-+-+")
+		fmt.Println()
+
+	}
+	return
+}

talk/talk.go

@@ -2,80 +2,18 @@
 // It also includes supporting and helper functions that are talk-releated.
 package talk
 
-import (
-	"fmt"
-	"io/ioutil"
-	"path/filepath"
-	"reflect"
-	"strings"
-
-	"github.com/AlecAivazis/survey"
-	"github.com/devopsdays/devopsdays-cli/helpers/paths"
-	"github.com/devopsdays/devopsdays-cli/model"
-	"github.com/fatih/color"
-	"github.com/pkg/errors"
-)
-
-func ShowTalks(city, year string) (err error) {
-	var selection string
-
-	myTalks, err := loadTalks(city, year)
-
-	var options2 []string
-
-	for _, d := range myTalks {
-		options2 = append(options2, d.Title)
-	}
-	options2 = append(options2, "Return to Main Menu")
-	for selection != "Return to Main Menu" {
-		prompt := &survey.Select{
-			Message: "Select a talk:",
-			Options: options2,
-		}
-		survey.AskOne(prompt, &selection, nil)
-		if selection == "Return to Main Menu" {
-			return
-		}
-		var myTalk *model.Talk
-		for _, d := range myTalks {
-			if d.Title == selection {
-				myTalk = d
-				break
-			}
-		}
-		s := reflect.ValueOf(myTalk).Elem()
-		typeOfT := s.Type()
-		fmt.Println()
-		color.Cyan("+-+-+-+-+-+-+-+-+-+-+-+-+-+-+")
-		for i := 0; i < s.NumField(); i++ {
-			f := s.Field(i)
-			if (typeOfT.Field(i).Name != "Name") && (f.Interface() != "") {
-				if f.Type() != reflect.TypeOf("") {
-					continue
-				}
-				str := f.Interface().(string)
-				str = strings.TrimSpace(str)
-				fmt.Fprintf(color.Output, "%s: %s\n", color.CyanString(typeOfT.Field(i).Name), color.GreenString(str))
-			}
-		}
-		color.Cyan("+-+-+-+-+-+-+-+-+-+-+-+-+-+-+")
-		fmt.Println()
-
-	}
-	return
-}
-
-func loadTalks(city, year string) (talks []*model.Talk, err error) {
-	talksDir := filepath.Join(paths.EventContentPath(city, year), "program")
-	files, err := ioutil.ReadDir(talksDir)
-	if err != nil {
-		return nil, errors.Wrap(err, "read directory failed")
-	}
-
-	for _, f := range files {
-		thisTalk, _ := GetTalkInfo(f.Name(), city, year)
-		talks = append(talks, thisTalk)
-	}
-
-	return
+// Talk defines a devopsdays event's talk
+type Talk struct {
+	Name         string
+	Title        string
+	Description  string   `toml:"description,omitempty"`
+	Speakers     []string `toml:"speakers, omitempty"`
+	YouTube      string   `toml:"youtube,omitempty"`
+	Vimeo        string   `toml:"vimeo,omitempty"`
+	Speakerdeck  string   `toml:"speakerdeck,omitempty"`
+	Slideshare   string   `toml:"slideshare,omitempty"`
+	Googleslides string   `toml:"googleslides,omitempty"`
+	PDF          string   `toml:"pdf,omitempty"`
+	Slides       string   `toml:"slides,omitempty"`
+	Abstract     string
 }