Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
af36bed895 | |||
ba898624c5 | |||
12595b3674 | |||
f7234b10f8 | |||
be3fb7bbfc | |||
23bbc9f9b0 | |||
e60509fbfd | |||
aafeea4d5f |
52
CHANGELOG.md
52
CHANGELOG.md
@ -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
|
||||
|
||||
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
|
||||
|
@ -74,7 +74,7 @@ __END__
|
||||
<h3>Weather</h3>
|
||||
<ul>
|
||||
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:
|
||||
<ul>
|
||||
@ -105,12 +105,12 @@ __END__
|
||||
<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>
|
||||
</table>
|
||||
<p>
|
||||
<p></p>
|
||||
|
||||
A very simple definition is:<br><br>
|
||||
<code>define <name> Weather apikey=<DarkSkyAPISecretKey></code><br><br>
|
||||
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:
|
||||
<pre>
|
||||
@ -120,9 +120,9 @@ __END__
|
||||
</pre>
|
||||
|
||||
|
||||
API-specific documentation follows.<p>
|
||||
API-specific documentation follows.<p></p>
|
||||
|
||||
<h4>Dark Sky</h4><p>
|
||||
<h4>Dark Sky</h4><p></p>
|
||||
|
||||
<table>
|
||||
<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
|
||||
of the <code>global</code> device are taken, if these exist.</td></tr>
|
||||
</table>
|
||||
<p><p>
|
||||
<p></p>
|
||||
|
||||
<h4>OpenWeatherMap</h4><p>
|
||||
<h4>OpenWeatherMap</h4><p></p>
|
||||
|
||||
<table>
|
||||
<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
|
||||
of the <code>global</code> device are taken, if these exist.</td></tr>
|
||||
</table>
|
||||
<p><p>
|
||||
<p></p>
|
||||
|
||||
<h4>Wunderground</h4><p>
|
||||
<h4>Wunderground</h4><p></p>
|
||||
|
||||
<table>
|
||||
<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
|
||||
of the <code>global</code> device are taken, if these exist.</td></tr>
|
||||
</table>
|
||||
<p><p>
|
||||
<p></p>
|
||||
|
||||
The module provides four additional functions <code>WeatherAsHtml</code>,
|
||||
<code>WeatherAsHtmlV</code>, <code>WeatherAsHtmlH</code> and
|
||||
@ -303,7 +303,7 @@ __END__
|
||||
<ul>
|
||||
Hinweis: es wird das Perl-Modul JSON benötigt. Mit <code>apt-get install
|
||||
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:
|
||||
<ul>
|
||||
@ -334,14 +334,15 @@ __END__
|
||||
<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>
|
||||
</table>
|
||||
<p>
|
||||
<p></p>
|
||||
|
||||
|
||||
Eine ganz einfache Definition ist:<br><br>
|
||||
<code>define <name> Weather apikey=<DarkSkyAPISecretKey></code><br><br>
|
||||
|
||||
Bei dieser Definition wird die API von Dark Sky verwendet mit einem
|
||||
individuellen Schlüssel, den man sich auf der Webseite von Dark Sky
|
||||
beschaffen muss.<p><p>
|
||||
beschaffen muss.<p></p>
|
||||
|
||||
Beispiele:
|
||||
<pre>
|
||||
@ -350,9 +351,9 @@ __END__
|
||||
define <name> Weather API=wundergroundAPI,stationId:IHAUIDELB111 apikey=ed64ccc80f004556a4e3456567800b6324a
|
||||
</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>
|
||||
<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
|
||||
des <code>global</code>-Device genommen, sofern vorhanden.</td></tr>
|
||||
</table>
|
||||
<p><p>
|
||||
<p></p>
|
||||
|
||||
<h4>OpenWeatherMap</h4><p>
|
||||
<h4>OpenWeatherMap</h4><p></p>
|
||||
|
||||
<table>
|
||||
<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
|
||||
des <code>global</code>-Device genommen, sofern vorhanden.</td></tr>
|
||||
</table>
|
||||
<p><p>
|
||||
<p></p>
|
||||
|
||||
<h4>Wunderground</h4><p>
|
||||
<h4>Wunderground</h4><p></p>
|
||||
|
||||
<table>
|
||||
<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
|
||||
des <code>global</code>-Device genommen, sofern vorhanden.</td></tr>
|
||||
</table>
|
||||
<p><p>
|
||||
<p></p>
|
||||
|
||||
Das Modul unterstützt zusätzlich vier verschiedene Funktionen
|
||||
<code>WeatherAsHtml</code>, <code>WeatherAsHtmlV</code>,
|
||||
|
@ -1,4 +1,4 @@
|
||||
UPD 2025-02-04_20:57:25 25848 FHEM/59_Weather.pm
|
||||
UPD 2025-02-04_20:58:03 34419 lib/FHEM/Core/Weather.pm
|
||||
UPD 2025-02-04_20:58:29 33780 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
|
||||
UPD 2025-02-04_20:57:50 38751 lib/FHEM/APIs/Weather/wundergroundAPI.pm
|
||||
UPD 2025-02-05_05:56:41 25899 FHEM/59_Weather.pm
|
||||
UPD 2025-02-04_21:08:26 34419 lib/FHEM/Core/Weather.pm
|
||||
UPD 2025-02-05_06:38:34 33780 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
|
||||
UPD 2025-02-04_21:08:26 38751 lib/FHEM/APIs/Weather/wundergroundAPI.pm
|
||||
|
@ -4,33 +4,34 @@ use File::Basename;
|
||||
use POSIX qw(strftime);
|
||||
use strict;
|
||||
|
||||
my @filenames = ( 'FHEM/59_Weather.pm',
|
||||
my @filenames = (
|
||||
'FHEM/59_Weather.pm',
|
||||
'lib/FHEM/Core/Weather.pm',
|
||||
'lib/FHEM/APIs/Weather/DarkSkyAPI.pm',
|
||||
'lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm',
|
||||
'lib/FHEM/APIs/Weather/wundergroundAPI.pm',
|
||||
);
|
||||
);
|
||||
|
||||
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) {
|
||||
my @statOutput = stat($filename);
|
||||
|
||||
if (scalar @statOutput != 13) {
|
||||
printf 'error: stat has unexpected return value for ' . $filename . "\n";
|
||||
if ( scalar @statOutput != 13 ) {
|
||||
printf 'error: stat has unexpected return value for '
|
||||
. $filename . "\n";
|
||||
next;
|
||||
}
|
||||
|
||||
my $mtime = $statOutput[9];
|
||||
my $date = POSIX::strftime("%Y-%m-%d", localtime($mtime));
|
||||
my $time = POSIX::strftime("%H:%M:%S", localtime($mtime));
|
||||
my $filetime = $date."_".$time;
|
||||
my $date = POSIX::strftime( "%Y-%m-%d", localtime($mtime) );
|
||||
my $time = POSIX::strftime( "%H:%M:%S", localtime($mtime) );
|
||||
my $filetime = $date . "_" . $time;
|
||||
|
||||
my $filesize = $statOutput[7];
|
||||
|
||||
printf FH 'UPD ' . $filetime . ' ' . $filesize . ' ' .$filename . "\n";
|
||||
printf FH 'UPD ' . $filetime . ' ' . $filesize . ' ' . $filename . "\n";
|
||||
}
|
||||
|
||||
close(FH);
|
||||
|
Reference in New Issue
Block a user