FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

70_Pushover: use readingsBulkUpdateIfChanged()

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13045 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-01-11 20:56:44 +00:00
parent 3d32c5d9b7
commit a5635ca3de
1 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fhem/FHEM/70_Pushover.pm
View File

@ -402,21 +402,18 @@ sub Pushover_ReceiveCommand($$$) {
if ( $param->{httpheader} =~ m/X-Limit-App-Limit:[\s\t]*(.*)[\s\t\n]*/ )
{
$apiLimit = $1;
readingsBulkUpdate( $hash, "apiLimit", $1 )
if ( ReadingsVal( $name, "apiLimit", "" ) ne $1 );
readingsBulkUpdateIfChanged( $hash, "apiLimit", $1 ),;
}
if ( $param->{httpheader} =~
m/X-Limit-App-Remaining:[\s\t]*(.*)[\s\t\n]*/ )
{
$apiRemaining = $1;
readingsBulkUpdate( $hash, "apiRemaining", $1 )
if ( ReadingsVal( $name, "apiRemaining", "" ) ne $1 );
readingsBulkUpdateIfChanged( $hash, "apiRemaining", $1 );
}
if ( $param->{httpheader} =~ m/X-Limit-App-Reset:[\s\t]*(.*)[\s\t\n]*/ )
{
$apiReset = $1;
readingsBulkUpdate( $hash, "apiReset", $1 )
if ( ReadingsVal( $name, "apiReset", "" ) ne $1 );
readingsBulkUpdateIfChanged( $hash, "apiReset", $1 );
}
# Server error
@ -449,28 +446,22 @@ sub Pushover_ReceiveCommand($$$) {
if ( ref($return) eq "HASH" && defined( $return->{token} ) ) {
$state = "unauthorized";
readingsBulkUpdate( $hash, "tokenState", $return->{token} )
if (
ReadingsVal( $name, "tokenState", "" ) ne $return->{token}
);
readingsBulkUpdate( $hash, "tokenState", $return->{token} );
}
elsif ( ref($return) ne "HASH" && $return =~ m/"token":"invalid"/ )
{
$state = "unauthorized";
readingsBulkUpdate( $hash, "tokenState", "invalid" )
if ( ReadingsVal( $name, "tokenState", "" ) ne "invalid" );
readingsBulkUpdate( $hash, "tokenState", "invalid" );
}
else {
readingsBulkUpdate( $hash, "tokenState", "valid" )
if ( ReadingsVal( $name, "tokenState", "" ) ne "valid" );
readingsBulkUpdateIfChanged( $hash, "tokenState", "valid" );
}
if ( ref($return) eq "HASH" && defined( $return->{user} ) ) {
$state = "unauthorized" if ( !defined( $values->{USER_KEY} ) );
readingsBulkUpdate( $hash, "userState", $return->{user} )
if ( ReadingsVal( $name, "userState", "" ) ne $return->{user}
&& !defined( $values->{USER_KEY} ) );
if ( !defined( $values->{USER_KEY} ) );
$hash->{helper}{FAILED_USERKEYS}{ $values->{USER_KEY} } =
"USERKEY "
@ -484,8 +475,7 @@ sub Pushover_ReceiveCommand($$$) {
$state = "unauthorized" if ( !defined( $values->{USER_KEY} ) );
readingsBulkUpdate( $hash, "userState", "invalid" )
if ( ReadingsVal( $name, "userState", "" ) ne "invalid"
&& !defined( $values->{USER_KEY} ) );
if ( !defined( $values->{USER_KEY} ) );
$hash->{helper}{FAILED_USERKEYS}{ $values->{USER_KEY} } =
"USERKEY "
@ -497,9 +487,8 @@ sub Pushover_ReceiveCommand($$$) {
}
else {
readingsBulkUpdate( $hash, "userState", "valid" )
if ( ReadingsVal( $name, "userState", "" ) ne "valid"
&& !defined( $values->{USER_KEY} ) );
readingsBulkUpdateIfChanged( $hash, "userState", "valid" )
if ( !defined( $values->{USER_KEY} ) );
delete $hash->{helper}{FAILED_USERKEYS}{ $values->{USER_KEY} }
if (
@ -515,12 +504,10 @@ sub Pushover_ReceiveCommand($$$) {
else {
$state = "limited" if ( $apiRemaining < 1 );
readingsBulkUpdate( $hash, "tokenState", "valid" )
if ( ReadingsVal( $name, "tokenState", "" ) ne "valid"
&& !defined( $values->{USER_KEY} ) );
readingsBulkUpdate( $hash, "userState", "valid" )
if ( ReadingsVal( $name, "userState", "" ) ne "valid"
&& !defined( $values->{USER_KEY} ) );
readingsBulkUpdateIfChanged( $hash, "tokenState", "valid" )
if ( !defined( $values->{USER_KEY} ) );
readingsBulkUpdateIfChanged( $hash, "userState", "valid" )
if ( !defined( $values->{USER_KEY} ) );
}
# messages.json
@ -627,10 +614,8 @@ sub Pushover_ReceiveCommand($$$) {
if ( defined( $return->{devices} ) );
$group = $return->{group} if ( defined( $return->{group} ) );
readingsBulkUpdate( $hash, "devices", $devices )
if ( ReadingsVal( $name, "devices", "" ) ne $devices );
readingsBulkUpdate( $hash, "group", $group )
if ( ReadingsVal( $name, "group", "" ) ne $group );
readingsBulkUpdateIfChanged( $hash, "devices", $devices );
readingsBulkUpdateIfChanged( $hash, "group", $group );
}
}
@ -643,13 +628,11 @@ sub Pushover_ReceiveCommand($$$) {
$available = 1
if ( $param->{code} ne "429"
&& ( $state eq "connected" || $state eq "error" ) );
readingsBulkUpdate( $hash, "available", $available )
if ( ReadingsVal( $name, "available", "" ) ne $available );
readingsBulkUpdateIfChanged( $hash, "available", $available );
# Set reading for state
#
readingsBulkUpdate( $hash, "state", $state )
if ( ReadingsVal( $name, "state", "" ) ne $state );
readingsBulkUpdateIfChanged( $hash, "state", $state );
# credentials validation loop
#