refac(cmd): mergeing, ordering and outsourcing cmd subcommands
This commit is contained in:
@ -1,48 +0,0 @@
|
||||
package pressure
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"github.com/go-flucky/flucky/pkg/cli"
|
||||
"github.com/go-flucky/flucky/pkg/config"
|
||||
"github.com/go-flucky/flucky/pkg/storage"
|
||||
"github.com/go-flucky/flucky/pkg/types"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var listTemperatureCmd = &cobra.Command{
|
||||
Use: "list",
|
||||
Short: "Reading temperature values from different or specified sensors by arguments",
|
||||
Example: fmt.Sprintf("flucky pressure logs"),
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
|
||||
// read configuration
|
||||
cnf, err := config.Read(*configFile)
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
storageEndpoint, err := cnf.GetStorageEndpointURL()
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
measuredValues, err := storage.Read(ctx, storageEndpoint)
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
measuredValues = types.SelectMeasuredValues(types.MeasuredValueTypePressure, measuredValues)
|
||||
|
||||
cli.PrintMeasuredValues(measuredValues, cnf, os.Stdout)
|
||||
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
pressureCmd.AddCommand(listTemperatureCmd)
|
||||
}
|
||||
@ -1,27 +1,133 @@
|
||||
package pressure
|
||||
|
||||
import (
|
||||
"github.com/Masterminds/semver"
|
||||
"context"
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/go-flucky/flucky/pkg/cli"
|
||||
"github.com/go-flucky/flucky/pkg/config"
|
||||
"github.com/go-flucky/flucky/pkg/sensor"
|
||||
"github.com/go-flucky/flucky/pkg/storage"
|
||||
"github.com/go-flucky/flucky/pkg/types"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var (
|
||||
compression bool
|
||||
configFile *string
|
||||
configFile string
|
||||
save bool
|
||||
round float64
|
||||
|
||||
version *semver.Version
|
||||
)
|
||||
|
||||
var pressureCmd = &cobra.Command{
|
||||
Use: "pressure",
|
||||
Short: "List air pressure values from different or specified sensors by arguments",
|
||||
}
|
||||
// InitCmd initialize all pressure subcommands
|
||||
func InitCmd(cmd *cobra.Command) error {
|
||||
|
||||
// Execute a
|
||||
func InitCmd(cmd *cobra.Command, cnfFile *string) {
|
||||
configFile = cnfFile
|
||||
pressureCmd := &cobra.Command{
|
||||
Use: "pressure",
|
||||
Short: "Operates with pressure values",
|
||||
}
|
||||
|
||||
listPressuresCmd := &cobra.Command{
|
||||
Use: "list",
|
||||
Short: "List pressure values from specified or all sensors",
|
||||
Example: fmt.Sprintf("flucky pressure list"),
|
||||
RunE: listHumidities,
|
||||
}
|
||||
|
||||
readPressuresCmd := &cobra.Command{
|
||||
Use: "read",
|
||||
Short: "Read pressure values from specified or all sensors",
|
||||
Example: fmt.Sprintf("flucky pressure read"),
|
||||
RunE: readPressure,
|
||||
}
|
||||
readPressuresCmd.Flags().BoolVar(&save, "save", true, "Save humidities")
|
||||
readPressuresCmd.Flags().BoolVar(&compression, "compression", true, "Compress measured with logged temperatures")
|
||||
readPressuresCmd.Flags().Float64VarP(&round, "round", "r", 0.25, "Round values. The value 0 deactivates the function")
|
||||
|
||||
pressureCmd.AddCommand(listPressuresCmd)
|
||||
pressureCmd.AddCommand(readPressuresCmd)
|
||||
cmd.AddCommand(pressureCmd)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func listHumidities(cmd *cobra.Command, args []string) error {
|
||||
|
||||
configFile, err := cmd.Flags().GetString("config")
|
||||
if err != nil {
|
||||
return fmt.Errorf("No config file defined")
|
||||
}
|
||||
|
||||
cnf, err := config.Read(configFile)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
storageEndpoint, err := cnf.GetStorageEndpointURL()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
measuredValues, err := storage.Read(ctx, storageEndpoint)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
measuredValues = types.SelectMeasuredValues(types.MeasuredValueTypePressure, measuredValues)
|
||||
|
||||
cli.PrintMeasuredValues(measuredValues, cnf, os.Stdout)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func readPressure(cmd *cobra.Command, args []string) error {
|
||||
|
||||
configFile, err := cmd.Flags().GetString("config")
|
||||
if err != nil {
|
||||
return fmt.Errorf("No config file defined")
|
||||
}
|
||||
|
||||
cnf, err := config.Read(configFile)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// fetch all temperature sensors or sensors by args
|
||||
sensors := make([]sensor.Sensor, 0)
|
||||
if len(args) == 0 {
|
||||
sensors = cnf.GetPressureSensors(config.ENABLED)
|
||||
} else {
|
||||
sensors = cnf.GetPressureSensorsByName(args)
|
||||
}
|
||||
|
||||
if len(sensors) == 0 {
|
||||
return fmt.Errorf("No sensors matched")
|
||||
}
|
||||
|
||||
measuredValues, err := sensor.Read(sensors, types.MeasuredValueTypePressure)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
measuredValues = types.SelectMeasuredValues(types.MeasuredValueTypePressure, measuredValues)
|
||||
|
||||
cli.PrintMeasuredValues(measuredValues, cnf, os.Stdout)
|
||||
|
||||
if save {
|
||||
storageEndpoint, err := cnf.GetStorageEndpointURL()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
err = storage.Write(ctx, measuredValues, storageEndpoint)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
||||
}
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
package pressure
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"github.com/go-flucky/flucky/pkg/storage"
|
||||
"github.com/go-flucky/flucky/pkg/types"
|
||||
|
||||
"github.com/go-flucky/flucky/pkg/cli"
|
||||
"github.com/go-flucky/flucky/pkg/config"
|
||||
"github.com/go-flucky/flucky/pkg/rgbled"
|
||||
"github.com/go-flucky/flucky/pkg/sensor"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var logs bool
|
||||
|
||||
var readPressureCmd = &cobra.Command{
|
||||
Use: "read",
|
||||
Short: "Operates with air pressure values",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
|
||||
// read configuration
|
||||
cnf, err := config.Read(*configFile)
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
// fetch all temperature sensors or sensors by args
|
||||
sensors := make([]sensor.Sensor, 0)
|
||||
if len(args) == 0 {
|
||||
sensors = cnf.GetPressureSensors(config.ENABLED)
|
||||
} else {
|
||||
sensors = cnf.GetPressureSensorsByName(args)
|
||||
}
|
||||
|
||||
if len(sensors) == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
rgbLEDs := cnf.GetRGBLEDs(config.ENABLED)
|
||||
if err := rgbled.Run(rgbLEDs); err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
measuredValues, err := sensor.Read(sensors, types.MeasuredValueTypePressure)
|
||||
if err := rgbled.Run(rgbLEDs); err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
cli.PrintMeasuredValues(measuredValues, cnf, os.Stdout)
|
||||
|
||||
if logs {
|
||||
storageEndpoint, err := cnf.GetStorageEndpointURL()
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
err = storage.Write(ctx, measuredValues, storageEndpoint)
|
||||
if err != nil {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
}
|
||||
|
||||
rgbled.Off(rgbLEDs)
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
pressureCmd.AddCommand(readPressureCmd)
|
||||
readPressureCmd.Flags().BoolVar(&logs, "logs", true, "Log temperature")
|
||||
readPressureCmd.Flags().BoolVar(&compression, "compression", true, "Compress measured with logged temperatures")
|
||||
readPressureCmd.Flags().Float64VarP(&round, "round", "r", 0.25, "Round values. The value 0 deactivates the function")
|
||||
}
|
||||
Reference in New Issue
Block a user