flucky/PKGBUILD
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(cmd): use pointer instead a copied object of the configFile environment

Browse Source
This commit is contained in:
Markus Pesch 2019-08-19 12:24:08 +02:00
parent 0e1ca7a8e1
commit c0aa155f36
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
29 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/cmd.go
View File

@ -7,10 +7,9 @@ import (
"github.com/go-flucky/flucky/cmd/compression" "github.com/go-flucky/flucky/cmd/compression"
"github.com/go-flucky/flucky/cmd/convert" "github.com/go-flucky/flucky/cmd/convert"
"github.com/go-flucky/flucky/cmd/pressure"
"github.com/go-flucky/flucky/cmd/daemon" "github.com/go-flucky/flucky/cmd/daemon"
"github.com/go-flucky/flucky/cmd/humidity" "github.com/go-flucky/flucky/cmd/humidity"
"github.com/go-flucky/flucky/cmd/pressure"
"github.com/go-flucky/flucky/cmd/rgbled" "github.com/go-flucky/flucky/cmd/rgbled"
"github.com/go-flucky/flucky/cmd/sensor" "github.com/go-flucky/flucky/cmd/sensor"
"github.com/go-flucky/flucky/cmd/temperature" "github.com/go-flucky/flucky/cmd/temperature"
@ -60,13 +59,13 @@ func Execute(version string) {
rootCmd.PersistentFlags().StringVar(&configFile, "config", "/etc/flucky/config.json", "Config file") rootCmd.PersistentFlags().StringVar(&configFile, "config", "/etc/flucky/config.json", "Config file")
compression.InitCmd(rootCmd, configFile) compression.InitCmd(rootCmd, &configFile)
convert.InitCmd(rootCmd, configFile) convert.InitCmd(rootCmd, &configFile)
daemon.InitCmd(rootCmd, configFile) daemon.InitCmd(rootCmd, &configFile)
humidity.InitCmd(rootCmd, configFile) humidity.InitCmd(rootCmd, &configFile)
pressure.InitCmd(rootCmd, configFile) pressure.InitCmd(rootCmd, &configFile)
rgbled.InitCmd(rootCmd, configFile) rgbled.InitCmd(rootCmd, &configFile)
sensor.InitCmd(rootCmd, configFile) sensor.InitCmd(rootCmd, &configFile)
temperature.InitCmd(rootCmd, configFile) temperature.InitCmd(rootCmd, &configFile)
rootCmd.Execute() rootCmd.Execute()
} }

4
cmd/compression/compression.go
View File

