First pass at storing user settings separately #2896

src/github.com/getlantern/flashlight/settings/settings.go

@@ -2,11 +2,15 @@
 package settings
 
 import (
+	"io/ioutil"
 	"net/http"
+	"path/filepath"
 	"sync"
 
+	"github.com/getlantern/appdir"
 	"github.com/getlantern/flashlight/config"
 	"github.com/getlantern/launcher"
+	"github.com/getlantern/yaml"
 
 	"github.com/getlantern/flashlight/ui"
 	"github.com/getlantern/golog"
@@ -22,7 +26,10 @@ var (
 	cfgMutex      sync.RWMutex
 	settingsMutex sync.RWMutex
 	baseSettings  *Settings
+	settings      *Settings
 	httpClient    *http.Client
+	name          = "settings.yaml"
+	dir           = appdir.General("Lantern")
 )
 
 type Settings struct {
@@ -34,6 +41,26 @@ type Settings struct {
 	ProxyAll     bool
 }
 
+func Load(version, revisionDate, buildDate string) {
+	// Create default settings that may or may not be overridden from an existing file
+	// on disk.
+	settings = &Settings{
+		Version:      version,
+		BuildDate:    buildDate,
+		RevisionDate: revisionDate,
+		AutoReport:   true,
+		AutoLaunch:   true,
+		ProxyAll:     false,
+	}
+	path := filepath.Join(dir, name)
+	if bytes, err := ioutil.ReadFile(path); err != nil {
+		return
+	} else if err := yaml.Unmarshal(bytes, settings); err != nil {
+		log.Errorf("Could not load yaml %v", err)
+		return
+	}
+}
+
 func Configure(cfg *config.Config, version, revisionDate string, buildDate string) {
 
 	cfgMutex.Lock()

src/github.com/getlantern/flashlight/settings/settings_test.go

@@ -0,0 +1,40 @@
+package settings
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBootstrapSettings(t *testing.T) {
+	version := "test"
+	revisionDate := "test"
+	buildDate := "test"
+	Load(version, revisionDate, buildDate)
+
+	assert.Equal(t, settings.AutoLaunch, true, "Should be set to auto launch")
+
+	// Reset the variables for loading the yaml.
+	name = "test.yaml"
+	dir = "."
+	//path := filepath.Join(dir, "test.yaml")
+
+	Load(version, revisionDate, buildDate)
+
+	assert.Equal(t, settings.AutoLaunch, false, "Should not be set to auto launch")
+	/*
+		set := &Settings{
+			Version:      version,
+			BuildDate:    buildDate,
+			RevisionDate: revisionDate,
+			AutoReport:   true,
+			AutoLaunch:   true,
+			ProxyAll:     false,
+		}
+		if bytes, err := yaml.Marshal(set); err != nil {
+			t.Fail()
+		} else if err := ioutil.WriteFile(path, bytes, 0644); err != nil {
+			t.Fail()
+		}
+	*/
+}