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

Refactor language handling to improve readability

Browse Source 
Improved the language initialization logic by replacing the
experimental `given/when` construct with a more standard
`if/elsif` structure, enhancing code readability and
maintainability. Additionally, the attribute handling in the
`Attr` subroutine was refactored for clarity, removing
unnecessary usage of `given/when`, which helps reduce
complexity across the codebase.

Furthermore, in the OpenWeatherMapAPI module, logic for
handling weather response data was streamlined by removing
the `given/when` statements in favor of `if` conditions.
This change eliminates potential confusion and enhances
the clarity of the code logic. No breaking changes were
introduced; the overall functionality remains intact.
This commit is contained in:
Marko Oldenburg
2025-10-14 07:01:07 +02:00
parent 2e3210c438
commit d313cb8d4a
3 changed files with 93 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
View File

@@ -41,7 +41,8 @@ use FHEM::Meta;
use POSIX;
use HttpUtils;
use experimental qw /switch/;
#use experimental qw /switch/;
my $META = {};
my $ret = FHEM::Meta::getMetadata( __FILE__, $META );
@@ -466,67 +467,59 @@ sub _FillSelfHashWithWeatherResponse {
$self->{cached}->{city} = encode_utf8( $data->{name} );
$self->{cached}->{license}{text} = 'none';
given ( $self->{endpoint} ) {
when ('onecall') {
## löschen des alten current Datensatzes
delete $self->{cached}->{current};
if ( $self->{endpoint} eq 'onecall' ) {
## löschen des alten current Datensatzes
delete $self->{cached}->{current};
## löschen des alten forecast Datensatzes
delete $self->{cached}->{forecast};
## löschen des alten forecast Datensatzes
delete $self->{cached}->{forecast};
## löschen des alten Alerts Datensatzes
delete $self->{cached}->{alerts};
## löschen des alten Alerts Datensatzes
delete $self->{cached}->{alerts};
$self =
_FillSelfHashWithWeatherResponseForOnecallCurrent( $self, $data );
if ( ref( $data->{hourly} ) eq "ARRAY"
&& scalar( @{ $data->{hourly} } ) > 0 )
{
$self =
_FillSelfHashWithWeatherResponseForOnecallCurrent( $self, $data );
if ( ref( $data->{hourly} ) eq "ARRAY"
&& scalar( @{ $data->{hourly} } ) > 0 )
{
$self =
_FillSelfHashWithWeatherResponseForOnecallHourly( $self,
$data );
}
if ( ref( $data->{daily} ) eq "ARRAY"
&& scalar( @{ $data->{daily} } ) > 0 )
{
$self =
_FillSelfHashWithWeatherResponseForOnecallDaily( $self,
$data );
}
if ( ref( $data->{alerts} ) eq "ARRAY"
&& scalar( @{ $data->{alerts} } ) > 0 )
{
$self =
_FillSelfHashWithWeatherResponseForOnecallAlerts( $self,
$data );
}
_FillSelfHashWithWeatherResponseForOnecallHourly( $self, $data );
}
when ('weather') {
## löschen des alten current Datensatzes
delete $self->{cached}->{current};
## löschen des alten Alerts Datensatzes
delete $self->{cached}->{alerts};
if ( ref( $data->{daily} ) eq "ARRAY"
&& scalar( @{ $data->{daily} } ) > 0 )
{
$self =
_FillSelfHashWithWeatherResponseForWeatherCurrent( $self, $data );
_FillSelfHashWithWeatherResponseForOnecallDaily( $self, $data );
}
when ('forecast') {
## löschen des alten forecast Datensatzes
delete $self->{cached}->{forecast};
if ( ref( $data->{alerts} ) eq "ARRAY"
&& scalar( @{ $data->{alerts} } ) > 0 )
{
$self =
_FillSelfHashWithWeatherResponseForOnecallAlerts( $self, $data );
}
}
elsif ( $self->{endpoint} eq 'weather' ) {
## löschen des alten current Datensatzes
delete $self->{cached}->{current};
if ( ref( $data->{list} ) eq "ARRAY"
and scalar( @{ $data->{list} } ) > 0 )
{
$self =
_FillSelfHashWithWeatherResponseForForecastHourly( $self,
$data );
}
## löschen des alten Alerts Datensatzes
delete $self->{cached}->{alerts};
$self =
_FillSelfHashWithWeatherResponseForWeatherCurrent( $self, $data );
}
elsif ( $self->{endpoint} eq 'forecast' ) {
## löschen des alten forecast Datensatzes
delete $self->{cached}->{forecast};
if ( ref( $data->{list} ) eq "ARRAY"
and scalar( @{ $data->{list} } ) > 0 )
{
$self =
_FillSelfHashWithWeatherResponseForForecastHourly( $self, $data );
}
}