also store the keyer settings in the log

core/app/app.go

@@ -217,10 +217,15 @@ func (c *Controller) openCurrentLog() error {
 			log.Printf("Cannot write contest settings to %s: %v", filepath.Base(filename), err)
 			return err
 		}
+		err = store.WriteKeyer(c.Keyer.KeyerSettings())
+		if err != nil {
+			log.Printf("Cannot write contest settings to %s: %v", filepath.Base(filename), err)
+			return err
+		}
 	}
 
 	var newLogbook *logbook.Logbook
-	qsos, station, contest, err := store.ReadAll()
+	qsos, station, contest, keyer, err := store.ReadAll()
 	if err != nil {
 		log.Printf("Cannot load %s: %v", filepath.Base(filename), err)
 		newLogbook = logbook.New(c.clock)
@@ -232,6 +237,10 @@ func (c *Controller) openCurrentLog() error {
 		if contest != nil {
 			c.Settings.SetContest(*contest)
 		}
+		c.Keyer.SetWriter(store)
+		if keyer != nil {
+			c.Keyer.SetKeyer(*keyer)
+		}
 		newLogbook = logbook.Load(c.clock, qsos)
 	}
 	c.changeLogbook(filename, store, newLogbook)
@@ -309,8 +318,24 @@ func (c *Controller) New() {
 		c.view.ShowErrorDialog("Cannot create %s: %v", filepath.Base(filename), err)
 		return
 	}
+	err = store.WriteStation(c.Settings.Station())
+	if err != nil {
+		c.view.ShowErrorDialog("Cannot save as %s: %v", filepath.Base(filename), err)
+		return
+	}
+	err = store.WriteContest(c.Settings.Contest())
+	if err != nil {
+		c.view.ShowErrorDialog("Cannot save as %s: %v", filepath.Base(filename), err)
+		return
+	}
+	err = store.WriteKeyer(c.Keyer.KeyerSettings())
+	if err != nil {
+		c.view.ShowErrorDialog("Cannot save as %s: %v", filepath.Base(filename), err)
+		return
+	}
 
 	c.Settings.SetWriter(store)
+	c.Keyer.SetWriter(store)
 	c.changeLogbook(filename, store, logbook.New(c.clock))
 	c.Refresh()
 
@@ -328,7 +353,7 @@ func (c *Controller) Open() {
 	}
 
 	store := store.NewFileStore(filename)
-	qsos, station, contest, err := store.ReadAll()
+	qsos, station, contest, keyer, err := store.ReadAll()
 	if err != nil {
 		c.view.ShowErrorDialog("Cannot open %s: %v", filepath.Base(filename), err)
 		return
@@ -341,6 +366,10 @@ func (c *Controller) Open() {
 	if contest != nil {
 		c.Settings.SetContest(*contest)
 	}
+	c.Keyer.SetWriter(store)
+	if keyer != nil {
+		c.Keyer.SetKeyer(*keyer)
+	}
 	log := logbook.Load(c.clock, qsos)
 	c.changeLogbook(filename, store, log)
 	c.Refresh()
@@ -372,6 +401,11 @@ func (c *Controller) SaveAs() {
 		c.view.ShowErrorDialog("Cannot save as %s: %v", filepath.Base(filename), err)
 		return
 	}
+	err = store.WriteKeyer(c.Keyer.KeyerSettings())
+	if err != nil {
+		c.view.ShowErrorDialog("Cannot save as %s: %v", filepath.Base(filename), err)
+		return
+	}
 	err = c.Logbook.WriteAll(store)
 	if err != nil {
 		c.view.ShowErrorDialog("Cannot save as %s: %v", filepath.Base(filename), err)

core/keyer/keyer.go

@@ -2,6 +2,7 @@ package keyer
 
 import (
 	"bytes"
+	"fmt"
 	"log"
 	"strings"
 	"text/template"
@@ -63,10 +64,11 @@ func New(settings core.Settings, client CWClient, keyer core.Keyer, workmode cor
 }
 
 type Keyer struct {
-	writer Writer
-	view   View
-	client CWClient
-	values KeyerValueProvider
+	writer     Writer
+	view       View
+	client     CWClient
+	values     KeyerValueProvider
+	savedKeyer core.Keyer
 
 	listeners []interface{}
 
@@ -101,6 +103,7 @@ func (k *Keyer) SetWriter(writer Writer) {
 }
 
 func (k *Keyer) SetKeyer(keyer core.Keyer) {
+	k.savedKeyer = keyer
 	k.wpm = keyer.WPM
 	for i, pattern := range keyer.SPMacros {
 		k.spPatterns[i] = pattern
@@ -110,6 +113,10 @@ func (k *Keyer) SetKeyer(keyer core.Keyer) {
 		k.runPatterns[i] = pattern
 		k.runTemplates[i], _ = template.New("").Parse(pattern)
 	}
+	k.showPatterns()
+	if k.view != nil {
+		k.view.SetSpeed(k.wpm)
+	}
 }
 
 func (k *Keyer) SetView(view View) {
@@ -141,9 +148,41 @@ func (k *Keyer) SetValues(values KeyerValueProvider) {
 }
 
 func (k *Keyer) Save() {
-	log.Println("TODO: persist the keyer settings")
-	// TODO get a core.Keyer from our internal data
-	// TODO err := k.writer.Write(keyer)
+	keyer, modified := k.getKeyerSettings()
+	if !modified {
+		return
+	}
+	k.savedKeyer = keyer
+	k.writer.WriteKeyer(keyer)
+}
+
+func (k *Keyer) KeyerSettings() core.Keyer {
+	keyer, _ := k.getKeyerSettings()
+	return keyer
+}
+
+func (k *Keyer) getKeyerSettings() (core.Keyer, bool) {
+	var keyer core.Keyer
+	keyer.WPM = k.wpm
+	keyer.SPMacros = make([]string, len(k.spPatterns))
+	for i := range keyer.SPMacros {
+		pattern, ok := k.spPatterns[i]
+		if !ok {
+			continue
+		}
+		keyer.SPMacros[i] = pattern
+	}
+	keyer.RunMacros = make([]string, len(k.runPatterns))
+	for i := range keyer.RunMacros {
+		pattern, ok := k.runPatterns[i]
+		if !ok {
+			continue
+		}
+		keyer.RunMacros[i] = pattern
+	}
+
+	modified := (fmt.Sprintf("%v", keyer) != fmt.Sprintf("%v", k.savedKeyer))
+	return keyer, modified
 }
 
 func (k *Keyer) EnterSpeed(speed int) {