Changeset 8 for trunk

Timestamp:

09/22/05 13:34:56 (19 years ago)

Author:

thauvin

Message:

• fix test
• fix Compressed::ls
• compression format detected by Compressed

Location:

trunk/soft/ObsData/ObsData

Files:

• Archive.pm (modified) (3 diffs, 1 prop)
• Archive/Compressed.pm (modified) (3 diffs, 1 prop)

trunk/soft/ObsData/ObsData/Archive.pm

@@ -7 +7 @@
 use File::Copy;
 use File::Temp qw/ tempfile /;
+use ObsData::Archive::Compressed;
 
 sub new {
@@ -20 +21 @@
     
     for ($archive) {
-        /\.gz$/ and do {
+        /\.(gz|bz2|Z)$/ and do {
             $beclass = 'Compressed';
-            $options{uncomp} = 'gzip -dc';
-            last;
-        };
-        /\.bz2$/ and do {
-            $beclass = 'Compressed';
-            $options{uncomp} = 'bzip2 -dc';
             last;
         };
@@ -34 +29 @@
     if ($beclass) {
         my $obj;
-        eval("require $class\:\:$beclass;");
+        # eval("require $class\:\:$beclass;");
         eval("\$obj = $class\:\:$beclass->new(\$o);");
         return $obj;

trunk/soft/ObsData/ObsData/Archive/Compressed.pm

@@ -1 +1 @@
 # $Id$
 
-package ObsData::Archive::Gzip;
+package ObsData::Archive::Compressed;
 
 use strict;
 use warnings;
+use File::Copy;
+use File::Temp qw/ tempfile /;
 
 our @ISA = qw(ObsData::Archive);
 
 sub new {
-    my ($class, %options) = @_;
+    my ($class, $options) = @_;
 
-    bless(\%options, $class);
+    if (!$options->{uncomp}) {
+        for ($options->{archive}) {
+            /\.(Z|gz)$/ and $options->{uncomp} = 'gzip -dc';
+            /\.bz2$/ and $options->{uncomp} = 'bzip2 -dc';
+        }
+    }
+    
+    bless($options, $class);
 }
 
@@ -20 +29 @@
 sub ls {
     my ($self) = @_;
-    my ($file) = $self->{archive} =~ m!^(?:.*/)?(.*)(?:\.gz)?!;
-    return $file;
+    $self->{archive} =~ m,^(?:.*/)?(?:(.*)(?:\.(?:gz|bz2|Z))|(.*))$,;
+    return $1 || $2;
 }
 
@@ -41 +50 @@
     }
 
-    open(my $sourcefh, "gzip -dc '$self->{archive}' |") or return undef;
+    open(my $sourcefh, "$self->{uncomp} '$self->{archive}' |") or return undef;
     
     if(!copy($sourcefh, $fh)) {