Merge pull request 'dev' (#75) from dev into main

Reviewed-on: #75

CHANGELOG.md

@@ -1,4 +1,275 @@
-### fix: bugfix function WeatherAsHtmlD not working (HEAD -> patch-WeatherAsHtmlD)
+### ``` 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)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+[Ticket: no]
+
+
+
+### docs: changelog
+>Tue, 4 Feb 2025 20:53:14 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+[Ticket: no]
+
+
+
+### fix: apply patch from stefanru https://forum.fhem.de/index.php?msg=1332884
+>Tue, 4 Feb 2025 20:52:52 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+[Ticket: no]
+
+
+
+### docs: new CHANGELOG
+>Fri, 11 Oct 2024 12:04:37 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### docs: change versions and add copyright
+>Fri, 11 Oct 2024 12:04:07 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### docs: Changelog
+>Fri, 11 Oct 2024 07:07:57 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+[Ticket: no]
+
+
+
+### fix: Update forecast with cachemaxage after API calls are down. special thanks to stefanru (forum)
+>Fri, 11 Oct 2024 06:59:53 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+[Ticket: no]
+
+
+
+### test: add new CHANGELOG
+>Sat, 21 Oct 2023 08:59:11 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### feat: new reading owmAPICode for original code
+>Tue, 11 Jul 2023 14:10:13 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+[Ticket: no]
+
+
+
+### feat: add human-readable text of daily forecast
+>Tue, 6 Jun 2023 08:35:06 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+add the proper human-readable text description of the daily forecast
+
+[Ticket: no]
+
+
+
+### add temperatur reading and fix weblink
+>Tue, 23 May 2023 08:08:42 +0200
+
+>Author: Marko Oldenburg (oldenburg@b1-systems.de)
+
+>Commiter: Marko Oldenburg (oldenburg@b1-systems.de)
+
+
+
+
+### fix: missing perl modules
+>Sun, 5 Feb 2023 09:26:04 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### fix: failed then Readonly is missing
+>Sun, 5 Feb 2023 09:20:20 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### fix: : Undefined subroutine
+>Thu, 2 Feb 2023 22:58:40 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+&FHEM::Core::Weather::DeleteForecastreadings
+
+[Ticket: #46]
+
+
+
+### docs: add new entry in CHANGELOG.md (tag: v2.2.22)
+>Tue, 10 Jan 2023 21:44:20 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### build: v2.2.22
+>Tue, 10 Jan 2023 21:43:26 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### docs: add new modul path in to pre-commit
+>Tue, 10 Jan 2023 21:37:10 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+add new modul path in to pre-commit hook file
+
+
+
+### revert: mod packages
+>Tue, 10 Jan 2023 21:32:56 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+- packages Weather.pm
+- split FHEM/59_Weather.pm in two files and packages (FEHM/59_Weather.pm
+and FHEM/Core/Weather.pm
+
+[optional body]
+
+[Ticket: no]
+
+
+
+### fix: #40
+>Tue, 10 Jan 2023 16:09:53 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+Undefined subroutine &FHEM::APIs::Weather::DarkSkyAPI::__strftimeWrapper
+
+
+
+### docs: add new changelog and change version (tag: v2.2.21)
+>Sun, 8 Jan 2023 21:56:15 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### fix: bugfix function WeatherAsHtmlD not working
 >Sun, 8 Jan 2023 21:54:31 +0100
 
 >Author: Marko Oldenburg (fhemdevelopment@cooltux.net)

controls_Weather.txt

@@ -1,4 +1,4 @@
-UPD 2023-01-08_21:52:20 57800 FHEM/59_Weather.pm
-UPD 2023-01-08_17:15:24 50104 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
-UPD 2023-01-08_17:15:24 33411 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
-UPD 2023-01-07_19:00:05 36090 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

hooks/pre-commit

@@ -4,32 +4,34 @@ use File::Basename;
 use POSIX qw(strftime);
 use strict;
 
-my @filenames = (   'FHEM/59_Weather.pm',
-		    'lib/FHEM/APIs/Weather/DarkSkyAPI.pm',
-		    'lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm',
-		    'lib/FHEM/APIs/Weather/wundergroundAPI.pm',
-    );
+my @filenames = (
+    'FHEM/59_Weather.pm',
+    'lib/FHEM/Core/Weather.pm',
+    'lib/FHEM/APIs/Weather/OpenWeatherMapAPI.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);
-  
-    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 $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 $filesize = $statOutput[7];
 
-    printf FH 'UPD ' . $filetime . ' ' . $filesize . ' ' .$filename . "\n";
+    printf FH 'UPD ' . $filetime . ' ' . $filesize . ' ' . $filename . "\n";
 }
 
 close(FH);

lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm

@@ -3,7 +3,7 @@
 #
 # Developed with VSCodium and richterger perl plugin
 #
-#  (c) 2019-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
+#  (c) 2019-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
 #  All rights reserved
 #
 #   Special thanks goes to:
@@ -423,7 +423,7 @@ sub _ProcessingRetrieveData {
                 _ErrorHandling( $self,
                     'OpenWeatherMap Weather decode JSON err ' . $@ );
             }
-            elsif (defined( $data->{cod} )
+            elsif ( defined( $data->{cod} )
                 && $data->{cod}
                 && $data->{cod} != 200
                 && defined( $data->{message} )
@@ -591,6 +591,7 @@ sub _FillSelfHashWithWeatherResponseForWeatherCurrent {
         'wind_direction' => $data->{wind}->{deg},
         'cloudCover'     => $data->{clouds}->{all},
         'code'           => $codes{ $data->{weather}->[0]->{id} },
+        'owmAPICode'     => $data->{weather}->[0]->{id},
         'iconAPI'        => $data->{weather}->[0]->{icon},
         'sunsetTime'     => _strftimeWrapper(
             "%a, %e %b %Y %H:%M",
@@ -670,8 +671,9 @@ sub _FillSelfHashWithWeatherResponseForForecastHourly {
                 ),
                 'cloudCover' => $data->{list}->[$i]->{clouds}->{all},
                 'code' => $codes{ $data->{list}->[$i]->{weather}->[0]->{id} },
-                'iconAPI' => $data->{list}->[$i]->{weather}->[0]->{icon},
-                'rain1h'  => (
+                'owmAPICode' => $data->{list}->[$i]->{weather}->[0]->{id},
+                'iconAPI'    => $data->{list}->[$i]->{weather}->[0]->{icon},
+                'rain1h'     => (
                       $data->{list}->[$i]->{rain}->{'1h'}
                     ? $data->{list}->[$i]->{rain}->{'1h'}
                     : 0
@@ -732,6 +734,7 @@ sub _FillSelfHashWithWeatherResponseForOnecallCurrent {
         'rain_1h'    => ( $data->{rain}->{'1h'} ? $data->{rain}->{'1h'} : 0 ),
         'cloudCover' => $data->{current}->{clouds},
         'code'       => $codes{ $data->{current}->{weather}->[0]->{id} },
+        'owmAPICode' => $data->{current}->{weather}->[0]->{id},
         'iconAPI'    => $data->{current}->{weather}->[0]->{icon},
         'condition'  =>
           encode_utf8( $data->{current}->{weather}->[0]->{description} ),
@@ -788,6 +791,7 @@ sub _FillSelfHashWithWeatherResponseForOnecallDaily {
                 'moonset'    => strftime(
                     "%a, %H:%M", localtime( $data->{daily}->[$i]->{moonset} )
                 ),
+                'summary'     => $data->{daily}->[$i]->{summary},
                 'temperature' =>
                   int( sprintf( "%.0f", $data->{daily}->[$i]->{temp}->{day} ) ),
                 'temperature_morn' => int(
@@ -833,8 +837,9 @@ sub _FillSelfHashWithWeatherResponseForOnecallDaily {
                     $data->{daily}->[$i]->{weather}->[0]->{description}
                 ),
                 'code' => $codes{ $data->{daily}->[$i]->{weather}->[0]->{id} },
-                'iconAPI'  => $data->{daily}->[$i]->{weather}->[0]->{icon},
-                'pressure' => int(
+                'owmAPICode' => $data->{daily}->[$i]->{weather}->[0]->{id},
+                'iconAPI'    => $data->{daily}->[$i]->{weather}->[0]->{icon},
+                'pressure'   => int(
                     sprintf( "%.1f", $data->{daily}->[$i]->{pressure} ) + 0.5
                 ),
                 'wind' => int(
@@ -853,8 +858,7 @@ sub _FillSelfHashWithWeatherResponseForOnecallDaily {
                     sprintf( "%.1f", ( $data->{daily}->[$i]->{wind_deg} ) )
                 ),
                 'cloudCover' => $data->{daily}->[$i]->{clouds},
-                'code' => $codes{ $data->{daily}->[$i]->{weather}->[0]->{id} },
-                'rain' => (
+                'rain'       => (
                     $data->{daily}->[$i]->{rain} ? $data->{daily}->[$i]->{rain}
                     : 0
                 ),
@@ -920,8 +924,9 @@ sub _FillSelfHashWithWeatherResponseForOnecallHourly {
                 'wind_direction' => $data->{hourly}->[$i]->{wind_deg},
                 'cloudCover'     => $data->{hourly}->[$i]->{clouds},
                 'code' => $codes{ $data->{hourly}->[$i]->{weather}->[0]->{id} },
-                'iconAPI' => $data->{hourly}->[$i]->{weather}->[0]->{icon},
-                'rain1h'  => (
+                'owmAPICode' => $data->{hourly}->[$i]->{weather}->[0]->{id},
+                'iconAPI'    => $data->{hourly}->[$i]->{weather}->[0]->{icon},
+                'rain1h'     => (
                       $data->{hourly}->[$i]->{rain}->{'1h'}
                     ? $data->{hourly}->[$i]->{rain}->{'1h'}
                     : 0
@@ -951,7 +956,7 @@ sub _CallWeatherCallbackFn {
 
     #     print 'Dumperausgabe: ' . Dumper $self;
     ### Aufruf der callbackFn
-    return ::Weather_RetrieveCallbackFn( $self->{devName} );
+    return FHEM::Core::Weather::RetrieveCallbackFn( $self->{devName} );
 }
 
 sub _ErrorHandling {
@@ -1031,7 +1036,7 @@ sub _strftimeWrapper {
 	  ],
   "release_status": "stable",
   "license": "GPL_2",
-  "version": "v3.2.6",
+  "version": "v3.2.7",
   "author": [
     "Marko Oldenburg <fhemdevelopment@cooltux.net>"
   ],