FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 14:16:42 +00:00
Code Issues Releases Wiki Activity

98_weekprofile: prepare topics

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10562 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
risiko79 2016-01-17 18:56:43 +00:00
parent 8500cc9c11
commit e799da3c44
1 changed files with 145 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
fhem/FHEM/98_weekprofile.pm
View File

@ -22,6 +22,8 @@ my @shortDays = ("Mon","Tue","Wed","Thu","Fri","Sat","Sun");
my @DEVLIST_SEND = ("MAX","CUL_HM","weekprofile","dummy"); my @DEVLIST_SEND = ("MAX","CUL_HM","weekprofile","dummy");
my $CONFIG_VERSION = "1.1";
my %DEV_READINGS; my %DEV_READINGS;
# MAX # MAX
$DEV_READINGS{"Mon"}{"MAX"} = "weekprofile-2-Mon"; $DEV_READINGS{"Mon"}{"MAX"} = "weekprofile-2-Mon";
@ -312,6 +314,7 @@ sub weekprofile_assignDev($)
$prf = {}; $prf = {};
$prf->{NAME} = 'master'; $prf->{NAME} = 'master';
$prf->{TOPIC} = 'default';
if(defined($prfDev)) { if(defined($prfDev)) {
$prf->{DATA} = $prfDev; $prf->{DATA} = $prfDev;
@ -329,6 +332,7 @@ sub weekprofile_assignDev($)
$prf = {}; $prf = {};
$prf->{DATA} = $prfDev; $prf->{DATA} = $prfDev;
$prf->{NAME} = 'default'; $prf->{NAME} = 'default';
$prf->{TOPIC} = 'default';
} }
$hash->{STATE} = "created"; $hash->{STATE} = "created";
} }
@ -433,11 +437,19 @@ sub weekprofile_Get($$@)
$list = substr($list, 0, -1) if ($prfCnt > 0); $list = substr($list, 0, -1) if ($prfCnt > 0);
if($cmd eq "profile_data") { if($cmd eq "profile_data") {
return 'usage: profile_data <name>' if(@params < 1);
return "no profile" if ($prfCnt <= 0); return "no profile" if ($prfCnt <= 0);
my ($prf,$idx) = weekprofile_findPRF($hash,$params[0]); my ($topic, $name) = weekprofile_splitName($params[0]);
my ($prf,$idx) = weekprofile_findPRF($hash,$name,$topic);
return "profile $params[0] not found" unless ($prf); return "profile $params[0] not found" unless ($prf);
if (defined($prf->{REF})) {
($topic, $name) = weekprofile_splitName($prf->{REF});
($prf,$idx) = weekprofile_findPRF($hash,$name,$topic);
}
my $json = JSON->new; my $json = JSON->new;
my $json_text = $json->encode($prf->{DATA}); my $json_text = $json->encode($prf->{DATA});
return $json_text; return $json_text;
@ -465,12 +477,15 @@ sub weekprofile_Get($$@)
############################################## ##############################################
sub weekprofile_findPRF(@) sub weekprofile_findPRF(@)
{ {
my ($hash, $profile) = @_; my ($hash, $name, $topic) = @_;
$topic = 'default' if (!$topic);
my $found = undef; my $found = undef;
my $idx = 0; my $idx = 0;
foreach my $prf (@{$hash->{PROFILES}}){ foreach my $prf (@{$hash->{PROFILES}}){
if ( $prf->{NAME} eq $profile){ if ( ($prf->{NAME} eq $name) && ($prf->{TOPIC} eq $topic) ){
$found = $prf; $found = $prf;
last; last;
} }
@ -480,6 +495,17 @@ sub weekprofile_findPRF(@)
return ($found,$idx); return ($found,$idx);
} }
##############################################
sub weekprofile_splitName($)
{
my ($in) = @_;
my @parts = split(':',$in);
return ($parts[0],$parts[1]) if (@parts == 2);
return ('default',$in);
}
############################################## ##############################################
sub weekprofile_Set($$@) sub weekprofile_Set($$@)
{ {
@ -492,30 +518,34 @@ sub weekprofile_Set($$@)
if ($cmd eq 'profile_data') { if ($cmd eq 'profile_data') {
return 'usage: profile_data <name> <json data>' if(@params < 2); return 'usage: profile_data <name> <json data>' if(@params < 2);
my ($topic, $name) = weekprofile_splitName($params[0]);
my $jsonData = $params[1];
my $json = JSON->new; my $json = JSON->new;
my $data = undef; my $data = undef;
eval { $data = $json->decode($params[1]); }; eval { $data = $json->decode($jsonData); };
if ($@) { if ($@) {
Log3 $me, 1, "$me(Set): Error parsing profile data."; Log3 $me, 1, "$me(Set): Error parsing profile data.";
return "Error parsing profile data. No valid json format"; return "Error parsing profile data. No valid json format";
}; };
foreach my $prf (@{$hash->{PROFILES}}){ my ($found,$idx) = weekprofile_findPRF($hash,$name,$topic);
if ( $prf->{NAME} eq $params[0]){ if (defined($found)) {
$prf->{DATA} = $data; $found->{DATA} = $data;
# automatic we send master profile to master device # automatic we send master profile to master device
if ( ($params[0] eq "master") && defined($hash->{MASTERDEV}) ){ if ( ($name eq "master") && defined($hash->{MASTERDEV}) ){
weekprofile_sendDevProfile($hash->{MASTERDEV}->{NAME},$prf,$me); weekprofile_sendDevProfile($hash->{MASTERDEV}->{NAME},$found,$me);
} else { } else {
weekprofile_writeProfilesToFile($hash); weekprofile_writeProfilesToFile($hash);
} }
return undef; return undef;
} }
}
my $prfNew = {}; my $prfNew = {};
$prfNew->{NAME} = $params[0]; $prfNew->{NAME} = $name;
$prfNew->{DATA} = $data; $prfNew->{DATA} = $data;
$prfNew->{TOPIC} = $topic;
push @{$hash->{PROFILES}}, $prfNew; push @{$hash->{PROFILES}}, $prfNew;
weekprofile_updateReadings($hash); weekprofile_updateReadings($hash);
weekprofile_writeProfilesToFile($hash); weekprofile_writeProfilesToFile($hash);
@ -525,9 +555,9 @@ sub weekprofile_Set($$@)
$list.= ' send_to_device' if ($prfCnt > 0); $list.= ' send_to_device' if ($prfCnt > 0);
if ($cmd eq 'send_to_device') { if ($cmd eq 'send_to_device') {
return 'usage: send_to_device <profile name> [device(s)]' if(@params < 1); return 'usage: send_to_device <name> [device(s)]' if(@params < 1);
my $profile = $params[0]; my ($topic, $name) = weekprofile_splitName($params[0]);
my @devices = (); my @devices = ();
if (@params == 2) { if (@params == 2) {
@ -538,10 +568,10 @@ sub weekprofile_Set($$@)
return "Error no devices given and no master device" if (@devices == 0); return "Error no devices given and no master device" if (@devices == 0);
my ($found,$idx) = weekprofile_findPRF($hash,$profile); my ($found,$idx) = weekprofile_findPRF($hash,$name,$topic);
if (!defined($found)) { if (!defined($found)) {
Log3 $me, 1, "$me(Set): Error unknown profile $profile"; Log3 $me, 1, "$me(Set): Error unknown profile $params[0]";
return "Error unknown profile $profile"; return "Error unknown profile $params[0]";
} }
my $err = ''; my $err = '';
@ -559,13 +589,14 @@ sub weekprofile_Set($$@)
if ($cmd eq 'copy_profile') { if ($cmd eq 'copy_profile') {
return 'usage: copy_profile <source> <target>' if(@params < 2); return 'usage: copy_profile <source> <target>' if(@params < 2);
my $srcName = $params[0]; my ($srcTopic, $srcName) = weekprofile_splitName($params[0]);
my $destName= $params[1]; my ($destTopic, $destName) = weekprofile_splitName($params[1]);
my $prfSrc = undef; my $prfSrc = undef;
my $prfDest = undef; my $prfDest = undef;
foreach my $prf (@{$hash->{PROFILES}}){ foreach my $prf (@{$hash->{PROFILES}}){
$prfSrc = $prf if ($prf->{NAME} eq $srcName); $prfSrc = $prf if ( ($prf->{NAME} eq $srcName) && ($prf->{TOPIC} eq $srcTopic) );
$prfDest = $prf if ($prf->{NAME} eq $destName); $prfDest = $prf if ( ($prf->{NAME} eq $destName) && ($prf->{TOPIC} eq $destTopic) );
} }
return "Error unknown profile $srcName" unless($prfSrc); return "Error unknown profile $srcName" unless($prfSrc);
Log3 $me, 4, "$me(Set): override profile $destName" if ($prfDest); Log3 $me, 4, "$me(Set): override profile $destName" if ($prfDest);
@ -576,6 +607,40 @@ sub weekprofile_Set($$@)
$prfDest = {}; $prfDest = {};
$prfDest->{NAME} = $destName; $prfDest->{NAME} = $destName;
$prfDest->{DATA} = $prfSrc->{DATA}; $prfDest->{DATA} = $prfSrc->{DATA};
$prfDest->{TOPIC} = $destTopic;
push @{$hash->{PROFILES}}, $prfDest;
}
weekprofile_writeProfilesToFile($hash);
weekprofile_updateReadings($hash);
return undef;
}
#----------------------------------------------------------
$list.= " reference_profile";
if ($cmd eq 'reference_profile') {
return 'usage: copy_profile <source> <target>' if(@params < 2);
my ($srcTopic, $srcName) = weekprofile_splitName($params[0]);
my ($destTopic, $destName) = weekprofile_splitName($params[1]);
my $prfSrc = undef;
my $prfDest = undef;
foreach my $prf (@{$hash->{PROFILES}}){
$prfSrc = $prf if ( ($prf->{NAME} eq $srcName) && ($prf->{TOPIC} eq $srcTopic) );
$prfDest = $prf if ( ($prf->{NAME} eq $destName) && ($prf->{TOPIC} eq $destTopic) );
}
return "Error unknown profile $srcName" unless($prfSrc);
Log3 $me, 4, "$me(Set): override profile $destName" if ($prfDest);
if ($prfDest){
$prfDest->{DATA} = undef;
$prfDest->{REF} = "$destTopic:$destName";
} else {
$prfDest = {};
$prfDest->{NAME} = $destName;
$prfDest->{DATA} = undef;
$prfDest->{TOPIC} = $destTopic;
$prfDest->{REF} = "$destTopic:$destName";
push @{$hash->{PROFILES}}, $prfDest; push @{$hash->{PROFILES}}, $prfDest;
} }
weekprofile_writeProfilesToFile($hash); weekprofile_writeProfilesToFile($hash);
@ -590,7 +655,9 @@ sub weekprofile_Set($$@)
return 'Error master profile can not removed' if( ($params[0] eq "master") && defined($hash->{MASTERDEV}) ); return 'Error master profile can not removed' if( ($params[0] eq "master") && defined($hash->{MASTERDEV}) );
return 'Error Remove last profile is not allowed' if(scalar(@{$hash->{PROFILES}}) == 1); return 'Error Remove last profile is not allowed' if(scalar(@{$hash->{PROFILES}}) == 1);
my ($delprf,$idx) = weekprofile_findPRF($hash,$params[0]); my ($topic, $name) = weekprofile_splitName($params[0]);
my ($delprf,$idx) = weekprofile_findPRF($hash,$name,$topic);
return "Error unknown profile $params[0]" unless($delprf); return "Error unknown profile $params[0]" unless($delprf);
splice(@{$hash->{PROFILES}},$idx, 1); splice(@{$hash->{PROFILES}},$idx, 1);
@ -707,10 +774,12 @@ sub weekprofile_writeProfilesToFile(@)
return; return;
} }
print $fh "__version__=".$CONFIG_VERSION."\n";
Log3 $me, 5, "$me(writeProfileToFile): write profiles to $filename"; Log3 $me, 5, "$me(writeProfileToFile): write profiles to $filename";
my $json = JSON->new; my $json = JSON->new;
for (my $i = $start; $i < $prfCnt; $i++) { for (my $i = $start; $i < $prfCnt; $i++) {
print $fh $hash->{PROFILES}[$i]->{NAME}."=".$json->encode($hash->{PROFILES}[$i]->{DATA})."\n"; print $fh "entry=".$json->encode($hash->{PROFILES}[$i])."\n";
} }
close $fh; close $fh;
} }
@ -738,6 +807,7 @@ sub weekprofile_readProfilesFromFile(@)
my $json = JSON->new; my $json = JSON->new;
my $rowCnt = 0; my $rowCnt = 0;
my $version = undef;
while (my $row = <$fh>) { while (my $row = <$fh>) {
chomp $row; chomp $row;
Log3 $me, 5, "$me(readProfilesFromFile): data row $row"; Log3 $me, 5, "$me(readProfilesFromFile): data row $row";
@ -746,6 +816,14 @@ sub weekprofile_readProfilesFromFile(@)
Log3 $me, 1, "$me(readProfilesFromFile): incorrect data row"; Log3 $me, 1, "$me(readProfilesFromFile): incorrect data row";
next; next;
} }
if ($rowCnt == 0 && $data[0]=~/__version__/) {
$version=$data[1] * 1;
Log3 $me, 5, "$me(readProfilesFromFile): detect version $version";
next;
}
if (!$version || $version < 1.1) {
my $prfData=undef; my $prfData=undef;
eval { $prfData = $json->decode($data[1]); }; eval { $prfData = $json->decode($data[1]); };
if ($@) { if ($@) {
@ -756,6 +834,7 @@ sub weekprofile_readProfilesFromFile(@)
my $prfNew = {}; my $prfNew = {};
$prfNew->{NAME} = $data[0]; $prfNew->{NAME} = $data[0];
$prfNew->{DATA} = $prfData; $prfNew->{DATA} = $prfData;
$prfNew->{TOPIC} = 'default';
if (!$hash->{MASTERDEV} && $rowCnt == 0) { if (!$hash->{MASTERDEV} && $rowCnt == 0) {
$hash->{PROFILES}[0] = $prfNew; # replace default $hash->{PROFILES}[0] = $prfNew; # replace default
@ -763,6 +842,26 @@ sub weekprofile_readProfilesFromFile(@)
push @{$hash->{PROFILES}}, $prfNew; push @{$hash->{PROFILES}}, $prfNew;
} }
$rowCnt++; $rowCnt++;
} #----------------------------------------------------- 1.1
elsif ($version = 1.1) {
my $prfNew=undef;
eval { $prfNew = $json->decode($data[1]); };
if ($@) {
Log3 $me, 1, "$me(readProfilesFromFile): Error parsing profile data $data[1]";
next;
};
if (!$hash->{MASTERDEV} && $rowCnt == 0) {
$hash->{PROFILES}[0] = $prfNew; # replace default
} else {
push @{$hash->{PROFILES}}, $prfNew;
}
$rowCnt++;
} else {
Log3 $me, 1, "$me(readProfilesFromFile): Error unknown version $version";
close $fh;
return;
}
} }
close $fh; close $fh;
} }
@ -878,6 +977,7 @@ sub weekprofile_getEditLNK_MasterDev($$)
1; 1;
=pod =pod
=item helper
=begin html_de =begin html_de