Compare commits

...

1 Commits

Author SHA1 Message Date
ac0c417a48 small j for float 3
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2026-03-06 20:34:21 +01:00
2 changed files with 8 additions and 12 deletions

View File

@@ -185,7 +185,7 @@
"attributes": { "attributes": {
"application": "Shellies Sensor Temperature", "application": "Shellies Sensor Temperature",
"deviceSelector": "T:2", "deviceSelector": "T:2",
"valueSelector": "j:$.tC", "valueSelector": "J:$.tC",
"unitSelector": "C:°C" "unitSelector": "C:°C"
} }
} }
@@ -199,7 +199,7 @@
"attributes": { "attributes": {
"application": "Shellies Sensor Humidity", "application": "Shellies Sensor Humidity",
"deviceSelector": "T:2", "deviceSelector": "T:2",
"valueSelector": "j:$.rh", "valueSelector": "J:$.rh",
"unitSelector": "C:%" "unitSelector": "C:%"
} }
} }
@@ -213,7 +213,7 @@
"attributes": { "attributes": {
"application": "Shellies Sensor Power", "application": "Shellies Sensor Power",
"deviceSelector": "T:2", "deviceSelector": "T:2",
"valueSelector": "j:$.battery.percent", "valueSelector": "J:$.battery.percent",
"unitSelector": "C:%" "unitSelector": "C:%"
} }
} }

View File

@@ -46,7 +46,7 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
t.application = config.Attributes["application"] t.application = config.Attributes["application"]
t.deviceSelector = config.Attributes["deviceSelector"] t.deviceSelector = config.Attributes["deviceSelector"]
if t.deviceSelector[:2] == "J:" || t.deviceSelector[:2] == "j:" { if t.deviceSelector[:2] == "J:" {
jp, err := jsonpath.Compile(t.deviceSelector[2:]) jp, err := jsonpath.Compile(t.deviceSelector[2:])
if err != nil { if err != nil {
log.Printf("Unable to compile deviceJsonpath: %s, %s", t.deviceSelector[2:], err) log.Printf("Unable to compile deviceJsonpath: %s, %s", t.deviceSelector[2:], err)
@@ -55,7 +55,7 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
t.deviceJsonpath = jp t.deviceJsonpath = jp
} }
t.valueSelector = config.Attributes["valueSelector"] t.valueSelector = config.Attributes["valueSelector"]
if t.valueSelector[:2] == "J:" || t.valueSelector[:2] == "j:" { if t.valueSelector[:2] == "J:" {
jp, err := jsonpath.Compile(t.valueSelector[2:]) jp, err := jsonpath.Compile(t.valueSelector[2:])
if err != nil { if err != nil {
log.Printf("Unable to compile valueJsonpath: %s, %s", t.valueSelector[2:], err) log.Printf("Unable to compile valueJsonpath: %s, %s", t.valueSelector[2:], err)
@@ -64,7 +64,7 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
t.valueJsonpath = jp t.valueJsonpath = jp
} }
t.unitSelector = config.Attributes["unitSelector"] t.unitSelector = config.Attributes["unitSelector"]
if t.unitSelector[:2] == "J:" || t.unitSelector[:2] == "j:" { if t.unitSelector[:2] == "J:" {
jp, err := jsonpath.Compile(t.unitSelector[2:]) jp, err := jsonpath.Compile(t.unitSelector[2:])
if err != nil { if err != nil {
log.Printf("Unable to compile unitJsonpath: %s, %s", t.unitSelector[2:], err) log.Printf("Unable to compile unitJsonpath: %s, %s", t.unitSelector[2:], err)
@@ -83,17 +83,13 @@ func New(id string, config config.HandlerConfigT) handler.Handler {
func (self *SingleValueExtractorJsonpathHandler) ExtractionHelper(subTopics []string, jPayload interface{}, selector string, jp *jsonpath.Compiled) (interface{}, error) { func (self *SingleValueExtractorJsonpathHandler) ExtractionHelper(subTopics []string, jPayload interface{}, selector string, jp *jsonpath.Compiled) (interface{}, error) {
var res interface{} var res interface{}
switch selector[:2] { switch selector[:2] {
case "J:", "j:": case "J:":
// extract using jsonpath from payload // extract using jsonpath from payload
r, e := jp.Lookup(jPayload) r, e := jp.Lookup(jPayload)
if e != nil { if e != nil {
return "", fmt.Errorf("jp.Lookup failed with %s", e) return "", fmt.Errorf("jp.Lookup failed with %s", e)
} }
if selector[:2] == "j:" { res = r
res = r.(float64)
} else {
res = fmt.Sprint(r)
}
case "T:": case "T:":
// T: extract from topic // T: extract from topic
i, e := strconv.Atoi(selector[2:]) i, e := strconv.Atoi(selector[2:])