From ed111796adf9abd2f5b479711410cb14cf6c8039 Mon Sep 17 00:00:00 2001
From: jowiemann <>
Date: Tue, 21 Nov 2023 09:14:11 +0000
Subject: [PATCH] 98_CDCOpenData.pm: warning Net::FTP bei Fhem Start
git-svn-id: https://svn.fhem.de/fhem/trunk@28195 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
fhem/FHEM/98_CDCOpenData.pm | 64 ++++++++++++-------------------------
1 file changed, 21 insertions(+), 43 deletions(-)
diff --git a/fhem/FHEM/98_CDCOpenData.pm b/fhem/FHEM/98_CDCOpenData.pm
index 8881bba52..0b8aad0f7 100644
--- a/fhem/FHEM/98_CDCOpenData.pm
+++ b/fhem/FHEM/98_CDCOpenData.pm
@@ -39,11 +39,11 @@
##############################################################################
# defmod DWD_Regen CDCOpenData
# attr DWD_Regen INTERVAL 3600
-# attr DWD_Regen datetimeInReadingName 1
# attr DWD_Regen disable 0
# attr DWD_Regen locations Bad_Soden:50.1461,8.4986
#
##############################################################################
+# eval "use Net::SSLGlue::FTP;1" or $missingModul .= "Net::SSLGlue::FTP install: sudo apt-get install libnet-sslglue-perl ";
package main;
@@ -52,7 +52,7 @@ use warnings;
use Blocking;
use HttpUtils;
-my $ModulVersion = "01.10e";
+my $ModulVersion = "01.10f";
my $missingModul = "";
sub CDCOpenData_Log($$$);
@@ -60,11 +60,10 @@ sub CDCOpenData_Initialize($);
sub CDCOpenData_Readout_Add_Reading ($$$$@);
sub CDCOpenData_Readout_Process($$);
-#eval "use Net::FTP;1" or $missingModul .= "Net::FTP ";
+use Net::FTP;
eval "use IO::Uncompress::Gunzip qw(gunzip);1" or $missingModul .= "IO::Uncompress::Gunzip install: sudo apt-get install libio-compress-perl ";
eval "use IO::Uncompress::Bunzip2 qw(bunzip2);1" or $missingModul .= "IO::Uncompress::Bunzip2 install: sudo apt-get install libio-compress-perl ";
eval "use Archive::Tar;1" or $missingModul .= "Archive::Tar install: sudo apt-get install libarchive-extract-perl ";
-eval "use Net::SSLGlue::FTP;1" or $missingModul .= "Net::SSLGlue::FTP install: sudo apt-get install libnet-sslglue-perl ";
eval "use POSIX;1" or $missingModul .= "POSIX install: sudo apt-get install libtemplate-plugin-posix-perl ";
eval "use File::Path;1" or $missingModul .= "File::Path not available ";
eval "use FHEM::Scheduler::Cron;1" or $missingModul .= "FHEM::Scheduler::Cron: update Fhem ";
@@ -128,7 +127,6 @@ sub CDCOpenData_Initialize($)
."nonblockingTimeOut:50,75,100,125 "
."locations "
."numberOfDays:1,2,3,4,5,6,7,8,9,10 "
- ."datetimeInReadingName:0,1 "
."tmpRadolanData "
."disable:0,1 "
."FhemLog3Std:0,1 "
@@ -136,6 +134,7 @@ sub CDCOpenData_Initialize($)
."enableDWDdata:multiple-strict,rainByDay,rainSinceMidnight,rainRadarbyLocation "
."clearRadarFileLog "
."RainRadarFileLog "
+# ."ownRadarFileLog "
.$readingFnAttributes;
} # end CDCOpenData_Initialize
@@ -245,6 +244,10 @@ sub CDCOpenData_Delete ($$)
fhem('delete ' . $dLog, 1) if defined $defs{$dLog};
}
+ if (my $dLog = AttrVal($name, "ownRadarFileLog", undef)) {
+ fhem('delete ' . $dLog, 1) if defined $defs{$dLog};
+ }
+
if ( -e $hash->{TMPDIR} and -d $hash->{TMPDIR}) {
my @delDirs = split(/\//, $hash->{TMPDIR});
@@ -479,6 +482,19 @@ sub CDCOpenData_Attr($@)
}
}
+ if ($aName eq "ownRadarFileLog") {
+ if ($cmd eq "set") {
+
+ }
+
+ if ($cmd eq "del") {
+ if (my $dLog = AttrVal($name, $aName, undef)) {
+ return "FileLog Device: $dLog not defined." unless defined $defs{$dLog};
+ fhem('delete ' . $dLog, 1);
+ }
+ }
+ } # end ownRadarFileLog
+
if ($aName eq "RainRadarFileLog") {
if ($cmd eq "set") {
@@ -537,25 +553,6 @@ sub CDCOpenData_Attr($@)
}
}
- if ($aName eq "datetimeInReadingName") {
- if ($cmd eq "set") {
-
- return "datetimeInReadingName is depreciated";
- return "datetimeInReadingName: $aVal. Valid is 0 or 1." if $aVal !~ /[0-1]/;
- if ($aVal == 1) {
- fhem( "deletereading $name .*amount-of-rain.*", 1 );
- } else {
- fhem( "deletereading $name .*_day_rain:.*", 1 );
- fhem( "deletereading $name .*_since_midnight:.*", 1 );
- fhem( "deletereading $name .*_rain_radar:.*", 1 );
- }
- }
-
- if ($cmd eq "del") {
- fhem( "deletereading $name .*amount-of-rain.*", 1 );
- }
- } # end datetimeInReadingName
-
# Stop the sub if FHEM is not initialized yet
unless ($init_done) {
CDCOpenData_Log $hash, 5, "Attr $cmd $aName -> no action while init running";
@@ -988,7 +985,6 @@ sub CDCOpenData_get_RegenRadar_atLocations($$$$) {
CDCOpenData_Log $name, 5, "geoRefsAttr: " . $geoRef;
}
- my $dtReading = AttrVal($name, "datetimeInReadingName", 1);
my $geoCnt = 0;
my $geoName = "";
@@ -1218,7 +1214,6 @@ sub CDCOpenData_Readout_Run_Rain_Since_Midnight ($@) {
CDCOpenData_Log $name, 5, "geoRefsAttr: " . $geoRef;
}
- my $dtReading = AttrVal($name, "datetimeInReadingName", 1);
my $geoCnt = 0;
my $geoName = "";
my $regenmenge = -1;
@@ -1448,7 +1443,6 @@ sub CDCOpenData_Readout_Run_getRain($@)
CDCOpenData_Log $name, 5, "geoRefsAttr: " . $geoRef;
- my $dtReading = AttrVal($name, "datetimeInReadingName", 1);
my $geoCnt = 0;
my $geoName = "";
my $regenmenge = -1;
@@ -2224,14 +2218,6 @@ sub CDCOpenData_mk_subdirs{
Default is one hour.
-
- attr <name> datetimeInReadingName <0 | 1>
-
- this Attribute is depreciated.
- Default: set
- If set, then the time of the rain amount is stored in the reading name.
-
-
attr <name> enableDWDdata <rainByDay, rainSinceMidnight, rainRadarbyLocation>
@@ -2372,14 +2358,6 @@ sub CDCOpenData_mk_subdirs{
Standard ist jede Stunde.
-
- attr <name> datetimeInReadingName <0 | 1>
-
- Dieses Attribut wird nicht mehr unterstützt.
- Standard: gesetzt
- Wenn gesetzt, dann wird der Zeitpunkt der Regenmenge im Readingsnamen hinterlegt.
-
-
attr <name> enableDWDdata <rainByDay, rainSinceMidnight, rainRadarbyLocation>