Changeset 240

Timestamp:

04/24/06 17:49:17 (18 years ago)

Author:

nanardon

Message:

• add partial lha/lzh support

Location:

trunk/soft/ObsData

Files:

• ObsData/Archive.pm (modified) (1 diff)
• ObsData/Archive/Lha.pm (copied) (copied from trunk/soft/ObsData/ObsData/Archive/Rar.pm) (3 diffs)
• t/OA-07.t (copied) (copied from trunk/soft/ObsData/t/OA-06.t) (1 diff)
• testdata/coin.lzh (added)

trunk/soft/ObsData/ObsData/Archive.pm

@@ -10 +10 @@
 require ObsData::Archive::Zip;
 require ObsData::Archive::Rar;
+require ObsData::Archive::Lha;
 
 our $CVSID = q$Id$;

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

@@ -1 +1 @@
 # $Id$
 
-package ObsData::Archive::Rar;
+package ObsData::Archive::Lha;
 
 use strict;
@@ -22 +22 @@
 sub ls {
     my ($self) = @_;
-    open(my $hrar, '-|', "unrar lb '$self->{archive}'") or do {
-        $self->seterror("Can't read zip file: $!");
+    open(my $hlha, '-|', "lha '$self->{archive}'") or do {
+        $self->seterror("Can't read lha/lzh file: $!");
         return undef;
     };
     my @list;
-    while(<$hrar>) {
+    <$hlha>;
+    <$hlha> =~ /^-{9}/ or return;
+    while(<$hlha>) {
         chomp;
-        push(@list, $_);
+        /^.{51}(.*)$/;
+        push(@list, $1);
     }
-    close($hrar);
+    close($hlha);
     return @list;
 }
@@ -74 +77 @@
 }
 
-ObsData::Archive::register(sub { $_[0] =~ /\.rar$/i }, 'Rar', 0);
+ObsData::Archive::register(sub { $_[0] =~ /\.(lzh|lha)$/i }, 'Lha', 0);

trunk/soft/ObsData/t/OA-07.t

@@ -11 +11 @@
 print $tempdir . "\n";
 
-my $oa = ObsData::Archive->new('testdata/coin.rar');
+my $oa = ObsData::Archive->new('testdata/coin.lzh');
 
-isa_ok($oa, 'ObsData::Archive::Rar');
+isa_ok($oa, 'ObsData::Archive::Lha');
 my ($list) = $oa->ls();
 ok($list eq 'coin', "Can list its contents");