Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

76_SMAPortal: contrib 2.6.2

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@22043 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-05-27 16:58:01 +00:00
parent e96f6ad0da
commit 754e041355
1 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
contrib/DS_Starter/76_SMAPortal.pm
View File

@ -134,7 +134,7 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"2.6.2" => "26.05.2020 improve stability of data retrieval ", "2.6.2" => "26.05.2020 improve stability of data retrieval, new command delCookieFile ",
"2.6.1" => "21.04.2020 update time in portalgraphics changed to last successful live data retrieval, credentials are not shown in list device ", "2.6.1" => "21.04.2020 update time in portalgraphics changed to last successful live data retrieval, credentials are not shown in list device ",
"2.6.0" => "20.04.2020 change package config, improve cookie management, decouple switch consumers from livedata retrieval ". "2.6.0" => "20.04.2020 change package config, improve cookie management, decouple switch consumers from livedata retrieval ".
"some improvements according to PBP ", "some improvements according to PBP ",
@ -281,7 +281,8 @@ sub Set { ## no critic
# erweiterte Setlist wenn Credentials gesetzt # erweiterte Setlist wenn Credentials gesetzt
$setlist = "Unknown argument $opt, choose one of ". $setlist = "Unknown argument $opt, choose one of ".
"credentials ". "credentials ".
"createPortalGraphic:Generation,Consumption,Generation_Consumption,Differential " "createPortalGraphic:Generation,Consumption,Generation_Consumption,Differential ".
"delCookieFile:noArg "
; ;
if($hash->{HELPER}{PLANTOID} && $hash->{HELPER}{CONSUMER}) { if($hash->{HELPER}{PLANTOID} && $hash->{HELPER}{CONSUMER}) {
my $lfd = 0; my $lfd = 0;
@ -385,6 +386,13 @@ sub Set { ## no critic
$hash->{HELPER}{SETTER} = "$opt:$prop"; $hash->{HELPER}{SETTER} = "$opt:$prop";
CallInfo($hash); CallInfo($hash);
} elsif ($opt eq "delCookieFile") {
my $cf = AttrVal($name, "cookieLocation", "./log/mycookies.txt");
my $err = delcookiefile ($hash, 1);
my $ret = $err ? qq{WARNING - Cookie file "$cf" not deleted: $err} : qq{Cookie file "$cf" deleted};
Log3 ($name, 3, qq{$name - $ret}) if($err);
return $ret;
} else { } else {
return "$setlist"; return "$setlist";
} }
@ -691,7 +699,20 @@ sub GetSetData { ## no cri
my $ua = LWP::UserAgent->new; my $ua = LWP::UserAgent->new;
# Define user agent type # Define user agent type
$ua->agent("$useragent"); # $ua->agent("$useragent");
# Header Daten
$ua->default_header("Accept" => "*/*",
"Accept-Encoding" => "gzip, deflate, br",
"Accept-Language" => "en-US;q=0.7,en;q=0.3",
"Connection" => "keep-alive",
"Cookie" => "collapseNavi_state=shown",
"DNT" => 1,
"Host" => "www.sunnyportal.com",
"Referer" => "https://www.sunnyportal.com/FixedPages/HoManLive.aspx",
"User-Agent" => $useragent,
"X-Requested-With" => "XMLHttpRequest"
);
# Cookies # Cookies
$ua->cookie_jar(HTTP::Cookies->new( file => "$cookieLocation", $ua->cookie_jar(HTTP::Cookies->new( file => "$cookieLocation",
@ -709,6 +730,7 @@ sub GetSetData { ## no cri
if(!$day || $day != $mday) { if(!$day || $day != $mday) {
$count = 0; $count = 0;
$day = $mday; $day = $mday;
Log3 ($name, 2, qq{$name - reset day cycle count to >0< });
} }
$count++; $count++;
$cstring = "$day:$count"; $cstring = "$day:$count";
@ -949,7 +971,7 @@ sub ParseData { ## no critic
# Livedaten konnte nicht gelesen werden, neuer Versuch zeitverzögert # Livedaten konnte nicht gelesen werden, neuer Versuch zeitverzögert
delete($hash->{HELPER}{RUNNING_PID}); delete($hash->{HELPER}{RUNNING_PID});
$hash->{HELPER}{RETRIES} -= 1; $hash->{HELPER}{RETRIES} -= 1;
InternalTimer(gettimeofday()+1, "FHEM::SMAPortal::retrygetdata", $hash, 0); InternalTimer(gettimeofday()+3, "FHEM::SMAPortal::retrygetdata", $hash, 0);
return; return;
} }
@ -1026,9 +1048,9 @@ sub ParseData { ## no critic
$batteryout = 1; $batteryout = 1;
} }
$errMsg = 1 if($k =~ /^ErrorMessages$/x); if($k =~ /^ErrorMessages$/x) { $errMsg = 1; $new_val = qq{<html><b>Message got from SMA Sunny Portal:</b><br>$new_val</html>};}
$warnMsg = 1 if($k =~ /^WarningMessages$/x); if($k =~ /^WarningMessages$/x) { $warnMsg = 1; $new_val = qq{<html><b>Message got from SMA Sunny Portal:</b><br>$new_val</html>};}
$infoMsg = 1 if($k =~ /^InfoMessages$/x); if($k =~ /^InfoMessages$/x) { $infoMsg = 1; $new_val = qq{<html><b>Message got from SMA Sunny Portal:</b><br>$new_val</html>};}
Log3 ($name, 4, "$name - $k - $new_val"); Log3 ($name, 4, "$name - $k - $new_val");
readingsBulkUpdate($hash, "L1_$k", $new_val); readingsBulkUpdate($hash, "L1_$k", $new_val);
@ -1144,6 +1166,7 @@ sub delcookiefile {
my ($hash,$must) = @_; my ($hash,$must) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my ($validperiod, $cookieLocation, $oldlogintime, $delfile); my ($validperiod, $cookieLocation, $oldlogintime, $delfile);
my $err = "";
RemoveInternalTimer($hash,"FHEM::SMAPortal::delcookiefile"); RemoveInternalTimer($hash,"FHEM::SMAPortal::delcookiefile");
@ -1153,16 +1176,13 @@ sub delcookiefile {
if($must) { if($must) {
# Cookie Zwangslöschung # Cookie Zwangslöschung
$delfile = unlink($cookieLocation); $delfile = unlink($cookieLocation) or $err = $!;
} }
$oldlogintime = $hash->{HELPER}{oldlogintime} // 0; $oldlogintime = $hash->{HELPER}{oldlogintime} // 0;
if($init_done == 1) { if($init_done == 1 && gettimeofday() > $oldlogintime+$validperiod) { # löschen wenn gettimeofday()+$validperiod abgelaufen
# Abfrage ob gettimeofday() größer ist als gettimeofday()+$validperiod $delfile = unlink($cookieLocation) or $err = $!;
if (gettimeofday() > $oldlogintime+$validperiod) {
$delfile = unlink($cookieLocation);
}
} }
if($delfile) { if($delfile) {
@ -1173,7 +1193,7 @@ sub delcookiefile {
InternalTimer(gettimeofday()+30, "FHEM::SMAPortal::delcookiefile", $hash, 0); InternalTimer(gettimeofday()+30, "FHEM::SMAPortal::delcookiefile", $hash, 0);
return; return ($err);
} }
################################################################ ################################################################
@ -1801,7 +1821,7 @@ sub analyzeLivedata { ## no crit
} }
if($k =~ m/ErrorMessages/x && $new_val =~ /.*The current data cannot be retrieved from the PV system. Check the cabling and configuration of the following energy meters.*/) { ## no critic 'regular expression' # Regular expression without "/x" flag nicht anwenden !!! if($k =~ m/ErrorMessages/x && $new_val =~ /.*The current data cannot be retrieved from the PV system. Check the cabling and configuration of the following energy meters.*/) { ## no critic 'regular expression' # Regular expression without "/x" flag nicht anwenden !!!
# Energiedaten konnten nicht ermittelt werden, Daten neu lesen mit Zeitverzögerung # Energiedaten konnten nicht ermittelt werden, Daten neu lesen mit Zeitverzögerung
Log3 $name, 3, "$name - Live data cannot be retrieved. Check cabling / configuration of energy meters. Try reread data ..."; Log3 $name, 3, "$name - Live data cannot be retrieved. Try reread data ...";
$retry = 1; $retry = 1;
return ($reread,$retry); return ($reread,$retry);
} }
@ -2031,7 +2051,8 @@ sub PortalAsHtml {
my $lang = AttrVal("global","language","EN"); my $lang = AttrVal("global","language","EN");
my $alias = AttrVal($name, "alias", "SMA Sunny Portal"); # Linktext als Aliasname oder "SMA Sunny Portal" my $alias = AttrVal($name, "alias", "SMA Sunny Portal"); # Linktext als Aliasname oder "SMA Sunny Portal"
my $dlink = "<a href=\"/fhem?detail=$name\">$alias</a>"; my $dlink = "<a href=\"/fhem?detail=$name\">$alias</a>";
my $lup = $hash->{HELPER}{LASTLDSUCCTIME} // "0000-00-00 00:00:00"; # letzte erfolgreiche Updatezeit Live Daten # my $lup = $hash->{HELPER}{LASTLDSUCCTIME} // "0000-00-00 00:00:00"; # letzte erfolgreiche Updatezeit Live Daten
my $lup = ReadingsTimestamp($name, "state", "0000-00-00 00:00:00"); # letzte Updatezeit (Forecast trifft ausreichend auch wenn keine Live-Daten updated)
my $lupt = "last update:"; my $lupt = "last update:";
my $lblPv4h = "4h:"; my $lblPv4h = "4h:";
@ -2756,6 +2777,12 @@ return;
</ul> </ul>
<br> <br>
<ul>
<li><b> set &lt;name&gt; delCookieFile </b> </li>
The active cookie will be deleted.
</ul>
<br>
<ul> <ul>
<li><b> set &lt;name&gt; &lt;consumer name&gt; &lt;on | off | auto&gt; </b> </li> <li><b> set &lt;name&gt; &lt;consumer name&gt; &lt;on | off | auto&gt; </b> </li>
If the attribute "detailLevel" is set to 3 or higher, consumer data are fetched from the SMA Sunny Portal. If the attribute "detailLevel" is set to 3 or higher, consumer data are fetched from the SMA Sunny Portal.
@ -2963,6 +2990,12 @@ return;
</ul> </ul>
<br> <br>
<ul>
<li><b> set &lt;name&gt; delCookieFile </b> </li>
Das aktive Cookie wird gelöscht.
</ul>
<br>
<ul> <ul>
<li><b> set &lt;name&gt; &lt;Verbrauchername&gt; &lt;on | off | auto&gt; </b> </li> <li><b> set &lt;name&gt; &lt;Verbrauchername&gt; &lt;on | off | auto&gt; </b> </li>
Ist das Atttribut detailLevel auf 3 oder höher gesetzt, werden Verbraucherdaten aus dem SMA Sunny Portal abgerufen. Ist das Atttribut detailLevel auf 3 oder höher gesetzt, werden Verbraucherdaten aus dem SMA Sunny Portal abgerufen.