mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

70_SVDRP.pm: clean timer name, fix stateFormat overwrite

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26884 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
hapege
2022-12-21 21:44:50 +00:00
parent ab90210feb
commit eef584b149
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/70_SVDRP.pm
View File

@@ -15,6 +15,7 @@
# added name to next timer # added name to next timer
# expicit set for SatIP plugin # expicit set for SatIP plugin
# handle HELP responses # handle HELP responses
# 1.01.06 strip <epgsearch> info from timername, fix stateFormat overwrite
# #
######################################################################################## ########################################################################################
# #
@@ -46,7 +47,7 @@ use Blocking;
use Time::HiRes qw(gettimeofday); use Time::HiRes qw(gettimeofday);
use POSIX; use POSIX;
my $version = "1.01.05"; my $version = "1.01.06";
my %SVDRP_gets = ( my %SVDRP_gets = (
# #
@@ -391,7 +392,7 @@ sub SVDRP_closeDev {
main::Log3 $name, 5,"[$name]: closeDev: closing..."; main::Log3 $name, 5,"[$name]: closeDev: closing...";
delete $hash->{DevIoJustClosed} if (defined($hash->{DevIoJustClosed})); delete $hash->{DevIoJustClosed} if (defined($hash->{DevIoJustClosed}));
DevIo_CloseDev($hash); DevIo_CloseDev($hash);
$hash->{STATE} = "closed"; #$hash->{STATE} = "closed";
$hash->{PARTIAL}=""; $hash->{PARTIAL}="";
} }
@@ -789,6 +790,7 @@ sub SVDRP_parseTimer{
my $i3 = "0"; my $i3 = "0";
my $i4 = "0"; my $i4 = "0";
my $timername = "none"; my $timername = "none";
my $timernameraw = "none";
if (!defined($msg)){ if (!defined($msg)){
$parsedmsg = "error"; $parsedmsg = "error";
} }
@@ -798,12 +800,16 @@ sub SVDRP_parseTimer{
# 2 1:4:2022-02-13:1858:1915:50:99:RTL Aktuell - Das Wetter: # 2 1:4:2022-02-13:1858:1915:50:99:RTL Aktuell - Das Wetter:
#Log3 $name, 5, "[$name] ParseTimer: reading: $reading, result: $resultarr[$count]"; #Log3 $name, 5, "[$name] ParseTimer: reading: $reading, result: $resultarr[$count]";
($timerid, $timerstr) = split (" ", $msg,2); ($timerid, $timerstr) = split (" ", $msg,2);
($i1, $i2, $day, $start, $end, $i3, $i4, $timername) = split (":", $timerstr, 8); ($i1, $i2, $day, $start, $end, $i3, $i4, $timernameraw) = split (":", $timerstr, 8);
substr ($start, 2, 0) = ":"; substr ($start, 2, 0) = ":";
substr ($end, 2, 0) = ":"; substr ($end, 2, 0) = ":";
# strip <epgsearch> info from timername
$timernameraw =~ s/[:\r]//g;
$timername = (split /<epgsearch>/, $timernameraw, 2)[0];
# store timer ID and Name in hidden setting, to re-use with NextTimer command # store timer ID and Name in hidden setting, to re-use with NextTimer command
$timername =~ s/[:\r\n]//g; #$timername =~ s/[:\r\n]//g;
#$timername =~ s/[:\r]//g;
$SVDRP_timers{$timerid} = $timername; $SVDRP_timers{$timerid} = $timername;
readingsSingleUpdate( $hash, ".Timers", encode_json( \%SVDRP_timers ), 1 ); readingsSingleUpdate( $hash, ".Timers", encode_json( \%SVDRP_timers ), 1 );