mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contrib/55_GDS.2015: updated

Browse Source 
use Archive::Extract instead of Archive::Zip

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9404 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen
2015-10-08 18:42:59 +00:00
parent 84d67c34ce
commit ac846b092f
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
fhem/contrib/55_GDS.2015/55_GDS.pm
View File

@@ -37,7 +37,8 @@ use Text::CSV;
use Net::FTP; use Net::FTP;
use List::MoreUtils 'first_index'; use List::MoreUtils 'first_index';
use XML::Simple; use XML::Simple;
use Archive::Zip; use Archive::Extract;
no if $] >= 5.017011, warnings => 'experimental'; no if $] >= 5.017011, warnings => 'experimental';
@@ -970,7 +971,9 @@ sub retrieveFile($$;$$){
when("alerts"){ when("alerts"){
$dir = "gds/specials/alerts/cap/GER/status/"; $dir = "gds/specials/alerts/cap/GER/status/";
$dwd = "Z_CAP*"; $dwd = "Z_CAP*";
$targetFile = $tempDir.$name."_$request.dir/$name"."_$request.zip"; my $targetDir = $tempDir.$name."_alerts.dir";
mkdir $targetDir unless -d $targetDir;
$targetFile = "$targetDir/$name"."_alerts.zip";
break; break;
} }
@@ -1349,13 +1352,11 @@ sub unzipCapFile($) {
my($hash) = @_; my($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
# my $zipname = $tempDir.$name."_alerts.zip";
my $destinationDirectory = $tempDir.$name."_alerts.dir"; my $destinationDirectory = $tempDir.$name."_alerts.dir";
# my $zipname = $tempDir.$name."_alerts.zip";
my $zipname = "$destinationDirectory/$name"."_alerts.zip"; my $zipname = "$destinationDirectory/$name"."_alerts.zip";
if (-d $destinationDirectory) { if (-d $destinationDirectory) {
# delete old files in directory # delete old files in directory
my @remove = _readDir($destinationDirectory); my @remove = _readDir($destinationDirectory);
foreach my $f (@remove){ foreach my $f (@remove){
next if -d $f; next if -d $f;
@@ -1365,19 +1366,12 @@ sub unzipCapFile($) {
} }
} }
# unzip files from archive # unzip
my $zip = Archive::Zip->new($zipname); my $zip = Archive::Extract->new( archive => $zipname );
foreach my $member ($zip->members) my $ret = $zip->extract( to => $destinationDirectory);
{ Log3($name, 1, "GDS $name: error ".$zip->error()) unless $ret;
next if $member->isDirectory;
(my $extractName = $member->fileName) =~ s{.*/}{};
Log3($name, 4, "GDS $name: extracting $destinationDirectory/$extractName");
$member->extractToFileNamed(
"$destinationDirectory/$extractName");
}
Log3($name, 4, "GDS $name: deleting $zipname");
# delete archive file # delete archive file
unlink $zipname unless AttrVal($name,"gdsDebug",0); unlink $zipname unless AttrVal($name,"gdsDebug",0);
return; return;
} }
@@ -1399,6 +1393,7 @@ sub mergeCapFile($) {
# merge all capFiles # merge all capFiles
$cF = $destinationDirectory."/".$cF; $cF = $destinationDirectory."/".$cF;
next if -d $cF; next if -d $cF;
next unless -s $cF;
next unless $cF =~ m/\.xml$/; # read xml files only! next unless $cF =~ m/\.xml$/; # read xml files only!
Log3($name, 4, "GDS $name: analyzing $cF"); Log3($name, 4, "GDS $name: analyzing $cF");
@@ -1424,7 +1419,6 @@ sub mergeCapFile($) {
1; 1;
#################################################################################################### ####################################################################################################
# #
# Documentation # Documentation
@@ -1502,6 +1496,8 @@ sub mergeCapFile($) {
# #
# 2015-10-08 changed added mergeCapFile() # 2015-10-08 changed added mergeCapFile()
# code cleanup in buildCAPList() # code cleanup in buildCAPList()
# use Archive::Extract instead of Archive::Zip
# (apt-get install libarchive-extract-perl)
# #
#################################################################################################### ####################################################################################################
# #
@@ -1565,8 +1561,7 @@ sub mergeCapFile($) {
<br/> <br/>
Module uses following additional Perl modules:<br/><br/> Module uses following additional Perl modules:<br/><br/>
<code>Net::FTP, List::MoreUtils, XML::Simple, Text::CSV<br/> <code>Net::FTP, List::MoreUtils, XML::Simple, Text::CSV, Archive::Extract</code><br/><br/>
Archive::Zip, LWP::Parallel::UserAgent</code><br/><br/>
If not already installed in your environment, please install them using appropriate commands from your environment. If not already installed in your environment, please install them using appropriate commands from your environment.
</ul> </ul>