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

98_structure.pm: async_delay+FILTER patch from justme1968 (Forum #82121)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15779 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-01-04 14:47:27 +00:00
parent 2ff4cc0289
commit a639aa0db8
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
fhem/FHEM/98_structure.pm
View File

@ -396,39 +396,38 @@ structure_Set($@)
next if($hash->{NAME} =~ m/$se/); next if($hash->{NAME} =~ m/$se/);
} }
$list[0] = $d; my $dl0 = $defs{$d};
my $sret; my $is_structure = defined($dl0) && $dl0->{TYPE} eq "structure";
if($filter) { my $async_delay = AttrVal($hash->{NAME}, "async_delay", undef);
my $ret;
my $dl0 = $defs{$list[0]}; my $cmd;
if(defined($dl0) && $dl0->{TYPE} eq "structure") { if(!$filter) {
$cmd = "set $d ". join(" ", @list[1..@list-1]);
} elsif( $is_structure ) {
$cmd = "set $d [$filter] ". join(" ", @list[1..@list-1]);
} else {
$cmd = "set $d:$filter ". join(" ", @list[1..@list-1]);
}
if(defined($async_delay) && $list[1] ne "?") {
$startAsyncProcessing = $async_delay if(!@{$hash->{".asyncQueue"}});
push @{$hash->{".asyncQueue"}}, $cmd;
} else {
my ($ostate,$ocnt) = ($dl0->{STATE}, $dl0->{CHANGEDCNT}); my ($ostate,$ocnt) = ($dl0->{STATE}, $dl0->{CHANGEDCNT});
$ret = AnalyzeCommand(undef, "set $list[0] [$filter] ". my $sret = AnalyzeCommand(undef, $cmd);
join(" ", @list[1..@list-1]) ); if($is_structure && $dl0->{CHANGEDCNT} == $ocnt) { # Forum #70488
if($dl0->{CHANGEDCNT} == $ocnt) { # Forum #70488
$dl0->{STATE} = $dl0->{READINGS}{state}{VAL} = $ostate; $dl0->{STATE} = $dl0->{READINGS}{state}{VAL} = $ostate;
structure_Notify($hash, $dl0); structure_Notify($hash, $dl0);
} }
} else {
$ret = AnalyzeCommand(undef, "set $list[0]:$filter ".
join(" ", @list[1..@list-1]) );
}
$sret .= $ret if( $ret );
} else {
my $async_delay = AttrVal($hash->{NAME}, "async_delay", undef);
if(defined($async_delay) && $list[1] ne "?") {
$startAsyncProcessing = $async_delay if(!@{$hash->{".asyncQueue"}});
push @{$hash->{".asyncQueue"}}, join(" ", @list);
} else {
$sret .= CommandSet(undef, join(" ", @list));
}
}
if($sret) { if($sret) {
$ret .= "\n" if($ret); $ret .= "\n" if($ret);
$ret .= $sret; $ret .= $sret;
}
if($list[1] eq "?") { if($list[1] eq "?") {
$sret =~ s/.*one of //; $sret =~ s/.*one of //;
map { $pars{$_} = 1 } split(" ", $sret); map { $pars{$_} = 1 } split(" ", $sret);
@ -439,10 +438,9 @@ structure_Set($@)
Log3 $hash, 5, "SET: $ret" if($ret); Log3 $hash, 5, "SET: $ret" if($ret);
if(defined($startAsyncProcessing)) { if(defined($startAsyncProcessing)) {
InternalTimer(gettimeofday()+$startAsyncProcessing, InternalTimer(gettimeofday(), "structure_asyncQueue", $hash, 0);
"structure_asyncQueue", $hash, 0);
} }
return undef if($list[1] ne "?"); return $ret if($list[1] ne "?");
$hash->{".cachedHelp"} = "Unknown argument ?, choose one of " . $hash->{".cachedHelp"} = "Unknown argument ?, choose one of " .
join(" ", sort keys(%pars)); join(" ", sort keys(%pars));
return $hash->{".cachedHelp"}; return $hash->{".cachedHelp"};
@ -455,7 +453,7 @@ structure_asyncQueue(@)
my $next_cmd = shift @{$hash->{".asyncQueue"}}; my $next_cmd = shift @{$hash->{".asyncQueue"}};
if(defined $next_cmd) { if(defined $next_cmd) {
CommandSet(undef, $next_cmd); AnalyzeCommand(undef, $next_cmd);
my $async_delay = AttrVal($hash->{NAME}, "async_delay", 0); my $async_delay = AttrVal($hash->{NAME}, "async_delay", 0);
InternalTimer(gettimeofday()+$async_delay,"structure_asyncQueue",$hash,0); InternalTimer(gettimeofday()+$async_delay,"structure_asyncQueue",$hash,0);
} }