Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_expandJSON: escape of left brace in regex / modified JSON array handling

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16754 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dev0 2018-05-18 10:53:11 +00:00
parent 41c3155e0e
commit 4d194d4d79
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fhem/FHEM/98_expandJSON.pm
View File

@ -22,7 +22,7 @@
#
################################################################################
my $module_version = "1.12";
my $module_version = "1.13";
package main;
@ -132,7 +132,7 @@ sub expandJSON_Notify($$) {
return "" if(IsDisabled($name));
my $events = deviceEvents($dhash, AttrVal($name, "addStateEvent", 0));
return if( !grep { m/{.*}\s*$/s } @{ $events } ); #there is no JSON content
return if( !grep { m/\{.*}\s*$/s } @{ $events } ); #there is no JSON content
for (my $i = 0; $i < int(@{$events}); $i++) {
my $event = $events->[$i];
@ -145,13 +145,13 @@ sub expandJSON_Notify($$) {
my $type = $hash->{TYPE};
Log3 $name, 5, "$type $name: Found $devName:$event";
my ($reading,$value) = $event =~ m/^\s*{.*}\s*$/s
my ($reading,$value) = $event =~ m/^\s*\{.*}\s*$/s
? ("state", $event)
: split(": ", $event, 2);
$hash->{STATE} = $dhash->{NTFY_TRIGGERTIME};
if ($value !~ m/^\s*{.*}\s*$/s) { # eg. state with an invalid json
if ($value !~ m/^\s*\{.*}\s*$/s) { # eg. state with an invalid json
Log3 $name, 5, "$type $name: Invalid JSON: $value";
return;
}
@ -182,9 +182,9 @@ sub expandJSON_decode($$$$) {
Log3 $name, 2, "$type $name: $@";
return undef;
}
my $sPrefix = $hash->{helper}{addReadingsPrefix} ? $dreading."_" : "";
readingsBeginUpdate($dhash);
# readingsBulkUpdate($dhash, "expandJSON_".$dreading, $h);
expandJSON_expand($hash,$dhash,$sPrefix,$h);
readingsEndUpdate($dhash, AttrVal($name,"do_not_notify",0) ? 0 : 1);
@ -200,12 +200,25 @@ sub expandJSON_expand($$$$;$$) {
$suffix = "" if( !$suffix );
$suffix = "_$suffix" if( $suffix );
# if( ref( $ref ) eq "ARRAY" ) {
# while( my ($key,$value) = each @{ $ref } ) {
# expandJSON_expand($hash,$dhash,$sPrefix,$value,
# $prefix.sprintf("%02i",$key+1)."_");
# }
# }
if( ref( $ref ) eq "ARRAY" ) {
while( my ($key,$value) = each @{ $ref } ) {
expandJSON_expand($hash,$dhash,$sPrefix,$value,
$prefix.sprintf("%02i",$key+1)."_");
if( ref( $value ) ) {
expandJSON_expand($hash,$dhash,$sPrefix,$value,$prefix.sprintf("%02i",$key+1)."_");
}
else {
(my $reading = $sPrefix.$prefix.sprintf("%02i",$key+1)) =~ s/[^A-Za-z\d_\.\-\/]/_/g;
readingsBulkUpdate($dhash, $reading, $value)
if $reading =~ m/^$hash->{t_regexp}$/;
}
}
}
elsif( ref( $ref ) eq "HASH" ) {
while( my ($key,$value) = each %{ $ref } ) {
if( ref( $value ) ) {
@ -256,7 +269,7 @@ sub expandJSON_isPmInstalled($$)
<h3>expandJSON</h3>
<ul>
<p>Expand a JSON string from a reading into individual readings</p>
<p>Expand a JSON object from a reading into individual readings</p>
<ul>
<li>Requirement: perl module JSON<br>
@ -264,6 +277,10 @@ sub expandJSON_isPmInstalled($$)
Perl JSON Modul. Depending on your os the required package is named:
libjson-perl or perl-JSON.
</li>
<li>
Decoding of JSON objects is fully implemented. JSON arrays are supported
but may change in future a little bit...
</li>
</ul><br>
<a name="expandJSONdefine"></a>
@ -297,13 +314,9 @@ sub expandJSON_isPmInstalled($$)
<br>
<u>Source reading:</u><br>
<code>
device:{.*} #state without attribute addStateEvent<br>
device:state:.{.*} #state with attribute addStateEvent<br>
device:reading:.{.*}<br>
Sonoff.*:ENERGY.*:.{.*}<br>
.*wifiIOT.*:.*sensor.*:.{.*}<br>
(?i)dev.*:(sensor1|sensor2|teleme.*):.{.*}<br>
(devX:{.*}|devY.*:jsonY:.{.*Wifi.*{.*SSID.*}.*})
device:\{.*} #state without attribute addStateEvent<br>
device:state:.\{.*} #state with attribute addStateEvent<br>
device:reading:.\{.*} #regular reading (typical application)<br>
</code><br>
<br>
@ -312,12 +325,10 @@ sub expandJSON_isPmInstalled($$)
<code>(Power|Current|Voltage|.*day)</code><br><br>
<u>Complete definitions:</u><br>
<code>define ej1 expandJSON device:sourceReading:.{.*} targetReading
<code>define ej expandJSON device:reading:.\{.*} targetReading
</code><br>
<code>define ej2 expandJSON Sonoff.*:ENERGY.*:.{.*} (Power|.*day)
<code>define ej expandJSON Sonoff.*:ENERGY.*:.\{.*} (Power|.*day)
</code><br>
<code>define ej3 expandJSON (?i).*_sensordev_.*:.*:.{.*}
</code><br><br>
</li><br>
</ul>