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

fix(pkg/daemon): use measuredValue interface instead of different structs

Browse Source
This commit is contained in:
Markus Pesch
2019-06-25 22:22:34 +02:00
parent 30603e348c
commit 08c2cbbf57
20 changed files with 682 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

290
pkg/logfile/csv.go
View File

@ -1,187 +1,175 @@
package logfile
import (
"encoding/csv"
"encoding/json"
"fmt"
"os"
"strconv"
"time"
// type csvLogfile struct {
// logfile string
// }
"github.com/go-flucky/flucky/pkg/sensor"
"github.com/go-flucky/flucky/pkg/types"
)
// func (cl *csvLogfile) GetLogfile() string {
// return cl.logfile
// }
type csvLogfile struct {
logfile string
}
// func (cl *csvLogfile) ReadHumidities() ([]*types.Humidity, error) {
// if _, err := os.Stat(cl.logfile); os.IsNotExist(err) {
// return nil, fmt.Errorf("%v: %v", errorLogfileNotFound, cl.logfile)
// }
func (cl *csvLogfile) GetLogfile() string {
return cl.logfile
}
// humidities := make([]*types.Humidity, 0)
func (cl *csvLogfile) ReadHumidities() ([]*types.Humidity, error) {
if _, err := os.Stat(cl.logfile); os.IsNotExist(err) {
return nil, fmt.Errorf("%v: %v", errorLogfileNotFound, cl.logfile)
}
// f, err := os.Open(cl.logfile)
// if err != nil {
// return nil, fmt.Errorf("%v: %v", errorLogfileOpen, cl.logfile)
// }
// defer f.Close()
humidities := make([]*types.Humidity, 0)
// jsonDecoder := json.NewDecoder(f)
// err = jsonDecoder.Decode(&humidities)
// if err != nil {
// return nil, fmt.Errorf("%v: %v", errorLogfileDecode, err)
// }
f, err := os.Open(cl.logfile)
if err != nil {
return nil, fmt.Errorf("%v: %v", errorLogfileOpen, cl.logfile)
}
defer f.Close()
// return humidities, nil
// }
jsonDecoder := json.NewDecoder(f)
err = jsonDecoder.Decode(&humidities)
if err != nil {
return nil, fmt.Errorf("%v: %v", errorLogfileDecode, err)
}
// func (cl *csvLogfile) ReadTemperatures() ([]*types.Temperature, error) {
return humidities, nil
}
// if _, err := os.Stat(cl.logfile); os.IsNotExist(err) {
// return nil, fmt.Errorf("%v %v: %v", errorLogfileNotFound, cl.logfile, err)
// }
func (cl *csvLogfile) ReadTemperatures() ([]*types.Temperature, error) {
// temperatures := make([]*types.Temperature, 0)
if _, err := os.Stat(cl.logfile); os.IsNotExist(err) {
return nil, fmt.Errorf("%v %v: %v", errorLogfileNotFound, cl.logfile, err)
}
// f, err := os.Open(cl.logfile)
// if err != nil {
// return nil, fmt.Errorf("%v %v: %v", errorLogfileOpen, cl.logfile, err)
// }
// defer f.Close()
temperatures := make([]*types.Temperature, 0)
// r := csv.NewReader(f)
// records, err := r.ReadAll()
// if err != nil {
// return nil, fmt.Errorf("%v %v: %v", errorLogfileDecode, cl.logfile, err)
// }
f, err := os.Open(cl.logfile)
if err != nil {
return nil, fmt.Errorf("%v %v: %v", errorLogfileOpen, cl.logfile, err)
}
defer f.Close()
// for _, record := range records {
// times := make([]time.Time, 0)
// for _, j := range []int{3, 4} {
// time, err := time.Parse(timeFormat, record[j])
// if err != nil {
// return nil, fmt.Errorf("%v %v: %v", errorParseTime, record[j], err)
// }
// times = append(times, time)
// }
r := csv.NewReader(f)
records, err := r.ReadAll()
if err != nil {
return nil, fmt.Errorf("%v %v: %v", errorLogfileDecode, cl.logfile, err)
}
// temperatureValue, err := strconv.ParseFloat(record[1], 64)
// if err != nil {
// return nil, fmt.Errorf("%v %v: %v", errorParseFloat, record[1], err)
// }
for _, record := range records {
times := make([]time.Time, 0)
for _, j := range []int{3, 4} {
time, err := time.Parse(timeFormat, record[j])
if err != nil {
return nil, fmt.Errorf("%v %v: %v", errorParseTime, record[j], err)
}
times = append(times, time)
}
// measurementUnit, err := sensor.SelectTemperatureMeasurementUnit(record[2])
// if err != nil {
// return nil, fmt.Errorf("%v %v: %v", errorParseMeasurementUnit, record[2], err)
// }
temperatureValue, err := strconv.ParseFloat(record[1], 64)
if err != nil {
return nil, fmt.Errorf("%v %v: %v", errorParseFloat, record[1], err)
}
// temperature := &types.Temperature{
// TemperatureID: record[0], // 0
// TemperatureValue: temperatureValue, // 1
// TemperatureUnit: measurementUnit, // 2
// TemperatureFromDate: times[0], // 3
// TemperatureTillDate: times[1], // 4
// SensorID: record[5], // 5
// }
measurementUnit, err := sensor.SelectTemperatureMeasurementUnit(record[2])
if err != nil {
return nil, fmt.Errorf("%v %v: %v", errorParseMeasurementUnit, record[2], err)
}
// // Creation date
// temperatureCreationDate, err := time.Parse(timeFormat, record[6])
// if err != nil {
// return nil, fmt.Errorf("%v %v: %v", errorParseTime, record[5], err)
// }
// temperature.CreationDate = &temperatureCreationDate
temperature := &types.Temperature{
TemperatureID: record[0], // 0
TemperatureValue: temperatureValue, // 1
TemperatureUnit: measurementUnit, // 2
TemperatureFromDate: times[0], // 3
TemperatureTillDate: times[1], // 4
SensorID: record[5], // 5
}
// if record[7] != "" {
// temperatureUpdateDate, err := time.Parse(timeFormat, record[7])
// if err != nil {
// return nil, fmt.Errorf("%v %v: %v", errorParseTime, record[7], err)
// }
// Creation date
temperatureCreationDate, err := time.Parse(timeFormat, record[6])
if err != nil {
return nil, fmt.Errorf("%v %v: %v", errorParseTime, record[5], err)
}
temperature.CreationDate = &temperatureCreationDate
// temperature.UpdateDate = &temperatureUpdateDate
// }
if record[7] != "" {
temperatureUpdateDate, err := time.Parse(timeFormat, record[7])
if err != nil {
return nil, fmt.Errorf("%v %v: %v", errorParseTime, record[7], err)
}
// temperatures = append(temperatures, temperature)
// }
temperature.UpdateDate = &temperatureUpdateDate
}
// return temperatures, nil
// }
temperatures = append(temperatures, temperature)
}
// func (cl *csvLogfile) WriteHumidities(humidities []*types.Humidity) error {
return temperatures, nil
}
// f, err := os.Create(cl.logfile)
// if err != nil {
// return fmt.Errorf("%v: %v", errorLogfileCreate, cl.logfile)
// }
// defer f.Close()
func (cl *csvLogfile) WriteHumidities(humidities []*types.Humidity) error {
// w := csv.NewWriter(f)
f, err := os.Create(cl.logfile)
if err != nil {
return fmt.Errorf("%v: %v", errorLogfileCreate, cl.logfile)
}
defer f.Close()
// for _, humidity := range humidities {
// w.Write([]string{
// fmt.Sprintf("%v", humidity.HumidityID),
// fmt.Sprintf("%v", humidity.HumidityValue),
// fmt.Sprintf("%v", humidity.HumidityFromDate.Format(timeFormat)),
// fmt.Sprintf("%v", humidity.HumidityTillDate.Format(timeFormat)),
// fmt.Sprintf("%v", humidity.SensorID),
// fmt.Sprintf("%v", humidity.CreationDate.Format(timeFormat)),
// fmt.Sprintf("%v", humidity.UpdateDate.Format(timeFormat)),
// })
// }
w := csv.NewWriter(f)
// w.Flush()
for _, humidity := range humidities {
w.Write([]string{
fmt.Sprintf("%v", humidity.HumidityID),
fmt.Sprintf("%v", humidity.HumidityValue),
fmt.Sprintf("%v", humidity.HumidityFromDate.Format(timeFormat)),
fmt.Sprintf("%v", humidity.HumidityTillDate.Format(timeFormat)),
fmt.Sprintf("%v", humidity.SensorID),
fmt.Sprintf("%v", humidity.CreationDate.Format(timeFormat)),
fmt.Sprintf("%v", humidity.UpdateDate.Format(timeFormat)),
})
}
// return nil
// }
w.Flush()
// func (cl *csvLogfile) WriteTemperatures(temperatures []*types.Temperature) error {
// f, err := os.Create(cl.logfile)
// if err != nil {
// return fmt.Errorf("%v: %v", errorLogfileCreate, cl.logfile)
// }
// defer f.Close()
return nil
}
// writeCreationDate(temperatures)
func (cl *csvLogfile) WriteTemperatures(temperatures []*types.Temperature) error {
f, err := os.Create(cl.logfile)
if err != nil {
return fmt.Errorf("%v: %v", errorLogfileCreate, cl.logfile)
}
defer f.Close()
// w := csv.NewWriter(f)
writeCreationDate(temperatures)
// for _, temperature := range temperatures {
// record := make([]string, 0)
w := csv.NewWriter(f)
// if temperature.UpdateDate != nil {
// record = []string{
// fmt.Sprintf("%v", temperature.TemperatureID),
// fmt.Sprintf("%v", temperature.TemperatureValue),
// fmt.Sprintf("%v", temperature.TemperatureUnit),
// fmt.Sprintf("%v", temperature.TemperatureFromDate.Format(timeFormat)),
// fmt.Sprintf("%v", temperature.TemperatureTillDate.Format(timeFormat)),
// fmt.Sprintf("%v", temperature.SensorID),
// fmt.Sprintf("%v", temperature.CreationDate.Format(timeFormat)),
// fmt.Sprintf("%v", temperature.UpdateDate.Format(timeFormat)),
// }
// } else {
// record = []string{
// fmt.Sprintf("%v", temperature.TemperatureID),
// fmt.Sprintf("%v", temperature.TemperatureValue),
// fmt.Sprintf("%v", temperature.TemperatureUnit),
// fmt.Sprintf("%v", temperature.TemperatureFromDate.Format(timeFormat)),
// fmt.Sprintf("%v", temperature.TemperatureTillDate.Format(timeFormat)),
// fmt.Sprintf("%v", temperature.SensorID),
// fmt.Sprintf("%v", temperature.CreationDate.Format(timeFormat)),
// fmt.Sprintf(""),
// }
// }
for _, temperature := range temperatures {
record := make([]string, 0)
// w.Write(record)
// }
if temperature.UpdateDate != nil {
record = []string{
fmt.Sprintf("%v", temperature.TemperatureID),
fmt.Sprintf("%v", temperature.TemperatureValue),
fmt.Sprintf("%v", temperature.TemperatureUnit),
fmt.Sprintf("%v", temperature.TemperatureFromDate.Format(timeFormat)),
fmt.Sprintf("%v", temperature.TemperatureTillDate.Format(timeFormat)),
fmt.Sprintf("%v", temperature.SensorID),
fmt.Sprintf("%v", temperature.CreationDate.Format(timeFormat)),
fmt.Sprintf("%v", temperature.UpdateDate.Format(timeFormat)),
}
} else {
record = []string{
fmt.Sprintf("%v", temperature.TemperatureID),
fmt.Sprintf("%v", temperature.TemperatureValue),
fmt.Sprintf("%v", temperature.TemperatureUnit),
fmt.Sprintf("%v", temperature.TemperatureFromDate.Format(timeFormat)),
fmt.Sprintf("%v", temperature.TemperatureTillDate.Format(timeFormat)),
fmt.Sprintf("%v", temperature.SensorID),
fmt.Sprintf("%v", temperature.CreationDate.Format(timeFormat)),
fmt.Sprintf(""),
}
}
// w.Flush()
w.Write(record)
}
w.Flush()
return nil
}
// return nil
// }

