FHEM/mod-Weather
1
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

testing #29

Merged
marko merged 73 commits from testing into main 2023-01-07 12:49:01 +00:00
Conversation 0 Commits 73 Files Changed 12 +66 -28
2 changed files with 66 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 46cc10e80e - Show all commits

84
59_Weather.pm
View File

@@ -331,12 +331,21 @@ sub Weather_ReturnWithError {
sub Weather_DeleteReadings { sub Weather_DeleteReadings {
my $hash = shift; my $hash = shift;
my $name = $hash->{NAME};
my $delReadingRegEx; my $name = $hash->{NAME};
my $forecastConfig = Weather_ForcastConfig($hash);
my $forecastLimit = AttrVal( $name, 'forecastLimit', 5 );
my $forecastLimitNoForecast = 1;
CommandDeleteReading( undef, $name . ' .?(ASC)_.*' ); $forecastLimit = $forecastLimitNoForecast
CommandDeleteReading( undef, $name . ' ' . $delReadingRegEx ); if ( !$forecastConfig->{daily} );
CommandDeleteReading( undef,
$name . ' ' . 'fc[' . $forecastLimit . '-99]_.*' );
$forecastLimit = $forecastLimitNoForecast
if ( !$forecastConfig->{hourly} );
CommandDeleteReading( undef,
$name . ' ' . 'hfc[' . $forecastLimit . '-99]_.*' );
return; return;
} }
@@ -360,14 +369,28 @@ sub Weather_RetrieveCallbackFn {
return; return;
} }
sub Weather_ForcastConfig {
my $hash = shift;
my $name = $hash->{NAME};
my %forecastConfig;
$forecastConfig{hourly} =
( AttrVal( $name, 'forecast', '' ) =~ m{hourly}xms ? 1 : 0 );
$forecastConfig{daily} =
( AttrVal( $name, 'forecast', '' ) =~ m{daily}xms ? 1 : 0 );
$forecastConfig{alerts} =
( AttrVal( $name, 'forecast', '' ) =~ m{alerts}xms ? 1 : 0 );
return \%forecastConfig;
}
sub Weather_WriteReadings { sub Weather_WriteReadings {
my $hash = shift; my $hash = shift;
my $dataRef = shift; my $dataRef = shift;
my $name = $hash->{NAME}; my $forecastConfig = Weather_ForcastConfig($hash);
my $hourly = ( AttrVal( $name, 'forecast', '' ) =~ m{hourly}xms ? 1 : 0 ); my $name = $hash->{NAME};
my $daily = ( AttrVal( $name, 'forecast', '' ) =~ m{daily}xms ? 1 : 0 );
my $alerts = ( AttrVal( $name, 'forecast', '' ) =~ m{alerts}xms ? 1 : 0 );
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
@@ -410,16 +433,16 @@ sub Weather_WriteReadings {
### forecast ### forecast
if ( ref( $dataRef->{forecast} ) eq 'HASH' if ( ref( $dataRef->{forecast} ) eq 'HASH'
&& ( $hourly || $daily ) ) && ( $forecastConfig->{hourly} || $forecastConfig->{daily} ) )
{ {
## hourly ## hourly
if ( defined( $dataRef->{forecast}->{hourly} ) if ( defined( $dataRef->{forecast}->{hourly} )
&& ref( $dataRef->{forecast}->{hourly} ) eq 'ARRAY' && ref( $dataRef->{forecast}->{hourly} ) eq 'ARRAY'
&& scalar( @{ $dataRef->{forecast}->{hourly} } ) > 0 && scalar( @{ $dataRef->{forecast}->{hourly} } ) > 0
&& $hourly ) && $forecastConfig->{hourly} )
{ {
my $i = 0; my $i = 0;
my $limit = AttrVal( $name, 'forecastLimit', -1 ); my $limit = AttrVal( $name, 'forecastLimit', 5 );
foreach my $fc ( @{ $dataRef->{forecast}->{hourly} } ) { foreach my $fc ( @{ $dataRef->{forecast}->{hourly} } ) {
$i++; $i++;
my $f = "hfc" . $i . "_"; my $f = "hfc" . $i . "_";
@@ -469,10 +492,10 @@ sub Weather_WriteReadings {
if ( defined( $dataRef->{forecast}->{daily} ) if ( defined( $dataRef->{forecast}->{daily} )
&& ref( $dataRef->{forecast}->{daily} ) eq 'ARRAY' && ref( $dataRef->{forecast}->{daily} ) eq 'ARRAY'
&& scalar( @{ $dataRef->{forecast}->{daily} } ) > 0 && scalar( @{ $dataRef->{forecast}->{daily} } ) > 0
&& $daily ) && $forecastConfig->{daily} )
{ {
my $i = 0; my $i = 0;
my $limit = AttrVal( $name, 'forecastLimit', -1 ); my $limit = AttrVal( $name, 'forecastLimit', 5 );
foreach my $fc ( @{ $dataRef->{forecast}->{daily} } ) { foreach my $fc ( @{ $dataRef->{forecast}->{daily} } ) {
$i++; $i++;
my $f = "fc" . $i . "_"; my $f = "fc" . $i . "_";
@@ -519,7 +542,7 @@ sub Weather_WriteReadings {
} }
if ( ref( $dataRef->{alerts} ) eq 'HASH' if ( ref( $dataRef->{alerts} ) eq 'HASH'
&& $alerts ) && $forecastConfig->{alerts} )
{ {
while ( my ( $r, $v ) = each %{ $dataRef->{alerts} } ) { while ( my ( $r, $v ) = each %{ $dataRef->{alerts} } ) {
readingsBulkUpdate( $hash, $r, $v ) readingsBulkUpdate( $hash, $r, $v )
@@ -751,8 +774,6 @@ sub Weather_Define {
location => $hash->{fhem}->{LOCATION}, location => $hash->{fhem}->{LOCATION},
apioptions => $hash->{APIOPTIONS}, apioptions => $hash->{APIOPTIONS},
language => $hash->{LANG}, language => $hash->{LANG},
forecast => AttrVal( $name, 'forecast', '' ),
alerts => AttrVal( $name, 'alerts', 0 )
} }
); );
@@ -780,16 +801,26 @@ sub Weather_Attr {
if ( $cmd eq 'set' ) { if ( $cmd eq 'set' ) {
$hash->{fhem}->{api}->setForecast($attrVal); $hash->{fhem}->{api}->setForecast($attrVal);
} }
elsif ( $cmd eq 'del' ) {
$hash->{fhem}->{api}->setForecast();
}
$hash->{fhem}->{api}->setForecast(); InternalTimer( gettimeofday() + 1, \&Weather_DeleteReadings,
$hash );
}
when ('forecastLimit') {
InternalTimer( gettimeofday() + 1, \&Weather_DeleteReadings,
$hash );
} }
when ('alerts') { when ('alerts') {
if ( $cmd eq 'set' ) { if ( $cmd eq 'set' ) {
$hash->{fhem}->{api}->setAlerts($attrVal); $hash->{fhem}->{api}->setAlerts($attrVal);
} }
elsif ( $cmd eq 'del' ) {
$hash->{fhem}->{api}->setAlerts(); $hash->{fhem}->{api}->setAlerts();
}
} }
} }
@@ -1119,7 +1150,9 @@ sub WeatherCheckOptions {
<table> <table>
<tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr> <tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr>
<tr><td>apioptions</td><td><code>cachemaxage:&lt;cachemaxage&gt;</code><br>duration <tr><td>apioptions</td><td><code>cachemaxage:&lt;cachemaxage&gt;</code><br>duration
in seconds to retrieve the forecast from the cache instead from the API</td></tr> in seconds to retrieve the forecast from the cache instead from the API</td>
<td><code>version:&lt;version&gt;</code> API version which should be used.
2.5 by default, 3.0 is still possible but only with an additional subscription</td></tr>
<tr><td>location</td><td><code>&lt;latitude,longitude&gt;</code><br> <tr><td>location</td><td><code>&lt;latitude,longitude&gt;</code><br>
geographic coordinates in degrees of the location for which the geographic coordinates in degrees of the location for which the
weather is forecast; if missing, the values of the attributes weather is forecast; if missing, the values of the attributes
@@ -1229,8 +1262,9 @@ sub WeatherCheckOptions {
<li>disable: disables the retrieval of weather data - the timer runs according to schedule, <li>disable: disables the retrieval of weather data - the timer runs according to schedule,
though no data is requested from the API.</li> though no data is requested from the API.</li>
<li><a href="#readingFnAttributes">readingFnAttributes</a></li> <li><a href="#readingFnAttributes">readingFnAttributes</a></li>
<li>forecast - every/hourly/daily/off, show of forecast data. All, only hour forecast, only day forecast, none.</li> <li>forecast - hourly/daily, display of forecast data.</li>
<li>forecastLimit - Number of forecast data records which should be written as a reading.</li> <li>forecastLimit - Number of forecast data records which should be written as a reading.</li>
<li>alerts - 0/1 should alert messages be written similar to Unwetterwarnung</li>
</ul> </ul>
<br> <br>
</ul> </ul>
@@ -1314,7 +1348,9 @@ sub WeatherCheckOptions {
<tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr> <tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr>
<tr><td>apioptions</td><td><code>cachemaxage:&lt;cachemaxage&gt;</code> Zeitdauer in <tr><td>apioptions</td><td><code>cachemaxage:&lt;cachemaxage&gt;</code> Zeitdauer in
Sekunden, innerhalb derer die Wettervorhersage nicht neu abgerufen Sekunden, innerhalb derer die Wettervorhersage nicht neu abgerufen
sondern aus dem Cache zur&uuml;ck geliefert wird.</td></tr> sondern aus dem Cache zur&uuml;ck geliefert wird.</td>
<td><code>version:&lt;version&gt;</code> API Version welche verwendet werden soll.
Per Default 2.5, m&ouml;glich ist noch 3.0 aber nur mit Zusatzsubscription</td></tr>
<tr><td>location</td><td><code>&lt;latitude,longitude&gt;</code> Geographische Breite <tr><td>location</td><td><code>&lt;latitude,longitude&gt;</code> Geographische Breite
und L&auml;nge des Ortes in Grad, f&uuml;r den das Wetter vorhergesagt wird. und L&auml;nge des Ortes in Grad, f&uuml;r den das Wetter vorhergesagt wird.
Bei fehlender Angabe werden die Werte aus den gleichnamigen Attributen Bei fehlender Angabe werden die Werte aus den gleichnamigen Attributen
@@ -1426,8 +1462,10 @@ sub WeatherCheckOptions {
gem&auml;&szlig Plan doch es werden keine Daten vom gem&auml;&szlig Plan doch es werden keine Daten vom
API angefordert.</li> API angefordert.</li>
<li><a href="#readingFnAttributes">readingFnAttributes</a></li> <li><a href="#readingFnAttributes">readingFnAttributes</a></li>
<li>forecast - every/hourly/daily/off, Anzeige von forecast Daten. Alle, nur Stundenforecast, nur Tageforecast, keine.</li> <li>forecast - hourly/daily, Anzeige von forecast Daten.</li>
<li>forecastLimit - Anzahl der Forecast-Datens&auml;tze welche als Reading geschrieben werden sollen.</li> <li>forecastLimit - Anzahl der Forecast-Datens&auml;tze welche als Reading geschrieben werden sollen.</li>
<li>alerts - 0/1 Sollen Alert Meldungen &auml;nlich Unwetterwarnung geschrieben werden.</li>
</ul> </ul>
<br> <br>
</ul> </ul>

10
OpenWeatherMapAPI.pm
View File

@@ -195,8 +195,8 @@ sub new {
long => ( split( ',', $argsRef->{location} ) )[1], long => ( split( ',', $argsRef->{location} ) )[1],
fetchTime => 0, fetchTime => 0,
endpoint => 'none', endpoint => 'none',
forecast => $argsRef->{forecast}, forecast => '',
alerts => $argsRef->{alerts}, alerts => 0,
}; };
$self->{cachemaxage} = ( $self->{cachemaxage} = (
@@ -345,7 +345,7 @@ sub _RetrieveDataFromOpenWeatherMap {
. 'metric' . '&' . 'lang=' . 'metric' . '&' . 'lang='
. $self->{lang} . '&' . $self->{lang} . '&'
. 'exclude=' . 'exclude='
. _createExcludeString( $self->{forecast}, $self->{alerts} ); . _CreateExcludeString( $self->{forecast}, $self->{alerts} );
::HttpUtils_NonblockingGet($paramRef); ::HttpUtils_NonblockingGet($paramRef);
} }
@@ -353,7 +353,7 @@ sub _RetrieveDataFromOpenWeatherMap {
return; return;
} }
sub _createExcludeString { sub _CreateExcludeString {
my $forecast = shift; my $forecast = shift;
my $alerts = shift; my $alerts = shift;
@@ -364,7 +364,7 @@ sub _createExcludeString {
my %in_forecast = map { $_ => 1 } @forecast, @alerts; my %in_forecast = map { $_ => 1 } @forecast, @alerts;
my @diff = grep { not $in_forecast{$_} } @exclude; my @diff = grep { not $in_forecast{$_} } @exclude;
return join( ',', @alerts ); return join( ',', @diff );
} }
sub _RetrieveDataFinished { sub _RetrieveDataFinished {