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

74_HusqvarnaAutomower: Updated decode_json error handling

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19113 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
krannich 2019-04-04 20:12:17 +00:00
parent 1d575d3124
commit 8946a3c8d0
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/74_HusqvarnaAutomower.pm
View File

@ -364,11 +364,10 @@ sub HusqvarnaAutomower_APIAuthResponse($) {
} elsif($data ne "") { } elsif($data ne "") {
my $result = {}; my $result = eval { decode_json($data) };
eval { $result = decode_json($data) };
if ($@) { if ($@) {
Log3( $name, 3, " - JSON error while request: $@"); Log3( $name, 3, " - JSON error while request: $@");
return undef; return;
} }
if ($result->{errors}) { if ($result->{errors}) {
@ -507,11 +506,10 @@ sub HusqvarnaAutomower_getMowerResponse($) {
Log3 $name, 5, "Automower(s) found"; Log3 $name, 5, "Automower(s) found";
Log3 $name, 5, $data; Log3 $name, 5, $data;
my $result = {}; my $result = eval { decode_json($data) };
eval { $result = decode_json($data) };
if ($@) { if ($@) {
Log3( $name, 3, " - JSON error while request: $@"); Log3( $name, 3, " - JSON error while request: $@");
return undef; return;
} }
my $mower = $hash->{HusqvarnaAutomower}->{mower}; my $mower = $hash->{HusqvarnaAutomower}->{mower};
@ -592,14 +590,12 @@ sub HusqvarnaAutomower_getMowerStatusResponse($) {
} elsif($data ne "") { } elsif($data ne "") {
#Log3 $name, 5, $data; #Log3 $name, 5, $data;
my $result = {}; my $result = eval { decode_json($data) };
eval { $result = decode_json($data) };
if ($@) { if ($@) {
Log3( $name, 3, " - JSON error while request: $@"); Log3( $name, 3, " - JSON error while request: $@");
return undef; return;
} }
$hash->{HusqvarnaAutomower}->{mower_battery} = $result->{'batteryPercent'}; $hash->{HusqvarnaAutomower}->{mower_battery} = $result->{'batteryPercent'};
$hash->{HusqvarnaAutomower}->{mower_activity} = HusqvarnaAutomower_ToGerman($hash, $result->{'mowerStatus'}->{'activity'}); $hash->{HusqvarnaAutomower}->{mower_activity} = HusqvarnaAutomower_ToGerman($hash, $result->{'mowerStatus'}->{'activity'});
$hash->{HusqvarnaAutomower}->{mower_state} = HusqvarnaAutomower_ToGerman($hash, $result->{'mowerStatus'}->{'state'}); $hash->{HusqvarnaAutomower}->{mower_state} = HusqvarnaAutomower_ToGerman($hash, $result->{'mowerStatus'}->{'state'});
@ -710,11 +706,10 @@ sub HusqvarnaAutomower_CMDResponse($) {
} elsif($data ne "") { } elsif($data ne "") {
my $result = {}; my $result = eval { decode_json($data) };
eval { $result = decode_json($data) };
if ($@) { if ($@) {
Log3( $name, 3, " - JSON error while request: $@"); Log3( $name, 3, " - JSON error while request: $@");
return undef; return;
} }
if ($result->{errors}) { if ($result->{errors}) {