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

fix: implement repository pkg

Browse Source
This commit is contained in:
Markus Pesch
2020-05-21 17:40:24 +02:00
parent fb916c94ae
commit 8f1c7b10f7
50 changed files with 1619 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/root.go
View File

@ -83,7 +83,7 @@ func preRunError(cmd *cobra.Command, args []string) error {
Name: hostname,
CreationDate: postgresTimeStamp,
},
StorageEndpoint: "file:/var/log/flucky/sqlite.db?cache=shared&mode=memory",
StorageEndpoint: "sqlite3:///var/log/flucky/sqlite.db?cache=shared&mode=memory&FKSupport=True",
}
err = config.Write(&cnf, configFile)

117
cli/sensor/sensor.go
View File

@ -2,13 +2,16 @@ package sensor
import (
"fmt"
"net/url"
"os"
uuid "github.com/satori/go.uuid"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/cli"
"github.com/volker-raschek/flucky/pkg/config"
"github.com/volker-raschek/flucky/pkg/repository"
"github.com/volker-raschek/flucky/pkg/types"
"github.com/volker-raschek/go-logger/pkg/logger"
)
// InitCmd initialize all sensor subcommands
@ -39,7 +42,7 @@ flucky sensor add --i2c-bus 1 --i2c-address 0x76 wetter-station BME280`,
disableSensorCmd := &cobra.Command{
Use: "disable",
Short: "Disable Sensor",
Args: cobra.ExactArgs(1),
Args: cobra.MinimumNArgs(1),
Example: "flucky sensor disable outdoor",
RunE: disableSensor,
}
@ -48,7 +51,7 @@ flucky sensor add --i2c-bus 1 --i2c-address 0x76 wetter-station BME280`,
Use: "enable",
Short: "Enable Sensor",
Example: "flucky sensor enable outdoor",
Args: cobra.ExactArgs(1),
Args: cobra.MinimumNArgs(1),
RunE: enableSensor,
}
@ -64,10 +67,9 @@ flucky sensor add --i2c-bus 1 --i2c-address 0x76 wetter-station BME280`,
Short: "Remove Sensor",
Aliases: []string{"rm"},
Example: "flucky sensor remove outdoor",
Args: cobra.ExactArgs(1),
Args: cobra.MinimumNArgs(1),
RunE: removeSensor,
}
removeSensorCmd.Flags().Bool("definitive", true, "Remove the sensor definitive from the backend")
renameSensorCmd := &cobra.Command{
Use: "rename",
@ -162,17 +164,34 @@ func addSensor(cmd *cobra.Command, args []string) error {
return err
}
storageEndpoint, err := url.Parse(cnf.StorageEndpoint)
if err != nil {
return err
}
// loglevel, err := cmd.Flags().GetString("loglevel")
// if err != nil {
// return fmt.Errorf("No loglevel defined")
// }
flogger := logger.NewDefaultLogger(logger.LogLevelDebug)
repo, err := repository.New(storageEndpoint, flogger)
if err != nil {
return err
}
// add sensor entry to list
err = cnf.AddSensor(sensor)
err = repo.AddSensors(sensor)
if err != nil {
return err
}
// save new configuration
err = config.Write(cnf, configFile)
if err != nil {
return err
}
// err = config.Write(cnf, configFile)
// if err != nil {
// return err
// }
return nil
}
@ -189,17 +208,24 @@ func disableSensor(cmd *cobra.Command, args []string) error {
return err
}
err = cnf.DisableSensor(args[0])
storageEndpoint, err := url.Parse(cnf.StorageEndpoint)
if err != nil {
return err
}
err = config.Write(cnf, configFile)
// loglevel, err := cmd.Flags().GetString("loglevel")
// if err != nil {
// return fmt.Errorf("No loglevel defined")
// }
flogger := logger.NewDefaultLogger(logger.LogLevelDebug)
repo, err := repository.New(storageEndpoint, flogger)
if err != nil {
return err
}
return nil
return repo.DisableSensorsByNames(args...)
}
func enableSensor(cmd *cobra.Command, args []string) error {
@ -214,16 +240,24 @@ func enableSensor(cmd *cobra.Command, args []string) error {
return err
}
err = cnf.EnableSensor(args[0])
storageEndpoint, err := url.Parse(cnf.StorageEndpoint)
if err != nil {
return err
}
err = config.Write(cnf, configFile)
// loglevel, err := cmd.Flags().GetString("loglevel")
// if err != nil {
// return fmt.Errorf("No loglevel defined")
// }
flogger := logger.NewDefaultLogger(logger.LogLevelDebug)
repo, err := repository.New(storageEndpoint, flogger)
if err != nil {
return err
}
return nil
return repo.EnableSensorsByNames(args...)
}
func listSensors(cmd *cobra.Command, args []string) error {
@ -238,12 +272,30 @@ func listSensors(cmd *cobra.Command, args []string) error {
return err
}
err = cli.PrintSensors(cnf, os.Stdout)
storageEndpoint, err := url.Parse(cnf.StorageEndpoint)
if err != nil {
return err
}
err = config.Write(cnf, configFile)
// loglevel, err := cmd.Flags().GetString("loglevel")
// if err != nil {
// return fmt.Errorf("No loglevel defined")
// }
flogger := logger.NewDefaultLogger(logger.LogLevelDebug)
repo, err := repository.New(storageEndpoint, flogger)
if err != nil {
return err
}
// add sensor entry to list
sensors, err := repo.GetSensors()
if err != nil {
return err
}
err = cli.PrintSensors(sensors, os.Stdout)
if err != nil {
return err
}
@ -258,27 +310,29 @@ func removeSensor(cmd *cobra.Command, args []string) error {
return fmt.Errorf("No config file defined")
}
definitive, err := cmd.Flags().GetBool("definitive")
if err != nil {
return fmt.Errorf("No config file defined")
}
cnf, err := config.Read(configFile)
if err != nil {
return err
}
err = cnf.RemoveSensor(args[0], definitive)
storageEndpoint, err := url.Parse(cnf.StorageEndpoint)
if err != nil {
return err
}
err = config.Write(cnf, configFile)
// loglevel, err := cmd.Flags().GetString("loglevel")
// if err != nil {
// return fmt.Errorf("No loglevel defined")
// }
flogger := logger.NewDefaultLogger(logger.LogLevelDebug)
repo, err := repository.New(storageEndpoint, flogger)
if err != nil {
return err
}
return nil
return repo.RemoveSensorsByNames(args...)
}
func renameSensor(cmd *cobra.Command, args []string) error {
@ -293,15 +347,22 @@ func renameSensor(cmd *cobra.Command, args []string) error {
return err
}
err = cnf.RenameSensor(args[0], args[1])
storageEndpoint, err := url.Parse(cnf.StorageEndpoint)
if err != nil {
return err
}
err = config.Write(cnf, configFile)
// loglevel, err := cmd.Flags().GetString("loglevel")
// if err != nil {
// return fmt.Errorf("No loglevel defined")
// }
flogger := logger.NewDefaultLogger(logger.LogLevelDebug)
repo, err := repository.New(storageEndpoint, flogger)
if err != nil {
return err
}
return nil
return repo.RenameSensors(args[0], args[1])
}