73_NUKIBridge: in the Set and Get methods, updated the return conditions to exclude the endpoint from the results when it matches the output from the command handlers
git-svn-id: https://svn.fhem.de/fhem/trunk@30404 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
@@ -1,5 +1,8 @@
|
|||||||
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
|
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
|
||||||
# Do not insert empty lines here, update check depends on it
|
# Do not insert empty lines here, update check depends on it
|
||||||
|
- bugfix: 73_NUKIBridge: in the `Set` and `Get` methods, updated the return
|
||||||
|
conditions to exclude the endpoint from the results
|
||||||
|
when it matches the output from the command handlers
|
||||||
- bugfix: 72_FRITZBOX: warning: Odd number of elements in hash assignment
|
- bugfix: 72_FRITZBOX: warning: Odd number of elements in hash assignment
|
||||||
- bugfix: 98_vitoconnect: Fix duplicate timer in case of password update
|
- bugfix: 98_vitoconnect: Fix duplicate timer in case of password update
|
||||||
- change: 74_NUKIDevice: Add UTF-8 encoding for reading bulk updates
|
- change: 74_NUKIDevice: Add UTF-8 encoding for reading bulk updates
|
||||||
|
|||||||
@@ -267,7 +267,7 @@ sub Initialize {
|
|||||||
],
|
],
|
||||||
"release_status": "stable",
|
"release_status": "stable",
|
||||||
"license": "GPL_2",
|
"license": "GPL_2",
|
||||||
"version": "v2.1.0",
|
"version": "v2.1.1",
|
||||||
"x_apiversion": "1.13.0",
|
"x_apiversion": "1.13.0",
|
||||||
"author": [
|
"author": [
|
||||||
"Marko Oldenburg <leongaultier@gmail.com>"
|
"Marko Oldenburg <leongaultier@gmail.com>"
|
||||||
|
|||||||
@@ -454,21 +454,24 @@ sub Set {
|
|||||||
return 'usage: callbackRemove'
|
return 'usage: callbackRemove'
|
||||||
if ( split( m{\s+}xms, $arg ) > 1 );
|
if ( split( m{\s+}xms, $arg ) > 1 );
|
||||||
my $id = defined $arg ? $arg : 0;
|
my $id = defined $arg ? $arg : 0;
|
||||||
$endpoint = 'callback/remove';
|
|
||||||
$param = '{"param":"' . $id . '"}';
|
$param = '{"param":"' . $id . '"}';
|
||||||
|
$endpoint = 'callback/remove';
|
||||||
},
|
},
|
||||||
configauth => sub {
|
configauth => sub {
|
||||||
return 'usage: configAuth'
|
return 'usage: configAuth'
|
||||||
if ( split( m{\s+}xms, $arg ) > 1 );
|
if ( split( m{\s+}xms, $arg ) > 1 );
|
||||||
my $configAuth = 'enable=' . ( $arg eq 'enable' ? 1 : 0 );
|
my $configAuth = 'enable=' . ( $arg eq 'enable' ? 1 : 0 );
|
||||||
$endpoint = 'configAuth';
|
|
||||||
$param = '{"param":"' . $configAuth . '"}';
|
$param = '{"param":"' . $configAuth . '"}';
|
||||||
|
$endpoint = 'configAuth';
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
if ( exists $handlers{$cmd} ) {
|
if ( exists $handlers{$cmd} ) {
|
||||||
my $result = $handlers{$cmd}->();
|
my $result = $handlers{$cmd}->();
|
||||||
return $result if defined $result && length $result;
|
return $result
|
||||||
|
if defined $result
|
||||||
|
&& length $result
|
||||||
|
&& $result ne $endpoint;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
my $list = 'info:noArg getDeviceList:noArg ';
|
my $list = 'info:noArg getDeviceList:noArg ';
|
||||||
@@ -507,7 +510,10 @@ sub Get {
|
|||||||
|
|
||||||
if ( exists $handlers{$cmd} ) {
|
if ( exists $handlers{$cmd} ) {
|
||||||
my $result = $handlers{$cmd}->();
|
my $result = $handlers{$cmd}->();
|
||||||
return $result if defined $result && length $result;
|
return $result
|
||||||
|
if defined $result
|
||||||
|
&& length $result
|
||||||
|
&& $result ne $endpoint;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
my $list = 'callbackList:noArg ';
|
my $list = 'callbackList:noArg ';
|
||||||
|
|||||||
Reference in New Issue
Block a user