Make the output of show speaker look nicer

The output for each is colorized, and now it shows the name not the filename.

Fixes #114

Signed-off-by: Matt Stratton <[email protected]>

Author: mattstratton

speaker/speaker.go

@@ -264,43 +264,59 @@ func SpeakerImage(srcPath, speaker, city, year string) (imageFile string) {
 func ShowSpeakers(city, year string) (err error) {
 	var selection string
 
-	options, _ := GetSpeakers(city, year)
-	options = append(options, "Return to Main Menu")
+	speakerList, _ := GetSpeakers(city, year)
+	options2, _ := listSpeakerNames(speakerList, city, year)
+
+	options2 = append(options2, "Return to Main Menu")
 	for selection != "Return to Main Menu" {
 		prompt := &survey.Select{
 			Message: "Select a speaker:",
-			Options: options,
+			Options: options2,
 		}
 		survey.AskOne(prompt, &selection, nil)
 		if selection == "Return to Main Menu" {
 			return
 		}
+		speakerFileName := strings.Join([]string{strings.TrimSpace(names.NameClean(selection)), ".md"}, "")
+
 		var mySpeaker model.Speaker
-		mySpeaker, err = GetSpeakerInfo(selection, city, year)
+		mySpeaker, err = GetSpeakerInfo(speakerFileName, city, year)
+		fmt.Println()
 		color.Cyan("+-+-+-+-+-+-+-+-+-+-+-+-+-+-+")
-		fmt.Println("Name is " + mySpeaker.Title)
+		fmt.Fprintf(color.Output, "%s %s\n", color.CyanString("Name: "), color.GreenString(mySpeaker.Title))
+
 		if mySpeaker.Website != "" {
-			fmt.Println("Website is " + mySpeaker.Website)
+			fmt.Fprintf(color.Output, "%s %s\n", color.CyanString("WebsiteName: "), color.GreenString(mySpeaker.Website))
 		}
 		if mySpeaker.Twitter != "" {
-			fmt.Println("Twitter is @" + mySpeaker.Twitter)
+			fmt.Fprintf(color.Output, "%s %s\n", color.CyanString("Twitter: "), color.GreenString(fmt.Sprintf("@%s", mySpeaker.Twitter)))
 		}
 		if mySpeaker.Facebook != "" {
-			fmt.Println("Facebook is " + mySpeaker.Facebook)
+			fmt.Fprintf(color.Output, "%s %s\n", color.CyanString("Facebook: "), color.GreenString(mySpeaker.Facebook))
 		}
 		if mySpeaker.Linkedin != "" {
-			fmt.Println("Website is " + mySpeaker.Linkedin)
+			fmt.Fprintf(color.Output, "%s %s\n", color.CyanString("LinkedIn: "), color.GreenString(mySpeaker.Linkedin))
 		}
 		if mySpeaker.Github != "" {
-			fmt.Println("Github is @" + mySpeaker.Github)
+			fmt.Fprintf(color.Output, "%s %s\n", color.CyanString("GitHub: "), color.GreenString(mySpeaker.Github))
 		}
 		if mySpeaker.Gitlab != "" {
-			fmt.Println("Gitlab is " + mySpeaker.Gitlab)
+			fmt.Fprintf(color.Output, "%s %s\n", color.CyanString("GitLab: "), color.GreenString(mySpeaker.Gitlab))
 		}
 		if mySpeaker.Bio != "" {
-			fmt.Println("Bio is " + mySpeaker.Bio)
+			fmt.Fprintf(color.Output, "%s %s\n", color.CyanString("Bio: "), color.GreenString(mySpeaker.Bio))
 		}
 		color.Cyan("+-+-+-+-+-+-+-+-+-+-+-+-+-+-+")
+		fmt.Println()
+	}
+	return
+}
+
+func listSpeakerNames(speakers []string, city string, year string) (speakerFullNames []string, err error) {
+	for _, f := range speakers {
+		var mySpeaker model.Speaker
+		mySpeaker, err = GetSpeakerInfo(f, city, year)
+		speakerFullNames = append(speakerFullNames, mySpeaker.Title)
 	}
 	return
 }

speaker/speaker_utils.go

@@ -1,7 +1,6 @@
 package speaker
 
 import (
-	"fmt"
 	"io/ioutil"
 	"log"
 	"path/filepath"
@@ -19,14 +18,12 @@ func GetSpeakers(city, year string) ([]string, error) {
 
 	speakerdir := filepath.Join(paths.EventContentPath(city, year), "speakers")
 
-	fmt.Println(speakerdir)
 	files, err := ioutil.ReadDir(speakerdir)
 
 	if err != nil {
 		return nil, errors.Wrap(err, "read speaker directory failed")
 	}
 	var s []string
-	// s := make([]string, len(files))
 	for _, f := range files {
 		s = append(s, f.Name())
 	}
@@ -35,22 +32,8 @@ func GetSpeakers(city, year string) ([]string, error) {
 
 func GetSpeakerInfo(file, city, year string) (speaker model.Speaker, err error) {
 
-	// speakerPerson := `+++
-	// Website = ""
-	// Title = "Rainbow Dash"
-	// Twitter = ""
-	// date = "2016-12-08T20:55:58-06:00"
-	// Type = "speaker"
-	// Image = "rainbow-dash.png"
-	// Facebook = ""
-	// Linkedin = ""
-	// Pronouns = ""
-	// +++
-	// Food-truck SpaceTeam pivot
-	// `
 	filePath := filepath.Join(paths.EventContentPath(city, year), "speakers", file)
 	dat, err := ioutil.ReadFile(filePath)
-	// lines.WriteTo(os.Stdout)
 	m := front.NewMatter()
 	m.Handle("+++", TOMLHandler)
 
@@ -78,20 +61,6 @@ func GetSpeakerInfo(file, city, year string) (speaker model.Speaker, err error)
 // TOMLHandler decodes ymal string into a go map[string]interface{}
 func TOMLHandler(front string) (map[string]interface{}, error) {
 
-	// type thing struct {
-	// 	Name      string
-	// 	Title     string
-	// 	Website   string `toml:"website,omitempty"`
-	// 	Twitter   string `toml:"twitter,omitempty"`
-	// 	Facebook  string `toml:"facebook,omitempty"`
-	// 	Linkedin  string `toml:"linkedin,omitempty"`
-	// 	Github    string `toml:"github,omitempty"`
-	// 	Gitlab    string `toml:"gitlab,omitempty"`
-	// 	ImagePath string `toml:"image,omitempty"`
-	// 	Bio       string
-	// }
-
-	// var stuff thing
 	var stuff model.Speaker
 	if _, err := toml.Decode(front, &stuff); err != nil {
 		log.Fatal(err)

testdata/content/events/2017-ponyville/speakers/matt-stratton.md

@@ -6,6 +6,7 @@ twitter = "mattstratton"
 facebook = "https://www.facebook.com/matt.stratton"
 linkedin = "https://www.linkedin.com/in/mattstratton/"
 github = "mattstratton"
-gitlab = "mattstratton"image = "matt-stratton.jpg"
+gitlab = "mattstratton"
+image = "matt-stratton.jpg"
 +++