2
pkg/logfile/errors.go
View File

@ -22,3 +22,5 @@ var errorNoValidSensorID = errors.New("No sensor id detected or available")
var errorNoValidTemperatureID = errors.New("No valid temperature id detected or available")
var errorNoValidTime = errors.New("No time detected or available")
var errorNoValidTimePeriods = errors.New("No valid time periods")
var errorTypeSwitch = errors.New("Can not detect type via type switch")

10
pkg/logfile/interfaces.go
View File

@ -5,9 +5,9 @@ import (
)
type Logfile interface {
GetLogfile() string
ReadHumidities() ([]*types.Humidity, error)
ReadTemperatures() ([]*types.Temperature, error)
WriteHumidities(humidities []*types.Humidity) error
WriteTemperatures(temperatures []*types.Temperature) error
Append(compression bool, measuredValues []types.MeasuredValue) error
Read() ([]types.MeasuredValue, error)
// ReadCustom(r io.Reader) ([]types.MeasuredValue, error)
Write(measuredValues []types.MeasuredValue) error
// WriteCustom(w io.Writer, measuredValues []types.MeasuredValue) error
}

161
pkg/logfile/json.go
View File

@ -3,68 +3,162 @@ package logfile
import (
"encoding/json"
"fmt"
"log"
"os"
"sync"
"github.com/go-flucky/flucky/pkg/internal/collect"
"github.com/go-flucky/flucky/pkg/internal/prittyprint"
"github.com/go-flucky/flucky/pkg/config"
"github.com/go-flucky/flucky/pkg/types"
)
type jsonLogfile struct {
logfile string
cnf *config.Configuration
}
func (jl *jsonLogfile) GetLogfile() string {
return jl.logfile
func (jl *jsonLogfile) Append(compression bool, measuredValues []types.MeasuredValue) error {
allMeasuredValues, err := jl.Read()
if err != nil {
return err
}
log.Println(len(allMeasuredValues))
allMeasuredValues = append(allMeasuredValues, measuredValues...)
log.Println(len(allMeasuredValues))
err = jl.Write(allMeasuredValues)
if err != nil {
return err
}
return nil
}
func (jl *jsonLogfile) ReadHumidities() ([]*types.Humidity, error) {
if _, err := os.Stat(jl.logfile); os.IsNotExist(err) {
return nil, fmt.Errorf("%v: %v", errorLogfileNotFound, jl.logfile)
func (jl *jsonLogfile) Read() ([]types.MeasuredValue, error) {
measuredValues := make([]types.MeasuredValue, 0)
humidityValues, err := jl.readHumidities()
if err != nil {
return nil, err
}
measuredValues = append(measuredValues, humidityValues...)
temperatureValues, err := jl.readTemperatures()
if err != nil {
return nil, err
}
measuredValues = append(measuredValues, temperatureValues...)
return measuredValues, nil
}
func (jl *jsonLogfile) readHumidities() ([]types.MeasuredValue, error) {
if _, err := os.Stat(jl.cnf.Device.HumidityLogfile); os.IsNotExist(err) {
return nil, fmt.Errorf("%v: %v", errorLogfileNotFound, jl.cnf.Device.HumidityLogfile)
}
humidities := make([]*types.Humidity, 0)
f, err := os.Open(jl.logfile)
f, err := os.Open(jl.cnf.Device.HumidityLogfile)
if err != nil {
return nil, fmt.Errorf("%v: %v", errorLogfileOpen, jl.logfile)
return nil, fmt.Errorf("%v: %v", errorLogfileOpen, jl.cnf.Device.HumidityLogfile)
}
defer f.Close()
jsonDecoder := json.NewDecoder(f)
err = jsonDecoder.Decode(&humidities)
if err != nil {
if err = json.NewDecoder(f).Decode(&humidities); err != nil {
return nil, fmt.Errorf("%v: %v", errorLogfileDecode, err)
}
return humidities, nil
measuredValues := make([]types.MeasuredValue, 0)
for _, humidity := range humidities {
measuredValues = append(measuredValues, humidity)
}
return measuredValues, nil
}
func (jl *jsonLogfile) ReadTemperatures() ([]*types.Temperature, error) {
if _, err := os.Stat(jl.logfile); os.IsNotExist(err) {
return nil, fmt.Errorf("%v: %v", errorLogfileNotFound, jl.logfile)
func (jl *jsonLogfile) readTemperatures() ([]types.MeasuredValue, error) {
if _, err := os.Stat(jl.cnf.Device.TemperatureLogfile); os.IsNotExist(err) {
return nil, fmt.Errorf("%v: %v", errorLogfileNotFound, jl.cnf.Device.TemperatureLogfile)
}
temperatures := make([]*types.Temperature, 0)
f, err := os.Open(jl.logfile)
f, err := os.Open(jl.cnf.Device.TemperatureLogfile)
if err != nil {
return nil, fmt.Errorf("%v: %v", errorLogfileOpen, jl.logfile)
return nil, fmt.Errorf("%v: %v", errorLogfileOpen, jl.cnf.Device.TemperatureLogfile)
}
defer f.Close()
jsonDecoder := json.NewDecoder(f)
err = jsonDecoder.Decode(&temperatures)
if err != nil {
if err := json.NewDecoder(f).Decode(&temperatures); err != nil {
return nil, fmt.Errorf("%v: %v", errorLogfileDecode, err)
}
return temperatures, nil
measuredValues := make([]types.MeasuredValue, 0)
for _, temperature := range temperatures {
measuredValues = append(measuredValues, temperature)
}
return measuredValues, nil
}
func (jl *jsonLogfile) WriteHumidities(humidities []*types.Humidity) error {
func (jl *jsonLogfile) Write(measuredValues []types.MeasuredValue) error {
humidities := make([]*types.Humidity, 0)
temperatures := make([]*types.Temperature, 0)
f, err := os.Create(jl.logfile)
for _, measuredValue := range measuredValues {
switch v := measuredValue.(type) {
case *types.Humidity:
humidities = append(humidities, v)
case *types.Temperature:
temperatures = append(temperatures, v)
default:
return fmt.Errorf("%v", errorTypeSwitch)
}
}
errorChannel := make(chan error, 0)
wg := new(sync.WaitGroup)
wg.Add(2)
go jl.writeHumidities(humidities, errorChannel, wg)
go jl.writeTemperatures(temperatures, errorChannel, wg)
wg.Wait()
errors := collect.Errors(errorChannel)
if len(errors) > 0 {
return prittyprint.FormatErrors(errors)
}
return nil
}
func (jl *jsonLogfile) writeHumidities(humidities []*types.Humidity, errorChannel chan<- error, wg *sync.WaitGroup) {
defer wg.Done()
f, err := os.Create(jl.cnf.Device.HumidityLogfile)
if err != nil {
return fmt.Errorf("%v: %v", errorLogfileCreate, jl.logfile)
errorChannel <- fmt.Errorf("%v: %v", errorLogfileCreate, jl.cnf.Device.HumidityLogfile)
return
}
defer f.Close()
@ -72,25 +166,28 @@ func (jl *jsonLogfile) WriteHumidities(humidities []*types.Humidity) error {
jsonEncoder.SetIndent("", " ")
err = jsonEncoder.Encode(humidities)
if err != nil {
return fmt.Errorf("%v: %v", errorLogfileEncode, err)
errorChannel <- fmt.Errorf("%v: %v", errorLogfileEncode, err)
return
}
return nil
}
func (jl *jsonLogfile) WriteTemperatures(temperatures []*types.Temperature) error {
f, err := os.Create(jl.logfile)
func (jl *jsonLogfile) writeTemperatures(temperatures []*types.Temperature, errorChannel chan<- error, wg *sync.WaitGroup) {
defer wg.Done()
f, err := os.Create(jl.cnf.Device.TemperatureLogfile)
if err != nil {
return fmt.Errorf("%v: %v", errorLogfileCreate, jl.logfile)
errorChannel <- fmt.Errorf("%v: %v", errorLogfileCreate, jl.cnf.Device.TemperatureLogfile)
return
}
defer f.Close()
writeCreationDate(temperatures)
//writeCreationDate(temperatures)
jsonEncoder := json.NewEncoder(f)
jsonEncoder.SetIndent("", " ")
err = jsonEncoder.Encode(temperatures)
if err != nil {
return fmt.Errorf("%v: %v", errorLogfileEncode, err)
errorChannel <- fmt.Errorf("%v: %v", errorLogfileEncode, err)
return
}
return nil
}

244
pkg/logfile/logfile.go
View File

@ -1,45 +1,39 @@
package logfile
import (
"os"
"path/filepath"
"regexp"
"sort"
"time"
"github.com/go-flucky/flucky/pkg/types"
"github.com/go-flucky/flucky/pkg/config"
)
var validUUID = regexp.MustCompile("^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[8|9|aA|bB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$")
var timeFormat = "2006-01-02 15:04:05.999999999 -0700"
// var validUUID = regexp.MustCompile("^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[8|9|aA|bB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$")
// var timeFormat = "2006-01-02 15:04:05.999999999 -0700"
// AppendTemperatures with temperature values from a logfile. As additional
// option it's possible to compress the temperature data.
func AppendTemperatures(logfile Logfile, compression bool, temperatures []*types.Temperature) error {
// // AppendTemperatures with temperature values from a logfile. As additional
// // option it's possible to compress the temperature data.
// func AppendTemperatures(logfile Logfile, compression bool, temperatures []*types.Temperature) error {
allTemperatures := make([]*types.Temperature, 0)
// allTemperatures := make([]*types.Temperature, 0)
if _, err := os.Stat(logfile.GetLogfile()); err == nil {
temperaturesFromLogfile, err := logfile.ReadTemperatures()
if err != nil {
return err
}
// if _, err := os.Stat(logfile.GetLogfile()); err == nil {
// temperaturesFromLogfile, err := logfile.ReadTemperatures()
// if err != nil {
// return err
// }
allTemperatures = append(allTemperatures, temperaturesFromLogfile...)
}
// allTemperatures = append(allTemperatures, temperaturesFromLogfile...)
// }
allTemperatures = append(allTemperatures, temperatures...)
// allTemperatures = append(allTemperatures, temperatures...)
if compression {
allTemperatures = CompressTemperature(allTemperatures)
}
// if compression {
// allTemperatures = CompressTemperature(allTemperatures)
// }
err := logfile.WriteTemperatures(allTemperatures)
if err != nil {
return err
}
return nil
}
// err := logfile.WriteTemperatures(allTemperatures)
// if err != nil {
// return err
// }
// return nil
// }
// CompressTemperature compresses the temperatures from an array. It is checked
// whether the measured temperature of a value corresponds to that of the
@ -47,116 +41,118 @@ func AppendTemperatures(logfile Logfile, compression bool, temperatures []*types
// validity date of the predecessor value is set to that of the current value.
// No information is lost as a result. The validity period of the measured value
// is thereby exclusively increased.
func CompressTemperature(temperatures []*types.Temperature) []*types.Temperature {
compressedTemperatures := make([]*types.Temperature, 0)
lastTemperatureBySensors := make(map[string]*types.Temperature, 0)
// func Compression(measuredValues []types) []*types.Temperature {
// compressedTemperatures := make([]*types.Temperature, 0)
// lastTemperatureBySensors := make(map[string]*types.Temperature, 0)
// Sort all measured temperatures beforehand by the starting validity date to
// avoid errors when compressing the temperatures.
SortTemperatures(temperatures)
// // Sort all measured temperatures beforehand by the starting validity date to
// // avoid errors when compressing the temperatures.
// SortTemperatures(temperatures)
for _, temperature := range temperatures {
if lastTemperatureBySensor, ok := lastTemperatureBySensors[temperature.SensorID]; ok {
if lastTemperatureBySensor.TemperatureValue == temperature.TemperatureValue {
// for _, temperature := range temperatures {
// if lastTemperatureBySensor, ok := lastTemperatureBySensors[temperature.SensorID]; ok {
// if lastTemperatureBySensor.TemperatureValue == temperature.TemperatureValue {
lastTemperatureBySensors[temperature.SensorID].TemperatureTillDate = temperature.TemperatureTillDate
// lastTemperatureBySensors[temperature.SensorID].TemperatureTillDate = temperature.TemperatureTillDate
now := time.Now()
lastTemperatureBySensors[temperature.SensorID].UpdateDate = &now
} else {
compressedTemperatures = append(compressedTemperatures, lastTemperatureBySensors[temperature.SensorID])
lastTemperatureBySensors[temperature.SensorID] = temperature
}
} else {
lastTemperatureBySensors[temperature.SensorID] = temperature
}
}
// now := time.Now()
// lastTemperatureBySensors[temperature.SensorID].UpdateDate = &now
// } else {
// compressedTemperatures = append(compressedTemperatures, lastTemperatureBySensors[temperature.SensorID])
// lastTemperatureBySensors[temperature.SensorID] = temperature
// }
// } else {
// lastTemperatureBySensors[temperature.SensorID] = temperature
// }
// }
// Copy all remaining entries from the map into the array
for _, lastTemperatureBySensor := range lastTemperatureBySensors {
compressedTemperatures = append(compressedTemperatures, lastTemperatureBySensor)
}
// // Copy all remaining entries from the map into the array
// for _, lastTemperatureBySensor := range lastTemperatureBySensors {
// compressedTemperatures = append(compressedTemperatures, lastTemperatureBySensor)
// }
return compressedTemperatures
}
// return compressedTemperatures
// }
// New returns a log file with basic functions for reading and writing data. The
// file extension of the logfile is taken into account to format the logfile
// into the correct format.
func New(logfile string) Logfile {
func New(cnf *config.Configuration) Logfile {
ext := filepath.Ext(logfile)
// switch ext {
// case ".csv":
// return &csvLogfile{
// logfile: logfile,
// }
// case ".json":
// return &jsonLogfile{
// cnf: cnf,
// }
// case ".xml":
// return &xmlLogfile{
// logfile: logfile,
// }
// default:
// return &jsonLogfile{
// logfile: logfile,
// }
// }
switch ext {
case ".csv":
return &csvLogfile{
logfile: logfile,
}
case ".json":
return &jsonLogfile{
logfile: logfile,
}
case ".xml":
return &xmlLogfile{
logfile: logfile,
}
default:
return &jsonLogfile{
logfile: logfile,
}
return &jsonLogfile{
cnf: cnf,
}
}
// SplittTemperatures into multiple arrays. The Size can be defined by
// temperatureSplitBy parameter.
func SplittTemperatures(temperatures []*types.Temperature, templeratureSplitBy int) [][]*types.Temperature {
splittedTemperatures := make([][]*types.Temperature, 0)
newTemperatures := make([]*types.Temperature, 0)
for _, temperature := range temperatures {
if len(newTemperatures) == templeratureSplitBy {
splittedTemperatures = append(splittedTemperatures, newTemperatures)
newTemperatures = make([]*types.Temperature, 0)
}
newTemperatures = append(newTemperatures, temperature)
}
splittedTemperatures = append(splittedTemperatures, newTemperatures)
return splittedTemperatures
}
// // SplittTemperatures into multiple arrays. The Size can be defined by
// // temperatureSplitBy parameter.
// func SplittTemperatures(temperatures []*types.Temperature, templeratureSplitBy int) [][]*types.Temperature {
// splittedTemperatures := make([][]*types.Temperature, 0)
// newTemperatures := make([]*types.Temperature, 0)
// for _, temperature := range temperatures {
// if len(newTemperatures) == templeratureSplitBy {
// splittedTemperatures = append(splittedTemperatures, newTemperatures)
// newTemperatures = make([]*types.Temperature, 0)
// }
// newTemperatures = append(newTemperatures, temperature)
// }
// splittedTemperatures = append(splittedTemperatures, newTemperatures)
// return splittedTemperatures
// }
// SortTemperatures by TemperatureFromDate
func SortTemperatures(temperatures []*types.Temperature) {
sort.SliceStable(temperatures, func(i int, j int) bool {
return temperatures[i].TemperatureFromDate.Before(temperatures[j].TemperatureFromDate)
})
}
// // SortTemperatures by TemperatureFromDate
// func SortTemperatures(temperatures []*types.Temperature) {
// sort.SliceStable(temperatures, func(i int, j int) bool {
// return temperatures[i].TemperatureFromDate.Before(temperatures[j].TemperatureFromDate)
// })
// }
// ValidateTemperatures Checks if the temperature data is valid.
// - Check the temperature id (uuid)
// - Checks whether the time specifications are historically in a sequence.
// - Check the sensor id (uuid)
func ValidateTemperatures(temperatures []*types.Temperature) error {
for _, temperature := range temperatures {
if !validUUID.MatchString(temperature.TemperatureID) {
return errorNoValidTemperatureID
} else if temperature.TemperatureValue == 0 {
return errorNoValidMesuredValue
} else if temperature.TemperatureFromDate.After(temperature.TemperatureTillDate) {
return errorNoValidTimePeriods
} else if !validUUID.MatchString(temperature.SensorID) {
return errorNoValidSensorID
} else if temperature.CreationDate.After(*temperature.UpdateDate) && temperature.UpdateDate != nil {
return errorNoValidTimePeriods
}
}
// // ValidateTemperatures Checks if the temperature data is valid.
// // - Check the temperature id (uuid)
// // - Checks whether the time specifications are historically in a sequence.
// // - Check the sensor id (uuid)
// func ValidateTemperatures(temperatures []*types.Temperature) error {
// for _, temperature := range temperatures {
// if !validUUID.MatchString(temperature.TemperatureID) {
// return errorNoValidTemperatureID
// } else if temperature.TemperatureValue == 0 {
// return errorNoValidMesuredValue
// } else if temperature.TemperatureFromDate.After(temperature.TemperatureTillDate) {
// return errorNoValidTimePeriods
// } else if !validUUID.MatchString(temperature.SensorID) {
// return errorNoValidSensorID
// } else if temperature.CreationDate.After(*temperature.UpdateDate) && temperature.UpdateDate != nil {
// return errorNoValidTimePeriods
// }
// }
return nil
}
// return nil
// }
func writeCreationDate(temperatures []*types.Temperature) {
now := time.Now()
for _, temperature := range temperatures {
if temperature.CreationDate == nil {
temperature.CreationDate = &now
}
}
}
// func writeCreationDate(temperatures []*types.Temperature) {
// now := time.Now()
// for _, temperature := range temperatures {
// if temperature.CreationDate == nil {
// temperature.CreationDate = &now
// }
// }
// }

179
pkg/logfile/xml.go
View File

@ -1,121 +1,112 @@
package logfile
import (
"encoding/xml"
"fmt"
"io/ioutil"
"os"
// type xmlLogfile struct {
// logfile string
// }
"github.com/go-flucky/flucky/pkg/types"
)
// func (xl *xmlLogfile) GetLogfile() string {
// return xl.logfile
// }
type xmlLogfile struct {
logfile string
}
// func (xl *xmlLogfile) ReadHumidities() ([]*types.Humidity, error) {
// if _, err := os.Stat(xl.logfile); os.IsNotExist(err) {
// return nil, fmt.Errorf("%v: %v", errorLogfileNotFound, xl.logfile)
// }
func (xl *xmlLogfile) GetLogfile() string {
return xl.logfile
}
// humidities := make([]*types.Humidity, 0)
func (xl *xmlLogfile) ReadHumidities() ([]*types.Humidity, error) {
if _, err := os.Stat(xl.logfile); os.IsNotExist(err) {
return nil, fmt.Errorf("%v: %v", errorLogfileNotFound, xl.logfile)
}
// f, err := os.Open(xl.logfile)
// if err != nil {
// return nil, fmt.Errorf("%v: %v", errorLogfileOpen, xl.logfile)
// }
// defer f.Close()
humidities := make([]*types.Humidity, 0)
// xmlDecoder := xml.NewDecoder(f)
// err = xmlDecoder.Decode(&humidities)
// if err != nil {
// return nil, fmt.Errorf("%v: %v", errorLogfileDecode, err)
// }
f, err := os.Open(xl.logfile)
if err != nil {
return nil, fmt.Errorf("%v: %v", errorLogfileOpen, xl.logfile)
}
defer f.Close()
// return humidities, nil
// }
xmlDecoder := xml.NewDecoder(f)
err = xmlDecoder.Decode(&humidities)
if err != nil {
return nil, fmt.Errorf("%v: %v", errorLogfileDecode, err)
}
// func (xl *xmlLogfile) ReadTemperatures() ([]*types.Temperature, error) {
// if _, err := os.Stat(xl.logfile); os.IsNotExist(err) {
// return nil, fmt.Errorf("%v: %v", errorLogfileNotFound, xl.logfile)
// }
return humidities, nil
}
// f, err := os.Open(xl.logfile)
// if err != nil {
// return nil, fmt.Errorf("%v: %v", errorLogfileOpen, xl.logfile)
// }
// defer f.Close()
func (xl *xmlLogfile) ReadTemperatures() ([]*types.Temperature, error) {
if _, err := os.Stat(xl.logfile); os.IsNotExist(err) {
return nil, fmt.Errorf("%v: %v", errorLogfileNotFound, xl.logfile)
}
// bytes, err := ioutil.ReadAll(f)
// if err != nil {
// return nil, fmt.Errorf("%v: %v", errorLogfileRead, err)
// }
f, err := os.Open(xl.logfile)
if err != nil {
return nil, fmt.Errorf("%v: %v", errorLogfileOpen, xl.logfile)
}
defer f.Close()
// tmpTemperatures := new(Temperatures)
bytes, err := ioutil.ReadAll(f)
if err != nil {
return nil, fmt.Errorf("%v: %v", errorLogfileRead, err)
}
// err = xml.Unmarshal(bytes, tmpTemperatures)
// if err != nil {
// return nil, fmt.Errorf("%v: %v", errorLogfileUnmarshal, err)
// }
tmpTemperatures := new(Temperatures)
// temperatures := make([]*types.Temperature, 0)
err = xml.Unmarshal(bytes, tmpTemperatures)
if err != nil {
return nil, fmt.Errorf("%v: %v", errorLogfileUnmarshal, err)
}
// for _, tmpTemperature := range tmpTemperatures.Temperatures {
// temperatures = append(temperatures, tmpTemperature.Temperature)
// }
temperatures := make([]*types.Temperature, 0)
// return temperatures, nil
// }
for _, tmpTemperature := range tmpTemperatures.Temperatures {
temperatures = append(temperatures, tmpTemperature.Temperature)
}
// func (xl *xmlLogfile) WriteHumidities(humidities []*types.Humidity) error {
return temperatures, nil
}
// f, err := os.Create(xl.logfile)
// if err != nil {
// return fmt.Errorf("%v: %v", errorLogfileCreate, xl.logfile)
// }
// defer f.Close()
func (xl *xmlLogfile) WriteHumidities(humidities []*types.Humidity) error {
// xmlEncoder := xml.NewEncoder(f)
// xmlEncoder.Indent("", " ")
// err = xmlEncoder.Encode(humidities)
// if err != nil {
// return fmt.Errorf("%v: %v", errorLogfileEncode, err)
// }
// return nil
// }
f, err := os.Create(xl.logfile)
if err != nil {
return fmt.Errorf("%v: %v", errorLogfileCreate, xl.logfile)
}
defer f.Close()
// func (xl *xmlLogfile) WriteTemperatures(temperatures []*types.Temperature) error {
// f, err := os.Create(xl.logfile)
// if err != nil {
// return fmt.Errorf("%v: %v", errorLogfileCreate, xl.logfile)
// }
// defer f.Close()
xmlEncoder := xml.NewEncoder(f)
xmlEncoder.Indent("", " ")
err = xmlEncoder.Encode(humidities)
if err != nil {
return fmt.Errorf("%v: %v", errorLogfileEncode, err)
}
return nil
}
// writeCreationDate(temperatures)
func (xl *xmlLogfile) WriteTemperatures(temperatures []*types.Temperature) error {
f, err := os.Create(xl.logfile)
if err != nil {
return fmt.Errorf("%v: %v", errorLogfileCreate, xl.logfile)
}
defer f.Close()
// tmpTemperatures := new(Temperatures)
writeCreationDate(temperatures)
// for _, temperature := range temperatures {
// tmpTemperature := &Temperature{
// Temperature: temperature,
// }
tmpTemperatures := new(Temperatures)
// tmpTemperatures.Temperatures = append(tmpTemperatures.Temperatures, tmpTemperature)
// }
for _, temperature := range temperatures {
tmpTemperature := &Temperature{
Temperature: temperature,
}
// bytes, err := xml.MarshalIndent(tmpTemperatures, "", " ")
// if err != nil {
// return fmt.Errorf("%v: %v", errorLogfileMarshal, err)
// }
tmpTemperatures.Temperatures = append(tmpTemperatures.Temperatures, tmpTemperature)
}
// _, err = f.Write(bytes)
// if err != nil {
// return fmt.Errorf("%v: %v", errorLogfileWrite, err)
// }
bytes, err := xml.MarshalIndent(tmpTemperatures, "", " ")
if err != nil {
return fmt.Errorf("%v: %v", errorLogfileMarshal, err)
}
_, err = f.Write(bytes)
if err != nil {
return fmt.Errorf("%v: %v", errorLogfileWrite, err)
}
return nil
}
// return nil
// }