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

98_weekprofile: supporting dbconfig migrate

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21314 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Risiko 2020-02-29 10:49:53 +00:00
parent efabc75e3e
commit fc42e944c6
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# 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.
- feature: 98_weekprofile: supporting dbconfig migrate
- change: 70_DENON_AVR: even more surround-modes (thx Shadow3561)
- new: 57_SSCal: new module for Synology Calendar App (API)
- feature: Add new AttrTemplate file for speech recognition

15
fhem/FHEM/98_weekprofile.pm
View File

@ -1356,12 +1356,13 @@ sub weekprofile_writeProfilesToFile(@)
push (@content, "entry=".$json->encode($hash->{PROFILES}[$i]));
}
my $filename = weekprofile_getDataFile($me);
Log3 $me, 5, "$me(writeProfileToFile): write profiles to $filename";
my $dbused = configDBUsed();
my $filename = weekprofile_getDataFile($hash);
Log3 $me, 5, "$me(writeProfileToFile): write profiles to $filename [DB: $dbused]";
my $ret = FileWrite($filename,@content);
if ($ret){
Log3 $me, 1, "$me(writeProfileToFile): write profiles to $filename failed $ret";
Log3 $me, 1, "$me(writeProfileToFile): write profiles to $filename [DB: $dbused] failed $ret";
} else {
DoTrigger($me,"PROFILES_SAVED",1);
weekprofile_updateReadings($hash);
@ -1370,7 +1371,8 @@ sub weekprofile_writeProfilesToFile(@)
##############################################
sub weekprofile_getDataFile(@)
{
my ($me) = @_;
my ($hash) = @_;
my $me = $hash->{NAME};
my $filename = "%L/weekprofile-$me.cfg";
$filename = AttrVal($me,"configFile",$filename);
my @t = localtime(gettimeofday());
@ -1378,6 +1380,7 @@ sub weekprofile_getDataFile(@)
# compatibility to old weekprofile versions
# if no global logdir is set - use log
$filename =~s/%L/.\/log/g;
$hash->{CONFIGFILE} = $filename; # for configDB migration
return $filename;
}
##############################################
@ -1388,7 +1391,7 @@ sub weekprofile_readProfilesFromFile(@)
my $useTopics = AttrVal($me,"useTopics",0);
my $filename = weekprofile_getDataFile($me);
my $filename = weekprofile_getDataFile($hash);
Log3 $me, 5, "$me(readProfilesFromFile): read profiles from $filename";
my ($ret, @content) = FileRead($filename);
@ -1626,6 +1629,8 @@ sub weekprofile_getEditLNK_MasterDev($$)
With 'restore_topic' the defined profile in the attribute will be transfered to the thermostat.
So it is possible to change the topic easily and all thermostats will be updated with the correndponding profile.
<br><br>
Weekprofile is supports configdb and configdb migrate since svn: 21314
<br><br>
<b>Attention:</b>
To transfer a profile to a device it needs a lot of Credits.
This is not taken into account from this module. So it could be happend that the profile in the module