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

fix(cmd/temperature/read): use measured values instaed own type

Browse Source
This commit is contained in:
Markus Pesch
2019-06-25 22:56:09 +02:00
parent 08c2cbbf57
commit 003fe8ab9e
9 changed files with 112 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/cmd.go
View File

@ -8,6 +8,7 @@ import (
"github.com/go-flucky/flucky/cmd/daemon"
"github.com/go-flucky/flucky/cmd/rgbled"
"github.com/go-flucky/flucky/cmd/sensor"
"github.com/go-flucky/flucky/cmd/temperature"
"github.com/go-flucky/flucky/pkg/types"
"github.com/go-flucky/flucky/pkg/config"
@ -59,6 +60,6 @@ func Execute(version string) {
//humidity.InitCmd(rootCmd, configFile)
rgbled.InitCmd(rootCmd, configFile)
sensor.InitCmd(rootCmd, configFile)
//temperature.InitCmd(rootCmd, configFile)
temperature.InitCmd(rootCmd, configFile)
rootCmd.Execute()
}

51
cmd/temperature/compression.go
View File

@ -1,35 +1,28 @@
package temperature
import (
"log"
// var compressTemperatureCmd = &cobra.Command{
// Use: "compress",
// Short: "Compress temperature logfiles",
// Args: cobra.ExactArgs(1),
// Example: `flucky temperature compress /var/log/flucky/temperature.json
// flucky temperature compress /var/log/flucky/temperature.xml`,
// Run: func(cmd *cobra.Command, args []string) {
"github.com/go-flucky/flucky/pkg/logfile"
"github.com/spf13/cobra"
)
// temperatureLogfile := logfile.New(args[0])
// temperatures, err := temperatureLogfile.ReadTemperatures()
// if err != nil {
// log.Fatalln(err)
// }
var compressTemperatureCmd = &cobra.Command{
Use: "compress",
Short: "Compress temperature logfiles",
Args: cobra.ExactArgs(1),
Example: `flucky temperature compress /var/log/flucky/temperature.json
flucky temperature compress /var/log/flucky/temperature.xml`,
Run: func(cmd *cobra.Command, args []string) {
// temperatures = logfile.CompressTemperature(temperatures)
temperatureLogfile := logfile.New(args[0])
temperatures, err := temperatureLogfile.ReadTemperatures()
if err != nil {
log.Fatalln(err)
}
// err = temperatureLogfile.WriteTemperatures(temperatures)
// if err != nil {
// log.Fatalln(err)
// }
// },
// }
temperatures = logfile.CompressTemperature(temperatures)
err = temperatureLogfile.WriteTemperatures(temperatures)
if err != nil {
log.Fatalln(err)
}
},
}
func init() {
temperatureCmd.AddCommand(compressTemperatureCmd)
}
// func init() {
// temperatureCmd.AddCommand(compressTemperatureCmd)
// }

59
cmd/temperature/convert.go
View File

@ -1,39 +1,32 @@
package temperature
import (
"log"
// var convertTemperatureCmd = &cobra.Command{
// Use: "convert",
// Short: "Convert temperature logfiles into other markup language",
// Args: cobra.ExactArgs(2),
// Example: "flucky temperature convert /var/log/flucky/temperature.json /var/log/flucky/temperature.xml",
// Run: func(cmd *cobra.Command, args []string) {
"github.com/go-flucky/flucky/pkg/logfile"
"github.com/spf13/cobra"
)
// temperatureLogfileInput := logfile.New(args[0])
// temperatures, err := temperatureLogfileInput.ReadTemperatures()
// if err != nil {
// log.Fatalln(err)
// }
var convertTemperatureCmd = &cobra.Command{
Use: "convert",
Short: "Convert temperature logfiles into other markup language",
Args: cobra.ExactArgs(2),
Example: "flucky temperature convert /var/log/flucky/temperature.json /var/log/flucky/temperature.xml",
Run: func(cmd *cobra.Command, args []string) {
// if compression {
// temperatures = logfile.CompressTemperature(temperatures)
// }
temperatureLogfileInput := logfile.New(args[0])
temperatures, err := temperatureLogfileInput.ReadTemperatures()
if err != nil {
log.Fatalln(err)
}
// temperatureLogfileOutput := logfile.New(args[1])
// err = temperatureLogfileOutput.WriteTemperatures(temperatures)
// if err != nil {
// log.Fatalln(err)
// }
// },
// }
if compression {
temperatures = logfile.CompressTemperature(temperatures)
}
temperatureLogfileOutput := logfile.New(args[1])
err = temperatureLogfileOutput.WriteTemperatures(temperatures)
if err != nil {
log.Fatalln(err)
}
},
}
func init() {
temperatureCmd.AddCommand(convertTemperatureCmd)
convertTemperatureCmd.Flags().BoolVar(&compression, "compression", true, "Compress measured values")
convertTemperatureCmd.Flags().Float64Var(&round, "round", 0.25, "Round values. The value 0 deactivates the function")
}
// func init() {
// temperatureCmd.AddCommand(convertTemperatureCmd)
// convertTemperatureCmd.Flags().BoolVar(&compression, "compression", true, "Compress measured values")
// convertTemperatureCmd.Flags().Float64Var(&round, "round", 0.25, "Round values. The value 0 deactivates the function")
// }

6
cmd/temperature/list.go
View File

@ -23,14 +23,14 @@ var listTemperatureCmd = &cobra.Command{
log.Fatalln(err)
}
temperatureLogfile := logfile.New(cnf.Device.TemperatureLogfile)
logfile := logfile.New(cnf)
temperatures, err := temperatureLogfile.ReadTemperatures()
measuredValues, err := logfile.Read()
if err != nil {
log.Fatalln(err)
}
cli.PrintTemperatures(temperatures, cnf, os.Stdout)
cli.PrintMeasuredValues(measuredValues, cnf, os.Stdout)
},
}

20
cmd/temperature/read.go
View File

@ -33,31 +33,25 @@ var readTemperatureCmd = &cobra.Command{
rgbled.Run(rgbLEDs)
// fetch all temperature sensors or sensors by args
temperatureSensors := make([]sensor.TemperatureSensor, 0)
sensors := make([]sensor.Sensor, 0)
if len(args) == 0 {
temperatureSensors = cnf.GetTemperatureSensors(config.ENABLED)
sensors = cnf.GetTemperatureSensors(config.ENABLED)
} else {
temperatureSensors = cnf.GetTemperatureSensorsByName(args)
sensors = cnf.GetTemperatureSensorsByName(args)
}
measurementUnit, err := sensor.SelectTemperatureMeasurementUnit(temperatureUnit)
if err != nil {
rgbled.Error(rgbLEDs)
log.Fatalf("Can not parse temperature unit: %v", temperatureUnit)
}
temperatures, err := sensor.ReadTemperatures(temperatureSensors, measurementUnit, round)
measuredValues, err := sensor.Read(sensors)
if err != nil {
rgbled.Error(rgbLEDs)
log.Fatalln(err)
}
// print temperatures on stdout
cli.PrintTemperatures(temperatures, cnf, os.Stdout)
cli.PrintMeasuredValues(measuredValues, cnf, os.Stdout)
if logs {
temperatureLogfile := logfile.New(cnf.Device.TemperatureLogfile)
err := logfile.AppendTemperatures(temperatureLogfile, compression, temperatures)
logfile := logfile.New(cnf)
err := logfile.Append(compression, measuredValues)
if err != nil {
rgbled.Error(rgbLEDs)
log.Fatalln(err)