Conf dir

config/config.go

@@ -7,6 +7,7 @@ import (
 	"log"
 	"os"
 	"os/signal"
+	"path/filepath"
 	"syscall"
 )
 
@@ -15,7 +16,9 @@ type Configuration struct {
 	DeviceUUID   string  `json:"device-uuid"`
 	PulseSink    string  `json:"-"`
 	DeviceName   string  `json:"-"`
+	DataDirectory string `json:"data-directory"`
 	exitsSignals chan os.Signal
+	baseDir		 string
 }
 
 var Config = &Configuration{
@@ -24,28 +27,58 @@ var Config = &Configuration{
 	DeviceUUID: uuid.NewString(),
 }
 
-func (c *Configuration) Load() {
-	data, err := ioutil.ReadFile(c.DeviceName + "/config.json")
+func (c *Configuration) Load(baseDir string) error {
+	if baseDir == "" {
+		var err error
+		baseDir, err = os.Getwd()
+		if err != nil {
+			return err
+		}
+	}
+
+	c.baseDir = baseDir
+	configFilePath := filepath.Join(c.baseDir, c.DeviceName, "config.json")
+	data, err := ioutil.ReadFile(configFilePath)
 	if err != nil || json.Unmarshal(data, &c) != nil {
-		log.Printf("%s is not valid - at new file will be created at program exit\n", c.DeviceName+"/config.json")
+		log.Printf("%s is not valid - a new file will be created at program exit\n", configFilePath)
+	}
+	if c.DataDirectory == "" {
+		c.DataDirectory = baseDir
 	}
+
 	c.exitsSignals = make(chan os.Signal, 1)
 	signal.Notify(c.exitsSignals, syscall.SIGINT, syscall.SIGTERM)
 
 	go func() {
 		<-c.exitsSignals
-		c.Store()
+		err := c.Store()
+		if err != nil {
+			os.Exit(1)
+		}
 		os.Exit(0)
 	}()
+
+	return nil
 }
 
-func (c *Configuration) Store() {
+func (c *Configuration) Store() error {
 	data, err := json.Marshal(&c)
 	if err != nil {
-		log.Printf("Warning: impossible to marshal configuration in json")
+		log.Printf("Warning: impossible to marshal configuration in json\n")
+		return err
+	}
+	configFilePath := filepath.Join(c.baseDir, c.DeviceName, "config.json")
+	dirPath := filepath.Join(c.baseDir, c.DeviceName)
+	if _, err := os.Stat(dirPath); os.IsNotExist(err) {
+		err = os.MkdirAll(dirPath, 0755)
+		if err != nil{
+			log.Printf("Warning : impossible to create config directory %s \n", filepath.Join(c.baseDir, c.DeviceName))
+			return err
+		}
 	}
-	err = ioutil.WriteFile(c.DeviceName+"/config.json", data, 0660)
+	err = ioutil.WriteFile(configFilePath, data, 0660)
 	if err != nil {
-		log.Printf("Warning : impossible to store config file %s \n", c.DeviceName+"/config.json")
+		log.Printf("Warning : impossible to store config file %s \n", configFilePath)
 	}
+	return err
 }

main.go

@@ -21,16 +21,38 @@ import (
 func main() {
 	var ifName string
 	var delay int64
+	var configurationBaseDir string
+	var flagsConfig config.Configuration
 
+	// These two are being used to construct the config path
+	// XXX if the config has been manually update, it could very well have a devicename that does not align with the directory it's in
+	flag.StringVar(&configurationBaseDir, "c", "", "Configuration base directory (default to current directory)")
 	flag.StringVar(&config.Config.DeviceName, "n", "goplay", "Specify device name")
+
+	// These two should override whatever is in the currently store config
+	flag.StringVar(&flagsConfig.DataDirectory, "d", "", "Data base directory (defaults to configuration directory)")
+	flag.StringVar(&flagsConfig.PulseSink, "sink", config.Config.PulseSink, "Specify Pulse Audio Sink - Linux only")
+
+	// These are not stored in permanent config
 	flag.StringVar(&ifName, "i", "eth0", "Specify interface")
 	flag.Int64Var(&delay, "delay", 0, "Specify hardware delay in ms")
-	flag.StringVar(&config.Config.PulseSink, "sink", config.Config.PulseSink, "Specify Pulse Audio Sink - Linux only")
 	flag.Parse() // after declaring flags we need to call it
 
-	config.Config.Load()
+	// Load the possibly existing config
+	err := config.Config.Load(configurationBaseDir)
+	if err != nil {
+		panic(err)
+	}
 	defer config.Config.Store()
 
+	// Override config specifics with command-line flags
+	if flagsConfig.DataDirectory != "" {
+		config.Config.DataDirectory = flagsConfig.DataDirectory
+	}
+	if flagsConfig.PulseSink != "" {
+		config.Config.PulseSink = flagsConfig.PulseSink
+	}
+
 	globals.ErrLog = log.New(os.Stderr, "Error:", log.LstdFlags|log.Lshortfile|log.Lmsgprefix)
 
 	iFace, err := net.InterfaceByName(ifName)

pairing/controller.go

@@ -1,10 +1,11 @@
 package pairing
 
 import (
-	"fmt"
 	"github.com/brutella/hc/db"
 	"github.com/brutella/hc/hap/pair"
 	"github.com/brutella/hc/util"
+	"goplay2/config"
+	"path/filepath"
 )
 
 type Controller struct {
@@ -37,7 +38,7 @@ func (c Controller) Handle(cont util.Container) (util.Container, error) {
 }
 
 func NewController(deviceName string) (*Controller, error) {
-	storage, err := util.NewFileStorage(fmt.Sprintf("%s/db", deviceName))
+	storage, err := util.NewFileStorage(filepath.Join(config.Config.DataDirectory, "db", deviceName))
 	if err != nil {
 		return nil, err
 	}