11package data
22
33import (
4- "encoding/csv"
54 "fmt"
6- "io"
75 "os"
86 "path"
97 "strconv"
@@ -13,6 +11,7 @@ import (
1311
1412 "github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
1513 loggerHandler "github.com/HyperloopUPV-H8/h9-backend/pkg/logger"
14+ "github.com/HyperloopUPV-H8/h9-backend/pkg/logger/file"
1615 "github.com/HyperloopUPV-H8/h9-backend/pkg/transport/packet/data"
1716)
1817
@@ -25,8 +24,8 @@ type Logger struct {
2524 // An atomic boolean is used in order to use CompareAndSwap in the Start and Stop methods
2625 running * atomic.Bool
2726 fileLock * sync.RWMutex
28- // valueFileSlice is a map that contains the file of each value
29- valueFileSlice map [data.ValueName ]io. WriteCloser
27+ // saveFiles is a map that contains the file of each value
28+ saveFiles map [data.ValueName ]* file. CSV
3029}
3130
3231// Record is a struct that implements the abstraction.LoggerRecord interface
@@ -41,9 +40,9 @@ func (*Record) Name() abstraction.LoggerName { return Name }
4140
4241func NewLogger () * Logger {
4342 logger := & Logger {
44- valueFileSlice : make (map [data.ValueName ]io. WriteCloser ),
45- running : & atomic.Bool {},
46- fileLock : & sync.RWMutex {},
43+ saveFiles : make (map [data.ValueName ]* file. CSV ),
44+ running : & atomic.Bool {},
45+ fileLock : & sync.RWMutex {},
4746 }
4847
4948 logger .running .Store (false )
@@ -83,75 +82,76 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
8382 }
8483 }
8584
86- valueMap := dataRecord .Packet .GetValues ()
85+ writeErr := error (nil )
86+ for valueName , value := range dataRecord .Packet .GetValues () {
8787
88- sublogger .fileLock .Lock ()
89- defer sublogger .fileLock .Unlock ()
90-
91- writerErr := error (nil )
92- for valueName , value := range valueMap {
93-
94- timestamp := dataRecord .Packet .Timestamp ()
95-
96- var val string
97-
98- switch v := value .(type ) {
88+ var valueRepresentation string
89+ switch value := value .(type ) {
9990 case numeric :
100- val = strconv .FormatFloat (v .Value (), 'f' , - 1 , 64 )
101-
91+ valueRepresentation = strconv .FormatFloat (value .Value (), 'f' , - 1 , 64 )
10292 case data.BooleanValue :
103- val = strconv .FormatBool (v .Value ())
104-
93+ valueRepresentation = strconv .FormatBool (value .Value ())
10594 case data.EnumValue :
106- val = string (v .Variant ())
95+ valueRepresentation = string (value .Variant ())
10796 }
10897
109- file , ok := sublogger .valueFileSlice [valueName ]
110- if ! ok {
111- filename := path .Join (
112- "logger" , "data" ,
113- loggerHandler .Timestamp .Format (loggerHandler .TimestampFormat ),
114- fmt .Sprintf ("%s.csv" , valueName ),
115- )
116- err := os .MkdirAll (path .Dir (filename ), os .ModePerm )
117- if err != nil {
118- return loggerHandler.ErrCreatingAllDir {
119- Name : Name ,
120- Timestamp : time .Now (),
121- Path : filename ,
122- }
123- }
124-
125- f , err := os .Create (path .Join (filename ))
126- if err != nil {
127- return loggerHandler.ErrCreatingFile {
128- Name : Name ,
129- Timestamp : time .Now (),
130- Inner : err ,
131- }
132- }
133- sublogger .valueFileSlice [valueName ] = f
134- file = f
98+ saveFile , err := sublogger .getFile (valueName )
99+ if err != nil {
100+ return err
135101 }
136- writer := csv .NewWriter (file ) // TODO! use map/slice of writer
137102
138- err := writer .Write ([]string {
139- fmt .Sprint (timestamp .UnixMilli ()),
103+ err = saveFile .Write ([]string {
104+ fmt .Sprint (dataRecord . Packet . Timestamp () .UnixMilli ()),
140105 dataRecord .From ,
141106 dataRecord .To ,
142- val ,
107+ valueRepresentation ,
143108 })
109+ saveFile .Flush ()
110+
144111 if err != nil {
145- writerErr = loggerHandler.ErrWritingFile {
112+ writeErr = loggerHandler.ErrWritingFile {
146113 Name : Name ,
147114 Timestamp : time .Now (),
148115 Inner : err ,
149116 }
150- fmt .Println (writerErr )
117+ fmt .Println (writeErr )
151118 }
152- writer .Flush ()
153119 }
154- return writerErr
120+ return writeErr
121+ }
122+
123+ func (sublogger * Logger ) getFile (valueName data.ValueName ) (* file.CSV , error ) {
124+ sublogger .fileLock .Lock ()
125+ defer sublogger .fileLock .Unlock ()
126+
127+ valueFile , ok := sublogger .saveFiles [valueName ]
128+ if ok {
129+ return valueFile , nil
130+ }
131+
132+ valueFileRaw , err := sublogger .createFile (valueName )
133+ sublogger .saveFiles [valueName ] = file .NewCSV (valueFileRaw )
134+
135+ return sublogger .saveFiles [valueName ], err
136+ }
137+
138+ func (sublogger * Logger ) createFile (valueName data.ValueName ) (* os.File , error ) {
139+ filename := path .Join (
140+ "logger" , "data" ,
141+ loggerHandler .Timestamp .Format (loggerHandler .TimestampFormat ),
142+ fmt .Sprintf ("%s.csv" , valueName ),
143+ )
144+
145+ err := os .MkdirAll (path .Dir (filename ), os .ModePerm )
146+ if err != nil {
147+ return nil , loggerHandler.ErrCreatingAllDir {
148+ Name : Name ,
149+ Timestamp : time .Now (),
150+ Path : filename ,
151+ }
152+ }
153+
154+ return os .Create (path .Join (filename ))
155155}
156156
157157func (sublogger * Logger ) PullRecord (abstraction.LoggerRequest ) (abstraction.LoggerRecord , error ) {
@@ -165,19 +165,19 @@ func (sublogger *Logger) Stop() error {
165165 }
166166
167167 closeErr := error (nil )
168- for value , file := range sublogger .valueFileSlice {
168+ for valueName , file := range sublogger .saveFiles {
169169 err := file .Close ()
170170 if err != nil {
171171 closeErr = loggerHandler.ErrClosingFile {
172172 Name : Name ,
173173 Timestamp : time .Now (),
174174 }
175175
176- fmt .Println (value , ": " , closeErr )
176+ fmt .Println (valueName , ": " , closeErr )
177177 }
178178 }
179179
180- sublogger .valueFileSlice = make (map [data.ValueName ]io. WriteCloser , len (sublogger .valueFileSlice ))
180+ sublogger .saveFiles = make (map [data.ValueName ]* file. CSV , len (sublogger .saveFiles ))
181181
182182 fmt .Println ("Logger stopped" )
183183 return closeErr
0 commit comments