Public/FHEM-Tado
1
0
Fork 0
Code Issues Pull Requests Releases 12 Activity

code cleanup

Browse Source 
removed unused sub´s
This commit is contained in:
Philipp Wo 2019-12-10 10:14:23 +01:00
parent 4b7a09ff0b
commit 470c4e135a
1 changed files with 54 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
98_TadoAPI.pm
View File

@ -15,9 +15,9 @@
# NOTES: ---
# AUTHOR: Philipp Wolfmajer
# ORGANIZATION:
# VERSION: 1.0
# CREATED: 04/12/2019 07:55:44 PM
# REVISION: 11/21/2019 05:17:22 PM
# VERSION: 0.6
# CREATED: 04/12/2019
# REVISION: 12/10/2019
#===============================================================================
package main;
@ -62,7 +62,6 @@ my %gets = (
"getMobileDevices" => "noArg"
);
sub
TadoAPI_Initialize($)
{
@ -77,7 +76,6 @@ TadoAPI_Initialize($)
"mobileID " .
"updateIntervall " .
$main::readingFnAttributes;
}
sub TadoAPI_Init($$)
@ -114,7 +112,6 @@ sub TadoAPI_Define($$)
if ($main::init_done) {
# do something?
return TadoAPI_Catch($@) if $@;
}
@ -158,9 +155,6 @@ sub TadoAPI_Set(@) {
return "Unknown argument $a[1], choose one of " . join(" ", @cmds);
}
if (($cmd ne "password"))
{
my $pwd = TadoAPI_readPassword($name);
@ -243,7 +237,6 @@ sub TadoAPI_Set(@) {
InternalTimer( gettimeofday() + 10, "TadoAPI_Update", $hash, 0 );
Log3 $name, 3, "TadoAPI $name" . ": " . "$cmd finished\n";
}
return $message if $message;
return TadoAPI_Catch($@) if $@;
}
@ -342,7 +335,6 @@ sub TadoAPI_Get(@) {
last;
};
}
return $message if $message;
return TadoAPI_Catch($@) if $@;
return undef;
@ -376,6 +368,15 @@ sub TadoAPI_LoadToken(@){
$tokenLifeTime = 0 if(!defined $tokenLifeTime || $tokenLifeTime eq '');
my $Token = undef;
# test api status if no token could be loaded
my $param = {
url => $AuthURL,
timeout => 3,
hash => $hash,
method => "GET",
callback => \&TadoAPI_callback
};
if($apiStatus){
eval {
open(TOKENFILE, '<', $tokenFileName) or die("ERROR: $!");
@ -384,6 +385,7 @@ sub TadoAPI_LoadToken(@){
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();
$Token = TadoAPI_NewTokenRequest($hash);
HttpUtils_NonblockingGet($param);
}else{
Log3 $name, 5, "TadoAPI $name" . ": " . "Token expires at " . localtime($tokenLifeTime);
# if token is about to expire, refresh him
@ -395,15 +397,6 @@ sub TadoAPI_LoadToken(@){
close(TOKENFILE);
return $Token if $Token;
}
# test api status if no token could be loaded
my $param = {
url => $AuthURL,
timeout => 3,
hash => $hash,
method => "GET",
callback => \&TadoAPI_callback
};
HttpUtils_NonblockingGet($param);
return undef;
@ -418,7 +411,6 @@ sub TadoAPI_NewTokenRequest(@) {
Log3 $name, 5, "TadoAPI $name" . ": " . "calling NewTokenRequest()";
$data = {
client_id => $client_id,
client_secret => $client_secret,
@ -729,6 +721,9 @@ sub TadoAPI_callback($){
my $name = $hash->{NAME};
$param->{code} = 0 unless defined $param->{code};
# todo remove this
Log3 $name, 3, "TadoAPI $name" . ": " . "API Callback running..... Callback Status: " . $param->{code};
if($param->{code} == 401 || $param->{code} == 400){
$apiStatus = 1;
$hash->{STATE}="reachable";
@ -753,7 +748,6 @@ sub TadoAPI_UpdateAllZoneReadingsCallback($){
Log3 $name, 3, "Error in TadoAPI_UpdateZoneCallback while requesting ".$param->{url}." - $err";
return undef;
}
elsif($data ne "")
{
Log3 $name, 5, "url ".$param->{url}." returned: $data";
@ -822,7 +816,6 @@ sub Tado_UpdateZoneOverlayCallback($)
}
# finaly update readings
TadoAPI_GetZoneReadingsById($hash, $zoneID);
}
sub TadoAPI_LogInfoCallback($){
@ -842,42 +835,6 @@ sub TadoAPI_LogInfoCallback($){
}
}
sub TadoAPI_UpdateTadoDeviceInformationCallback($){
my ($param, $err, $data) = @_;
my $hash = $param->{hash};
my $name = $hash->{NAME};
if($err ne "")
{
Log3 $name, 3, "Error in UpdateTadoDeviceInformationCallback while requesting ".$param->{url}." - $err";
}
elsif($data ne "")
{
Log3 $name, 5, "url ".$param->{url}." returned: $data";
my $decoded_data = eval { decode_json($data) };
# if api returns error
eval { my $error = @$decoded_data; };
if ($@){
Log3 $name, 3, "TadoAPI $name" . ": " . "UpdateTadoDeviceInformationCallback: decode_json failed, invalid json. error:$@\n" if $@;
Log3 $name, 3, "TadoAPI $name" . ": " . "UpdateTadoDeviceInformationCallback: Error in decoded data, Code: " . $decoded_data->{'errors'}->[0]->{'code'};
$hash->{LastRequest}="error";
}else{
foreach my $zone ( @$decoded_data ){
my $devices = $zone->{'devices'};
foreach my $device ( @$devices ){
readingsBeginUpdate($hash);
readingsBulkUpdate($hash, "Battery_" . $device->{'serialNo'}, $device->{'batteryState'});
readingsEndUpdate( $hash, 1 );
$hash->{LastRequest}="OK";
}
}
}
}
}
sub TadoAPI_SetGeoByIdCallback($){
my ($param, $err, $data) = @_;
my $hash = $param->{hash};
@ -887,7 +844,6 @@ sub TadoAPI_SetGeoByIdCallback($){
{
Log3 $name, 3, "Error in TadoAPI_SetGeoByIdCallback while requesting ".$param->{url}." - $err";
}
elsif($data ne "")
{
Log3 $name, 3, "url ".$param->{url}." returned: $data";
@ -969,10 +925,8 @@ sub TadoAPI_GetZoneInfo(@) {
hash => $hash,
callback => \&TadoAPI_LogInfoCallback
};
HttpUtils_NonblockingGet($request);
# Mobileinfo
$URL = $QueryURL . qq{/$homeID/mobileDevices};
$request = {
@ -984,7 +938,6 @@ sub TadoAPI_GetZoneInfo(@) {
hash => $hash,
callback => \&TadoAPI_LogInfoCallback
};
HttpUtils_NonblockingGet($request);
my @mobDev = TadoAPI_GetMobileDevices($hash);
@ -1000,7 +953,6 @@ sub TadoAPI_GetZoneInfo(@) {
hash => $hash,
callback => \&TadoAPI_LogInfoCallback
};
HttpUtils_NonblockingGet($request);
}
@ -1019,7 +971,6 @@ sub TadoAPI_GetZoneInfo(@) {
hash => $hash,
callback => \&TadoAPI_LogInfoCallback
};
HttpUtils_NonblockingGet($request);
}
}
@ -1052,7 +1003,6 @@ sub TadoAPI_SetGeoById(@){
hash => $hash,
callback => \&TadoAPI_SetGeoByIdCallback
};
HttpUtils_NonblockingGet($request);
}
}