FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-09 14:47:00 +00:00
Code Issues Releases Wiki Activity

98_weekprofile: use module Attribute configFile also by configDB an use global logdir

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21258 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Risiko 2020-02-23 16:33:51 +00:00
parent 08f0d6d5c8
commit 83c23472a8
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# 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.
- change: 98_weekprofile: use module Attribute configFile also by configDB
- bugfix: 98_weekprofile: use global logdir
- change: 73_DoorBird.pm New behaviour in case of Undefine and fhem startup
- feature: 70_DENON_AVR: more surround modes, commands, and readings
- feature: 37_NotifyAndroidTV.pm added fontsize parameter

60
fhem/FHEM/98_weekprofile.pm
View File

@ -1340,7 +1340,7 @@ sub weekprofile_writeProfilesToFile(@)
my $me = $hash->{NAME};
if (!defined($hash->{PROFILES})) {
Log3 $me, 4, "$me(writeProfileToFile): no pofiles to save";
Log3 $me, 4, "$me(writeProfileToFile): no profiles to save";
return;
}
@ -1348,24 +1348,18 @@ sub weekprofile_writeProfilesToFile(@)
my $prfCnt = scalar(@{$hash->{PROFILES}});
return if ($prfCnt <= $start);
my $defname = "./log/weekprofile-$me.cfg";
my $filename = AttrVal($me,"configFile",$defname);
my $forceFile = undef;
if ( !$defname eq $filename) {
$forceFile = "file";
}
my @content;
my $idstring = "__version__=$CONFIG_VERSION";
push (@content, $idstring);
Log3 $me, 5, "$me(writeProfileToFile): write profiles to $filename";
my $json = JSON->new->allow_nonref;
for (my $i = $start; $i < $prfCnt; $i++) {
push (@content, "entry=".$json->encode($hash->{PROFILES}[$i]));
}
my $param = { FileName => $filename, ForceType => $forceFile, NoNL=>0 };
my $ret = FileWrite($param,@content);
my $filename = weekprofile_getDataFile($me);
Log3 $me, 5, "$me(writeProfileToFile): write profiles to $filename";
my $ret = FileWrite($filename,@content);
if ($ret){
Log3 $me, 1, "$me(writeProfileToFile): write profiles to $filename failed $ret";
} else {
@ -1373,6 +1367,19 @@ sub weekprofile_writeProfilesToFile(@)
weekprofile_updateReadings($hash);
}
}
##############################################
sub weekprofile_getDataFile(@)
{
my ($me) = @_;
my $filename = "%L/weekprofile-$me.cfg";
$filename = AttrVal($me,"configFile",$filename);
my @t = localtime(gettimeofday());
$filename = ResolveDateWildcards($filename,@t);
# compatibility to old weekprofile versions
# if no global logdir is set - use log
$filename =~s/%L/.\/log/g;
return $filename;
}
##############################################
sub weekprofile_readProfilesFromFile(@)
{
@ -1381,26 +1388,19 @@ sub weekprofile_readProfilesFromFile(@)
my $useTopics = AttrVal($me,"useTopics",0);
my $defname = "./log/weekprofile-$me.cfg";
my $filename = AttrVal($me,"configFile",$defname);
my $forceFile = undef;
if (!$defname eq $filename) {
$forceFile = "file";
}
my ($ret, @content) = FileRead({ FileName => $filename, ForceType => $forceFile});
if ($ret && !defined($forceFile) && $ret =~ /from database/){
Log3 $me, 1, "$me(readProfilesFromFile): $ret, retrying from local filesystem";
($ret, @content) = FileRead({ FileName => $filename, ForceType => "file" });
}
if ($ret) {
Log3 $me, 1, "$me(readProfilesFromFile): $ret";
return;
}
my $filename = weekprofile_getDataFile($me);
Log3 $me, 5, "$me(readProfilesFromFile): read profiles from $filename";
my ($ret, @content) = FileRead($filename);
if ($ret) {
if (configDBUsed()){
Log3 $me, 1, "$me(readProfilesFromFile): please import your config file $filename into configDB!";
} else {
Log3 $me, 1, "$me(readProfilesFromFile): $ret";
}
return;
}
my $json = JSON->new->allow_nonref;
my $rowCnt = 0;
my $version = undef;