@ -9,7 +9,7 @@ import (
) )
var compression bool var compression bool
var configFile string var configFile *string
var compressionCmd = &cobra.Command{ var compressionCmd = &cobra.Command{
Use: "compression", Use: "compression",
@ -33,7 +33,7 @@ var compressionCmd = &cobra.Command{
}, },
} }
func InitCmd(cmd *cobra.Command, cnfFile string) { func InitCmd(cmd *cobra.Command, cnfFile *string) {
configFile = cnfFile configFile = cnfFile
cmd.AddCommand(compressionCmd) cmd.AddCommand(compressionCmd)

4
cmd/convert/convert.go
View File

@ -9,7 +9,7 @@ import (
) )
var compression bool var compression bool
var configFile string var configFile *string
var convertCmd = &cobra.Command{ var convertCmd = &cobra.Command{
Use: "convert", Use: "convert",
@ -37,7 +37,7 @@ var convertCmd = &cobra.Command{
} }
// Execute a // Execute a
func InitCmd(cmd *cobra.Command, cnfFile string) { func InitCmd(cmd *cobra.Command, cnfFile *string) {
configFile = cnfFile configFile = cnfFile
cmd.AddCommand(convertCmd) cmd.AddCommand(convertCmd)
convertCmd.Flags().BoolVar(&compression, "compression", true, "Compress measured values") convertCmd.Flags().BoolVar(&compression, "compression", true, "Compress measured values")

6
cmd/daemon/daemon.go
View File

@ -12,7 +12,7 @@ import (
var cleanCacheInterval string var cleanCacheInterval string
var compression bool var compression bool
var configFile string var configFile *string
var round float64 var round float64
var temperatureUnit string var temperatureUnit string
@ -21,7 +21,7 @@ var daemonCmd = &cobra.Command{
Short: "Read continuously data from all enabled sensors", Short: "Read continuously data from all enabled sensors",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -38,7 +38,7 @@ var daemonCmd = &cobra.Command{
}, },
} }
func InitCmd(cmd *cobra.Command, cnfFile string) { func InitCmd(cmd *cobra.Command, cnfFile *string) {
configFile = cnfFile configFile = cnfFile
cmd.AddCommand(daemonCmd) cmd.AddCommand(daemonCmd)
daemonCmd.Flags().BoolVar(&compression, "compression", true, "Compress measured values") daemonCmd.Flags().BoolVar(&compression, "compression", true, "Compress measured values")

4
cmd/humidity/humidity.go
View File

@ -5,7 +5,7 @@ import (
) )
var compression bool var compression bool
var configFile string var configFile *string
var round float64 var round float64
var humidityCmd = &cobra.Command{ var humidityCmd = &cobra.Command{
@ -14,7 +14,7 @@ var humidityCmd = &cobra.Command{
} }
// Execute a // Execute a
func InitCmd(cmd *cobra.Command, cnfFile string) { func InitCmd(cmd *cobra.Command, cnfFile *string) {
configFile = cnfFile configFile = cnfFile
cmd.AddCommand(humidityCmd) cmd.AddCommand(humidityCmd)

2
cmd/humidity/list.go
View File

@ -21,7 +21,7 @@ var listTemperatureCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

2
cmd/humidity/read.go
View File

@ -23,7 +23,7 @@ var readHumidityCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

2
cmd/pressure/list.go
View File

@ -21,7 +21,7 @@ var listTemperatureCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/pressure/pressure.go
View File

@ -5,7 +5,7 @@ import (
) )
var compression bool var compression bool
var configFile string var configFile *string
var round float64 var round float64
var pressureCmd = &cobra.Command{ var pressureCmd = &cobra.Command{
@ -14,7 +14,7 @@ var pressureCmd = &cobra.Command{
} }
// Execute a // Execute a
func InitCmd(cmd *cobra.Command, cnfFile string) { func InitCmd(cmd *cobra.Command, cnfFile *string) {
configFile = cnfFile configFile = cnfFile
cmd.AddCommand(pressureCmd) cmd.AddCommand(pressureCmd)

2
cmd/pressure/read.go
View File

@ -23,7 +23,7 @@ var readPressureCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/rgbled/add.go
View File

@ -21,7 +21,7 @@ var addRgbLedCmd = &cobra.Command{
flucky rgb-led add my-led GPIO13 GPIO17 GPIO26`), flucky rgb-led add my-led GPIO13 GPIO17 GPIO26`),
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -62,7 +62,7 @@ flucky rgb-led add my-led GPIO13 GPIO17 GPIO26`),
} }
// save new configuration // save new configuration
err = config.Write(cnf, configFile) err = config.Write(cnf, *configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/rgbled/disable.go
View File

@ -17,7 +17,7 @@ flucky rgb-led disable 9f8abfc5-91f3-480c-a42d-b990b6f89e5d`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -29,7 +29,7 @@ flucky rgb-led disable 9f8abfc5-91f3-480c-a42d-b990b6f89e5d`,
} }
// save new configuration // save new configuration
err = config.Write(cnf, configFile) err = config.Write(cnf, *configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/rgbled/enable.go
View File

@ -17,7 +17,7 @@ flucky rgb-led enable 9f8abfc5-91f3-480c-a42d-b990b6f89e5d`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -29,7 +29,7 @@ flucky rgb-led enable 9f8abfc5-91f3-480c-a42d-b990b6f89e5d`,
} }
// save new configuration // save new configuration
err = config.Write(cnf, configFile) err = config.Write(cnf, *configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

2
cmd/rgbled/list.go
View File

@ -15,7 +15,7 @@ var listRgbLedCmd = &cobra.Command{
Aliases: []string{"ls"}, Aliases: []string{"ls"},
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

2
cmd/rgbled/off.go
View File

@ -16,7 +16,7 @@ var offRgbLedCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

2
cmd/rgbled/on.go
View File

@ -20,7 +20,7 @@ flucky rgb-led on 1c5b9424-f6e9-4a37-be5c-77e531e94aab red`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/rgbled/remove.go
View File

@ -17,7 +17,7 @@ flucky rgb-led remove 9f8abfc5-91f3-480c-a42d-b990b6f89e5d`,
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -29,7 +29,7 @@ flucky rgb-led remove 9f8abfc5-91f3-480c-a42d-b990b6f89e5d`,
} }
// save new configuration // save new configuration
err = config.Write(cnf, configFile) err = config.Write(cnf, *configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/rgbled/rename.go
View File

@ -16,7 +16,7 @@ flucky rgb-led disable my-led my-sweet-led
flucky rgb-led disable 9f8abfc5-91f3-480c-a42d-b990b6f89e5d my-sweet-led`, flucky rgb-led disable 9f8abfc5-91f3-480c-a42d-b990b6f89e5d my-sweet-led`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -28,7 +28,7 @@ flucky rgb-led disable 9f8abfc5-91f3-480c-a42d-b990b6f89e5d my-sweet-led`,
} }
// save new configuration // save new configuration
err = config.Write(cnf, configFile) err = config.Write(cnf, *configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/rgbled/rgbled.go
View File

@ -4,7 +4,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
var configFile string var configFile *string
var rgbLedCmd = &cobra.Command{ var rgbLedCmd = &cobra.Command{
Use: "rgb-led", Use: "rgb-led",
@ -12,7 +12,7 @@ var rgbLedCmd = &cobra.Command{
} }
// InitCmd da // InitCmd da
func InitCmd(cmd *cobra.Command, cnfFile string) { func InitCmd(cmd *cobra.Command, cnfFile *string) {
configFile = cnfFile configFile = cnfFile
cmd.AddCommand(rgbLedCmd) cmd.AddCommand(rgbLedCmd)

4
cmd/sensor/add.go
View File

@ -25,7 +25,7 @@ flucky sensor add --wire-id 28-011432f0bb3d outdoor DS18B20
flucky sensor add --i2c-bus 1 --i2c-address 0x76 wetter-station BME280`, flucky sensor add --i2c-bus 1 --i2c-address 0x76 wetter-station BME280`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -80,7 +80,7 @@ flucky sensor add --i2c-bus 1 --i2c-address 0x76 wetter-station BME280`,
} }
// save new configuration // save new configuration
err = config.Write(cnf, configFile) err = config.Write(cnf, *configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/sensor/disable.go
View File

@ -15,7 +15,7 @@ var disableSensorCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -27,7 +27,7 @@ var disableSensorCmd = &cobra.Command{
} }
// save new configuration // save new configuration
err = config.Write(cnf, configFile) err = config.Write(cnf, *configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/sensor/enable.go
View File

@ -15,7 +15,7 @@ var enableSensorCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -27,7 +27,7 @@ var enableSensorCmd = &cobra.Command{
} }
// save new configuration // save new configuration
err = config.Write(cnf, configFile) err = config.Write(cnf, *configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/sensor/list.go
View File

@ -15,7 +15,7 @@ var listSensorCmd = &cobra.Command{
Aliases: []string{"ls"}, Aliases: []string{"ls"},
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -27,7 +27,7 @@ var listSensorCmd = &cobra.Command{
} }
// save new configuration // save new configuration
err = config.Write(cnf, configFile) err = config.Write(cnf, *configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/sensor/remove.go
View File

@ -15,7 +15,7 @@ var rmSensorCmd = &cobra.Command{
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -27,7 +27,7 @@ var rmSensorCmd = &cobra.Command{
} }
// save new configuration // save new configuration
err = config.Write(cnf, configFile) err = config.Write(cnf, *configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/sensor/rename.go
View File

@ -15,7 +15,7 @@ var renameSensorCmd = &cobra.Command{
Example: fmt.Sprintf("flucky sensor rename indoor outdoor\nflucky sensor rename f98b00ea-a9b2-4e00-924f-113859d0af2d outdoor"), Example: fmt.Sprintf("flucky sensor rename indoor outdoor\nflucky sensor rename f98b00ea-a9b2-4e00-924f-113859d0af2d outdoor"),
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
@ -27,7 +27,7 @@ var renameSensorCmd = &cobra.Command{
} }
// save new configuration // save new configuration
err = config.Write(cnf, configFile) err = config.Write(cnf, *configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/sensor/sensor.go
View File

@ -4,7 +4,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
var configFile string var configFile *string
var sensorCmd = &cobra.Command{ var sensorCmd = &cobra.Command{
Use: "sensor", Use: "sensor",
@ -12,7 +12,7 @@ var sensorCmd = &cobra.Command{
} }
// InitCmd da // InitCmd da
func InitCmd(cmd *cobra.Command, cnfFile string) { func InitCmd(cmd *cobra.Command, cnfFile *string) {
configFile = cnfFile configFile = cnfFile
cmd.AddCommand(sensorCmd) cmd.AddCommand(sensorCmd)

2
cmd/temperature/list.go
View File

@ -21,7 +21,7 @@ var listTemperatureCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

2
cmd/temperature/read.go
View File

@ -25,7 +25,7 @@ var readTemperatureCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// read configuration // read configuration
cnf, err := config.Read(configFile) cnf, err := config.Read(*configFile)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }

4
cmd/temperature/temperature.go
View File

@ -7,7 +7,7 @@ import (
) )
var compression bool var compression bool
var configFile string var configFile *string
var round float64 var round float64
var temperatureCmd = &cobra.Command{ var temperatureCmd = &cobra.Command{
@ -17,7 +17,7 @@ var temperatureCmd = &cobra.Command{
} }
// Execute a // Execute a
func InitCmd(cmd *cobra.Command, cnfFile string) { func InitCmd(cmd *cobra.Command, cnfFile *string) {
configFile = cnfFile configFile = cnfFile
cmd.AddCommand(temperatureCmd) cmd.AddCommand(temperatureCmd)