Changeset 241

Timestamp:

04/24/06 20:10:19 (18 years ago)

Author:

nanardon

Message:

• end lha support, all test should pass now

File:

• trunk/soft/ObsData/ObsData/Archive/Lha.pm (modified) (2 diffs)

trunk/soft/ObsData/ObsData/Archive/Lha.pm

@@ -6 +6 @@
 use warnings;
 use File::Copy;
-use File::Temp qw/ tempfile /;
+use File::Temp qw/ tempdir /;
 use ObsData::Archive;
 
@@ -41 +41 @@
     my ($self, $file, $dest) = @_;
 
-    my ($fh, $fname);
+    my $dir = tempdir();
+
+    if (system("lha xfw=$dir '$self->{archive}' '$file'")) {
+         $self->seterror("Can't uncompress archive: $!");
+         return undef;
+    }
     
     if ($dest) {
-        $fname = $dest;
-        open($fh, '>', $dest) or do {
+        open(my $fh, '>', $dest) or do {
             $self->seterror("Can't uncompress archive: $!");
             return undef;
         };
-    } else {
-        ($fh, $fname) = tempfile(
-            DIR => $self->_tempdir,
-            UNLINK => 1,
-        ) or do {
-            $self->seterror("Can't create temp file: $!");
+        open(my $sourcefh, '<', "$dir/$file") or do {
+            $self->seterror("Can't open temp file for reading: $!");
             return undef;
         };
-    }
 
-    open(my $sourcefh, "unrar p -ierr '$self->{archive}' '$file' 2>/dev/null |") or return undef;
-    
-    if(!copy($sourcefh, $fh)) {
-        $self->seterror("Can't copy file to destination: $!");
-        unlink($fname);
-        return undef;
+        if(!copy($sourcefh, $fh)) {
+            $self->seterror("Can't copy file to destination: $!");
+            unlink("$dir/$file");
+            return undef;
+        }
+        close($fh);
+        close($sourcefh);
     }
     
-    close($fh);
-    # FIXME unrar sucks, does return a proper exit status on error (allways 0)
-    if(!close($sourcefh)) {
-        $self->seterror("unrar -p exit with error" . ($! ? (" " . $!) : ""));
-        unlink($fname);
-        return undef;
-    }
-    $fname
+    return $dest || "$dir/$file";
 }