From fd70c8b5a4d14c68c5a7a41b2220bf002f419ea3 Mon Sep 17 00:00:00 2001 From: Philipp Wo Date: Sun, 19 Apr 2020 21:46:53 +0200 Subject: [PATCH] perl::critic -5 done --- 98_TadoAPI.pm | 50 ++++++++++++-------------------------------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/98_TadoAPI.pm b/98_TadoAPI.pm index 3144afc..1ee2c15 100644 --- a/98_TadoAPI.pm +++ b/98_TadoAPI.pm @@ -88,7 +88,6 @@ sub TadoAPI_Init($$) my ($hash,$args) = @_; my $u = "wrong syntax: define TadoAPI []"; return $u if(int(@$args) < 2); -return undef; } sub TadoAPI_Define($$) @@ -141,7 +140,6 @@ sub TadoAPI_Define($$) }else{ $hash->{STATE}="no password set"; } - return undef; } sub TadoAPI_Set(@) { @@ -369,7 +367,6 @@ sub TadoAPI_Get(@) { } return $message if $message; return TadoAPI_Catch($@) if $@; - return undef; } } @@ -379,17 +376,13 @@ sub TadoAPI_Catch($) { $exception =~ /^(.*)( at.*FHEM.*)$/; return $1; } - return undef; } sub TadoAPI_Undefine($$) { my ( $hash, $name ) = @_; RemoveInternalTimer($hash); - #todo remove tokenfile - - return undef; } sub TadoAPI_CheckStatus(@){ @@ -408,8 +401,6 @@ sub TadoAPI_CheckStatus(@){ #test if api is reachable Log3 $name, $reqDebug, "TadoAPI $name" . ": " . "Request $AuthURL"; HttpUtils_NonblockingGet($param); - - return undef; } sub TadoAPI_LoadToken(@){ @@ -422,8 +413,8 @@ sub TadoAPI_LoadToken(@){ if($apiStatus){ eval { - open(TOKENFILE, '<', $tokenFileName) or die("ERROR: $!"); - $Token = decode_json()}; + open(my $TOKENFILE, '<', $tokenFileName) or die("ERROR: $!"); + $Token = decode_json(<$TOKENFILE>)}; if($@ || $tokenLifeTime < gettimeofday()){ Log3 $name, 5, "TadoAPI $name" . ": " . "Error while loading: $@ ,requesting new one" if $@; Log3 $name, 5, "TadoAPI $name" . ": " . "Token is expired, requesting new one" if $tokenLifeTime < gettimeofday(); @@ -437,11 +428,10 @@ sub TadoAPI_LoadToken(@){ $Token = TadoAPI_TokenRefresh($hash); } } - close(TOKENFILE); + close($TOKENFILE); return $Token if $Token; } TadoAPI_CheckStatus($hash); - return undef; } sub TadoAPI_NewTokenRequest(@) { @@ -486,9 +476,9 @@ sub TadoAPI_NewTokenRequest(@) { Log3 $name, 3, "TadoAPI $name" . ": " . "NewTokenRequest: decode_json failed, invalid json. error: $@ "; }else{ #write token data in file - open(TOKENFILE,">$tokenFileName") or die("ERROR: $!"); - print TOKENFILE $data . "\n"; - close(TOKENFILE); + open(my $TOKENFILE, q{>} ,$tokenFileName) or die("ERROR: $!"); + print $TOKENFILE $data . "\n"; + close($TOKENFILE); # token lifetime management $hash->{TOKEN_LIFETIME} = gettimeofday() + $decoded_data->{'expires_in'}; @@ -507,8 +497,8 @@ sub TadoAPI_TokenRefresh(@) { # load token eval { - open(TOKENFILE, '<', $hash->{TOKEN_FILE}) or die("ERROR: $!"); - $TokenData = decode_json()}; + open(my $TOKENFILE, '<', $hash->{TOKEN_FILE}) or die("ERROR: $!"); + $TokenData = decode_json(<$TOKENFILE>)}; $data = { client_id => $client_id, @@ -546,7 +536,7 @@ sub TadoAPI_TokenRefresh(@) { $hash->{STATE}="error"; }else{ #write token data in file - open(TOKENFILE,">$tokenFileName") or die("ERROR: $!"); + open(my $TOKENFILE, q{>}, $tokenFileName) or die("ERROR: $!"); print TOKENFILE $data . "\n"; close(TOKENFILE); @@ -580,8 +570,6 @@ sub TadoAPI_Update(@){ # update subs TadoAPI_UpdateFn($hash); - - return undef; } ######################## tado methods ######################## @@ -788,7 +776,6 @@ sub TadoAPI_callback($){ $hash->{STATE}="error"; Log3 $name, 3, "TadoAPI $name" . ": " . "API error: apiStatus $apiStatus ($err)"; } - return undef; } sub TadoAPI_UpdateAllZoneReadingsCallback($){ @@ -799,7 +786,6 @@ sub TadoAPI_UpdateAllZoneReadingsCallback($){ if($err ne "") { Log3 $name, 3, "Error in TadoAPI_UpdateZoneCallback while requesting ".$param->{url}." - $err"; - return undef; } elsif($data ne "") { @@ -856,7 +842,6 @@ sub Tado_UpdateZoneOverlayCallback($) if($err ne "") { Log3 $name, 3, "Error in UpdateZoneOverlayCallback while requesting ".$param->{url}." - $err"; - return undef; } elsif($data ne "") @@ -896,7 +881,6 @@ sub TadoAPI_LogInfoCallback($){ if($err ne "") { Log3 $name, 3, "Error in LogInfoCallback while requesting ".$param->{url}." - $err"; - return undef; } elsif($data ne "") @@ -1034,7 +1018,6 @@ sub TadoAPI_GetZoneInfo(@) { HttpUtils_NonblockingGet($request); } } - return undef; } sub TadoAPI_SetGeoById(@){ @@ -1125,7 +1108,6 @@ sub TadoAPI_GetHomeId(@){ } } } - return undef; } sub TadoAPI_GetGeoById(@){ @@ -1176,7 +1158,6 @@ sub TadoAPI_GetGeoById(@){ Log3 $name, 5, "TadoAPI $name" . ": " . "GetGeoById: parsing passed item"; return my ($setting, $distance) = TadoAPI_ParseMobileItem($hash, $item); } - return undef; } sub TadoAPI_ParseMobileItem(@){ @@ -1252,7 +1233,6 @@ sub TadoAPI_GetMobileDevices(@) { } } } -return undef; } sub TadoAPI_GetZoneCount(@) { @@ -1300,7 +1280,6 @@ sub TadoAPI_GetZoneCount(@) { } } } - return undef; } sub TadoAPI_GetZoneNameById(@) { @@ -1316,7 +1295,6 @@ sub TadoAPI_GetZoneNameById(@) { } } Log3 $name, 3, "TadoAPI $name" . ": " . "Error GetZoneNameById: Wrong zone ID ($zoneID)"; - return undef; } sub TadoAPI_GetZoneReadingsById(@){ @@ -1370,7 +1348,6 @@ sub TadoAPI_GetZoneReadingsById(@){ } } } - return undef; } sub TadoAPI_GetTadoDevices(@) { @@ -1416,7 +1393,6 @@ sub TadoAPI_GetTadoDevices(@) { } } } -return undef; } ###################################################### @@ -1429,7 +1405,7 @@ sub TadoAPI_storePassword($$) my $key = getUniqueId().$index; my $e_pwd = ""; - if (eval "use Digest::MD5;1") + if (eval {use Digest::MD5;1}) { $key = Digest::MD5::md5_hex(unpack "H*", $key); $key .= Digest::MD5::md5_hex($key); @@ -1461,12 +1437,11 @@ sub TadoAPI_readPassword($) if ( defined($error) ) { Log3 $name,3, "$name, cant't read Tado password from FhemUtils/uniqueID: $error"; - return undef; } if ( defined($password) ) { - if (eval "use Digest::MD5;1") + if (eval {use Digest::MD5;1}) { $key = Digest::MD5::md5_hex(unpack "H*", $key); $key .= Digest::MD5::md5_hex($key); @@ -1485,7 +1460,6 @@ sub TadoAPI_readPassword($) else { Log3 $name,3,"$name, no Tado password found in FhemUtils/uniqueID"; - return undef; } } @@ -1569,4 +1543,4 @@ sub TadoAPI_readPassword($) =end html # Ende der Commandref -=cut +=cut \ No newline at end of file