fix: renamed packages

This commit is contained in:
2018-11-21 20:48:10 +01:00
parent 6d9368e86c
commit 1672663944
15 changed files with 206 additions and 121 deletions

View File

@ -10,7 +10,7 @@ import (
var addRemoteCmd = &cobra.Command{
Use: "add",
Short: "add",
Short: "Add Remove Server",
Args: cobra.ExactArgs(2),
Run: func(cmd *cobra.Command, args []string) {

View File

@ -10,7 +10,7 @@ import (
var listRemoteCmd = &cobra.Command{
Use: "list",
Short: "list",
Short: "List Remove Servers",
Run: func(cmd *cobra.Command, args []string) {
if err := remote.List(os.Stdout, configDir); err != nil {

View File

@ -3,7 +3,7 @@ package remote
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/remote"
"git.cryptic.systems/fh-trier/go-flucky/pkg/httpcall"
"github.com/spf13/cobra"
)
@ -14,7 +14,7 @@ var registerRemoteCmd = &cobra.Command{
Short: "register on remote servers",
Run: func(cmd *cobra.Command, args []string) {
if err := remote.RegisterDevice(configDir, force); err != nil {
if err := httpcall.RegisterDevice(configDir, force); err != nil {
log.Fatal(err)
}
},

View File

@ -8,7 +8,7 @@ var configDir string
var remoteCmd = &cobra.Command{
Use: "remote",
Short: "Manage Remote",
Short: "Manage Remote Server",
}
func InitCmd(cmd *cobra.Command, cnf string) {

View File

@ -9,9 +9,9 @@ import (
var all bool
var removeRemoteCmd = &cobra.Command{
Use: "remove",
Short: "remove",
var rmRemoteCmd = &cobra.Command{
Use: "rm",
Short: "Remove Remote Server",
Args: cobra.RangeArgs(0, 1),
Run: func(cmd *cobra.Command, args []string) {
@ -28,6 +28,6 @@ var removeRemoteCmd = &cobra.Command{
}
func init() {
remoteCmd.AddCommand(removeRemoteCmd)
removeRemoteCmd.Flags().BoolVarP(&all, "all", "a", false, "Select all remote connections")
remoteCmd.AddCommand(rmRemoteCmd)
rmRemoteCmd.Flags().BoolVarP(&all, "all", "a", false, "Select all remote connections")
}

View File

@ -1,24 +1,49 @@
package temperature
import (
"fmt"
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/sensor"
temperatureSensor "git.cryptic.systems/fh-trier/go-flucky/pkg/sensor/temperature"
"git.cryptic.systems/fh-trier/go-flucky/pkg/types"
"github.com/spf13/cobra"
)
var sensorType string
var addTemperatureSensorCmd = &cobra.Command{
Use: "add",
Short: "Add Temperature Sensor",
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
if err := sensor.AddTemperature(args[0], sensorName, configDir, wirePath); err != nil {
t, err := matchSensorTyp(sensorType)
if err != nil {
log.Fatal(err)
}
// DS18B20
if t == types.SENSOR_DS18B20 {
if err := temperatureSensor.AddDS18B20(args[0], sensorName, configDir, wirePath); err != nil {
log.Fatal(err)
}
}
},
}
func init() {
temperatureSensorCmd.AddCommand(addTemperatureSensorCmd)
addTemperatureSensorCmd.Flags().StringVarP(&sensorType, "type", "t", "DS18B20", "Sensor Types: DS18B20, DHT11")
}
func matchSensorTyp(sensorType string) (types.SensorType, error) {
switch sensorType {
case "DS18B20":
return types.SENSOR_DS18B20, nil
case "DHT11":
return types.SENSOR_DHT11, nil
}
return "", fmt.Errorf("Can not match %v with a sensor type", sensorType)
}

View File

@ -4,7 +4,7 @@ import (
"log"
"os"
"git.cryptic.systems/fh-trier/go-flucky/pkg/sensor"
temperatureSensor "git.cryptic.systems/fh-trier/go-flucky/pkg/sensor/temperature"
"github.com/spf13/cobra"
)
@ -15,7 +15,7 @@ var listTemperatureSensorCmd = &cobra.Command{
Short: "List Temperature Sensors",
Run: func(cmd *cobra.Command, args []string) {
if err := sensor.PrintTemperature(os.Stdout, configDir, quiet); err != nil {
if err := temperatureSensor.Print(os.Stdout, configDir, quiet); err != nil {
log.Fatal(err)
}
},

View File

@ -3,7 +3,7 @@ package temperature
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/sensor"
temperatureSensor "git.cryptic.systems/fh-trier/go-flucky/pkg/sensor/temperature"
"github.com/spf13/cobra"
)
@ -13,7 +13,7 @@ var rmTemperatureSensorCmd = &cobra.Command{
Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
if err := sensor.RemoveTemperature(args[0], configDir); err != nil {
if err := temperatureSensor.Remove(args[0], configDir); err != nil {
log.Fatal(err)
}
},