mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code cleanup addressing comments on PR

This commit is contained in:
Russell Stanley 2022-02-09 12:06:28 +10:30
parent 0781cd3c26
commit be3e74ca43
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/rv/probe.go
View File

@ -90,13 +90,13 @@ func (tp *turbidityProbe) Write(p []byte) (int, error) {
file, err := os.CreateTemp("temp", "video*.h264") file, err := os.CreateTemp("temp", "video*.h264")
if err != nil { if err != nil {
tp.log.Error("failed to create temp file", "error", err.Error()) tp.log.Error("failed to create temp file", "error", err.Error())
return len(p), err return 0, err
} }
defer os.Remove(file.Name()) defer os.Remove(file.Name())
_, err = file.Write(p) n, err := file.Write(p)
if err != nil { if err != nil {
tp.log.Error("failed to write to temporary file", "error", err.Error()) tp.log.Error("failed to write to temporary file", "error", err.Error())
return len(p), err return n, err
} }
// Read the file and store each frame. // Read the file and store each frame.
@ -118,7 +118,6 @@ func (tp *turbidityProbe) Write(p []byte) (int, error) {
tp.contrast = stat.Mean(res.Contrast, nil) tp.contrast = stat.Mean(res.Contrast, nil)
tp.sharpness = stat.Mean(res.Sharpness, nil) tp.sharpness = stat.Mean(res.Sharpness, nil)
default: default:
return len(p), nil
} }
return len(p), nil return len(p), nil
} }

4
cmd/rv/probe_circleci.go
View File

@ -39,7 +39,7 @@ type turbidityProbe struct {
sharpness, contrast float64 sharpness, contrast float64
} }
// NewTurbidityProbe returns a empty turbidity probe for CircleCI testing only. // NewTurbidityProbe returns an empty turbidity probe for CircleCI testing only.
func NewTurbidityProbe(log logger.Logger, delay time.Duration) (*turbidityProbe, error) { func NewTurbidityProbe(log logger.Logger, delay time.Duration) (*turbidityProbe, error) {
tp := new(turbidityProbe) tp := new(turbidityProbe)
return tp, nil return tp, nil
@ -47,7 +47,7 @@ func NewTurbidityProbe(log logger.Logger, delay time.Duration) (*turbidityProbe,
// Write performs no operation for CircleCI testing only. // Write performs no operation for CircleCI testing only.
func (tp *turbidityProbe) Write(p []byte) (int, error) { func (tp *turbidityProbe) Write(p []byte) (int, error) {
return len(p), nil return 0, nil
} }
func (tp *turbidityProbe) Close() error { func (tp *turbidityProbe) Close() error {