8 Commits
testing ... dev

Author SHA1 Message Date
af36bed895 Merge pull request 'patch-removedarksky' (#74) from patch-removedarksky into dev
Reviewed-on: #74
2025-02-05 06:11:46 +00:00
ba898624c5 ```
Refactor pre-commit hook by removing DarkSkyAPI references

Updated the pre-commit hook to eliminate references to
'lib/FHEM/APIs/Weather/DarkSkyAPI.pm'. This change was made to
simplify the codebase and make it more relevant by focusing on
the other weather API files.

Additionally, the output formatting of the pre-commit hook
has been improved for better readability, and the order of
the files in the @filenames array has been restructured for
clarity.

No breaking changes have been introduced; the pre-commit
hook continues to operate as intended.
```
2025-02-05 07:08:45 +01:00
12595b3674 ```
Refactor pre-commit hook file list and output formatting

Updated the list of files in the pre-commit hook to remove
references to 'lib/FHEM/APIs/Weather/DarkSkyAPI.pm' and adjusted
the output formatting for better readability. The order of the
files in the @filenames array has been restructured for clarity.
These changes were necessary to ensure our code base focuses on
the more relevant weather API files.

No breaking changes introduced; the pre-commit hook continues to
function as intended.
```
2025-02-05 07:07:52 +01:00
f7234b10f8 Merge pull request 'dev' (#73) from dev into main
Reviewed-on: #73
2025-02-04 20:30:22 +00:00
be3fb7bbfc Merge pull request 'patch-Unbalanced_p' (#72) from patch-Unbalanced_p into dev
Reviewed-on: #72
2025-02-04 20:29:19 +00:00
23bbc9f9b0 docs: add changelog 2025-02-04 21:27:10 +01:00
e60509fbfd docs: fix unbalanced p 2025-02-04 21:26:52 +01:00
aafeea4d5f Merge pull request 'testing' (#71) from testing into main
Reviewed-on: #71
2025-02-04 20:08:10 +00:00
4 changed files with 94 additions and 42 deletions

View File

@ -1,4 +1,54 @@
### feat: remove DarkSky, change versions remove DarkSkyAPI, no longer supported change Copyright years and versions of OWM API (HEAD -> patch-changeVersion) ### ``` Refactor pre-commit hook file list and output formatting (HEAD -> patch-removedarksky)
>Wed, 5 Feb 2025 07:07:52 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
Updated the list of files in the pre-commit hook to remove
references to 'lib/FHEM/APIs/Weather/DarkSkyAPI.pm' and adjusted
the output formatting for better readability. The order of the
files in the @filenames array has been restructured for clarity.
These changes were necessary to ensure our code base focuses on
the more relevant weather API files.
No breaking changes introduced; the pre-commit hook continues to
function as intended.
```
### docs: add changelog
>Tue, 4 Feb 2025 21:27:10 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### docs: fix unbalanced p
>Tue, 4 Feb 2025 21:26:52 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### docs: add changelog (origin/patch-changeVersion)
>Tue, 4 Feb 2025 21:01:33 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### feat: remove DarkSky, change versions remove DarkSkyAPI, no longer supported change Copyright years and versions of OWM API
>Tue, 4 Feb 2025 21:01:17 +0100 >Tue, 4 Feb 2025 21:01:17 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net) >Author: Marko Oldenburg (fhemdevelopment@cooltux.net)

View File

@ -74,7 +74,7 @@ __END__
<h3>Weather</h3> <h3>Weather</h3>
<ul> <ul>
Note: you need the JSON perl module. Use <code>apt-get install Note: you need the JSON perl module. Use <code>apt-get install
libjson-perl</code> on Debian and derivatives.<p><p> libjson-perl</code> on Debian and derivatives.<p></p>
The Weather module works with various weather APIs: The Weather module works with various weather APIs:
<ul> <ul>
@ -105,12 +105,12 @@ __END__
<tr><td><code>lang</code></td><td>language of the forecast: <code>de</code>, <tr><td><code>lang</code></td><td>language of the forecast: <code>de</code>,
<code>en</code>, <code>pl</code>, <code>fr</code>, <code>it</code> or <code>nl</code></td></tr> <code>en</code>, <code>pl</code>, <code>fr</code>, <code>it</code> or <code>nl</code></td></tr>
</table> </table>
<p> <p></p>
A very simple definition is:<br><br> A very simple definition is:<br><br>
<code>define &lt;name&gt; Weather apikey=&lt;DarkSkyAPISecretKey&gt;</code><br><br> <code>define &lt;name&gt; Weather apikey=&lt;DarkSkyAPISecretKey&gt;</code><br><br>
This uses the Dark Sky API with an individual key that you need to This uses the Dark Sky API with an individual key that you need to
retrieve from the Dark Sky web site.<p><p> retrieve from the Dark Sky web site.<p></p>
Examples: Examples:
<pre> <pre>
@ -120,9 +120,9 @@ __END__
</pre> </pre>
API-specific documentation follows.<p> API-specific documentation follows.<p></p>
<h4>Dark Sky</h4><p> <h4>Dark Sky</h4><p></p>
<table> <table>
<tr><td>API</td><td><code>DarkSkyAPI</code></td></tr> <tr><td>API</td><td><code>DarkSkyAPI</code></td></tr>
@ -133,9 +133,9 @@ __END__
weather is forecast; if missing, the values of the attributes weather is forecast; if missing, the values of the attributes
of the <code>global</code> device are taken, if these exist.</td></tr> of the <code>global</code> device are taken, if these exist.</td></tr>
</table> </table>
<p><p> <p></p>
<h4>OpenWeatherMap</h4><p> <h4>OpenWeatherMap</h4><p></p>
<table> <table>
<tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr> <tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr>
@ -151,9 +151,9 @@ __END__
weather is forecast; if missing, the values of the attributes weather is forecast; if missing, the values of the attributes
of the <code>global</code> device are taken, if these exist.</td></tr> of the <code>global</code> device are taken, if these exist.</td></tr>
</table> </table>
<p><p> <p></p>
<h4>Wunderground</h4><p> <h4>Wunderground</h4><p></p>
<table> <table>
<tr><td>API</td><td><code>wundergroundAPI</code></td></tr> <tr><td>API</td><td><code>wundergroundAPI</code></td></tr>
@ -165,7 +165,7 @@ __END__
weather is forecast; if missing, the values of the attributes weather is forecast; if missing, the values of the attributes
of the <code>global</code> device are taken, if these exist.</td></tr> of the <code>global</code> device are taken, if these exist.</td></tr>
</table> </table>
<p><p> <p></p>
The module provides four additional functions <code>WeatherAsHtml</code>, The module provides four additional functions <code>WeatherAsHtml</code>,
<code>WeatherAsHtmlV</code>, <code>WeatherAsHtmlH</code> and <code>WeatherAsHtmlV</code>, <code>WeatherAsHtmlH</code> and
@ -303,7 +303,7 @@ __END__
<ul> <ul>
Hinweis: es wird das Perl-Modul JSON ben&ouml;tigt. Mit <code>apt-get install Hinweis: es wird das Perl-Modul JSON ben&ouml;tigt. Mit <code>apt-get install
libjson-perl</code> kann es unter Debian und Derivaten installiert libjson-perl</code> kann es unter Debian und Derivaten installiert
werden.<p><p> werden.<p></p>
Das Weather-Modul arbeitet mit verschiedenen Wetter-APIs zusammen: Das Weather-Modul arbeitet mit verschiedenen Wetter-APIs zusammen:
<ul> <ul>
@ -334,14 +334,15 @@ __END__
<tr><td><code>lang</code></td><td>Sprache der Wettervorhersage: <code>de</code>, <tr><td><code>lang</code></td><td>Sprache der Wettervorhersage: <code>de</code>,
<code>en</code>, <code>pl</code>, <code>fr</code>, <code>it</code> oder <code>nl</code></td></tr> <code>en</code>, <code>pl</code>, <code>fr</code>, <code>it</code> oder <code>nl</code></td></tr>
</table> </table>
<p> <p></p>
Eine ganz einfache Definition ist:<br><br> Eine ganz einfache Definition ist:<br><br>
<code>define &lt;name&gt; Weather apikey=&lt;DarkSkyAPISecretKey&gt;</code><br><br> <code>define &lt;name&gt; Weather apikey=&lt;DarkSkyAPISecretKey&gt;</code><br><br>
Bei dieser Definition wird die API von Dark Sky verwendet mit einem Bei dieser Definition wird die API von Dark Sky verwendet mit einem
individuellen Schl&uuml;ssel, den man sich auf der Webseite von Dark Sky individuellen Schl&uuml;ssel, den man sich auf der Webseite von Dark Sky
beschaffen muss.<p><p> beschaffen muss.<p></p>
Beispiele: Beispiele:
<pre> <pre>
@ -350,9 +351,9 @@ __END__
define <name> Weather API=wundergroundAPI,stationId:IHAUIDELB111 apikey=ed64ccc80f004556a4e3456567800b6324a define <name> Weather API=wundergroundAPI,stationId:IHAUIDELB111 apikey=ed64ccc80f004556a4e3456567800b6324a
</pre> </pre>
Es folgt die API-spezifische Dokumentation.<p> Es folgt die API-spezifische Dokumentation.<p></p>
<h4>Dark Sky</h4><p> <h4>Dark Sky</h4><p></p>
<table> <table>
<tr><td>API</td><td><code>DarkSkyAPI</code></td></tr> <tr><td>API</td><td><code>DarkSkyAPI</code></td></tr>
@ -364,9 +365,9 @@ __END__
Bei fehlender Angabe werden die Werte aus den gleichnamigen Attributen Bei fehlender Angabe werden die Werte aus den gleichnamigen Attributen
des <code>global</code>-Device genommen, sofern vorhanden.</td></tr> des <code>global</code>-Device genommen, sofern vorhanden.</td></tr>
</table> </table>
<p><p> <p></p>
<h4>OpenWeatherMap</h4><p> <h4>OpenWeatherMap</h4><p></p>
<table> <table>
<tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr> <tr><td>API</td><td><code>OpenWeatherMapAPI</code></td></tr>
@ -385,9 +386,9 @@ __END__
Bei fehlender Angabe werden die Werte aus den gleichnamigen Attributen Bei fehlender Angabe werden die Werte aus den gleichnamigen Attributen
des <code>global</code>-Device genommen, sofern vorhanden.</td></tr> des <code>global</code>-Device genommen, sofern vorhanden.</td></tr>
</table> </table>
<p><p> <p></p>
<h4>Wunderground</h4><p> <h4>Wunderground</h4><p></p>
<table> <table>
<tr><td>API</td><td><code>wundergroundAPI</code></td></tr> <tr><td>API</td><td><code>wundergroundAPI</code></td></tr>
@ -400,7 +401,7 @@ __END__
Bei fehlender Angabe werden die Werte aus den gleichnamigen Attributen Bei fehlender Angabe werden die Werte aus den gleichnamigen Attributen
des <code>global</code>-Device genommen, sofern vorhanden.</td></tr> des <code>global</code>-Device genommen, sofern vorhanden.</td></tr>
</table> </table>
<p><p> <p></p>
Das Modul unterst&uuml;tzt zus&auml;tzlich vier verschiedene Funktionen Das Modul unterst&uuml;tzt zus&auml;tzlich vier verschiedene Funktionen
<code>WeatherAsHtml</code>, <code>WeatherAsHtmlV</code>, <code>WeatherAsHtml</code>, <code>WeatherAsHtmlV</code>,

View File

@ -1,4 +1,4 @@
UPD 2025-02-04_20:57:25 25848 FHEM/59_Weather.pm UPD 2025-02-05_05:56:41 25899 FHEM/59_Weather.pm
UPD 2025-02-04_20:58:03 34419 lib/FHEM/Core/Weather.pm UPD 2025-02-04_21:08:26 34419 lib/FHEM/Core/Weather.pm
UPD 2025-02-04_20:58:29 33780 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm UPD 2025-02-05_06:38:34 33780 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2025-02-04_20:57:50 38751 lib/FHEM/APIs/Weather/wundergroundAPI.pm UPD 2025-02-04_21:08:26 38751 lib/FHEM/APIs/Weather/wundergroundAPI.pm

View File

@ -4,33 +4,34 @@ use File::Basename;
use POSIX qw(strftime); use POSIX qw(strftime);
use strict; use strict;
my @filenames = ( 'FHEM/59_Weather.pm', my @filenames = (
'lib/FHEM/Core/Weather.pm', 'FHEM/59_Weather.pm',
'lib/FHEM/APIs/Weather/DarkSkyAPI.pm', 'lib/FHEM/Core/Weather.pm',
'lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm', 'lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm',
'lib/FHEM/APIs/Weather/wundergroundAPI.pm', 'lib/FHEM/APIs/Weather/wundergroundAPI.pm',
); );
my $controlsfile = 'controls_Weather.txt'; my $controlsfile = 'controls_Weather.txt';
open(FH, ">$controlsfile") || return("Can't open $controlsfile: $!"); open( FH, ">$controlsfile" ) || return ("Can't open $controlsfile: $!");
for my $filename (@filenames) { for my $filename (@filenames) {
my @statOutput = stat($filename); my @statOutput = stat($filename);
if (scalar @statOutput != 13) { if ( scalar @statOutput != 13 ) {
printf 'error: stat has unexpected return value for ' . $filename . "\n"; printf 'error: stat has unexpected return value for '
. $filename . "\n";
next; next;
} }
my $mtime = $statOutput[9]; my $mtime = $statOutput[9];
my $date = POSIX::strftime("%Y-%m-%d", localtime($mtime)); my $date = POSIX::strftime( "%Y-%m-%d", localtime($mtime) );
my $time = POSIX::strftime("%H:%M:%S", localtime($mtime)); my $time = POSIX::strftime( "%H:%M:%S", localtime($mtime) );
my $filetime = $date."_".$time; my $filetime = $date . "_" . $time;
my $filesize = $statOutput[7]; my $filesize = $statOutput[7];
printf FH 'UPD ' . $filetime . ' ' . $filesize . ' ' .$filename . "\n"; printf FH 'UPD ' . $filetime . ' ' . $filesize . ' ' . $filename . "\n";
} }
close(FH); close(FH);