Changeset 162

Timestamp:

12/18/05 16:20:50 (18 years ago)

Author:

thauvin

Message:

• make Archive dynamique

Location:

trunk/soft/ObsData/ObsData

Files:

• Archive.pm (modified) (3 diffs, 1 prop)
• Archive/Compressed.pm (modified) (1 diff, 1 prop)
• Archive/FlatFile.pm (modified) (1 diff, 1 prop)
• Archive/Rar.pm (modified) (1 diff, 1 prop)
• Archive/Tar.pm (modified) (1 diff, 1 prop)
• Archive/Zip.pm (modified) (1 diff, 1 prop)

trunk/soft/ObsData/ObsData/Archive.pm

@@ -5 +5 @@
 use strict;
 use warnings;
-use ObsData::Archive::FlatFile;
-use ObsData::Archive::Compressed;
-use ObsData::Archive::Tar;
-use ObsData::Archive::Zip;
-use ObsData::Archive::Rar;
+require ObsData::Archive::FlatFile;
+require ObsData::Archive::Compressed;
+require ObsData::Archive::Tar;
+require ObsData::Archive::Zip;
+require ObsData::Archive::Rar;
 
 our $CVSID = q$Id$;
@@ -15 +15 @@
 
 my $error = {};
+
+my @dynload = ();
+
+sub register {
+    my ($rule, $class, $priority) = @_;
+    push(
+        @dynload,
+        {
+            rule => $rule,
+            class => $class,
+            priority => $priority,
+        }
+    );
+    1;
+}
 
 sub new {
@@ -36 +51 @@
     
     for ($archive) {
-        /\.tar(\.[^\.]*)?$/ and do {
-            $beclass = 'Tar';
-            last;
-        };
-        /\.(gz|bz2|Z)$/ and do {
-            $beclass = 'Compressed';
-            last;
-        };
-        /\.zip$/ and do {
-            $beclass = 'Zip';
-            last;
-        };
-        /\.rar$/ and do {
-            $beclass = 'Rar';
-            last;
-        };
-        $beclass = 'FlatFile';
+        foreach my $r (sort { $a->{priority} <=> $b->{priority} } @dynload) {
+            if (ref($r->{rule}) eq 'CODE' ?
+                $r->{rule}->($_) :
+                /$r->{rule}/) {
+                $beclass = $r->{class};
+                last;
+            }
+        }
     }
     

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

@@ -74 +74 @@
 }
 
-1;
+ObsData::Archive::register(sub { $_[0] =~ /\.(gz|Z|bz2)$/i }, 'Compressed', 5);

trunk/soft/ObsData/ObsData/Archive/FlatFile.pm

@@ -59 +59 @@
 }
 
-1;
+ObsData::Archive::register('.*', 'FlatFile', 10);

trunk/soft/ObsData/ObsData/Archive/Rar.pm

@@ -74 +74 @@
 }
 
-1;
+ObsData::Archive::register(sub { $_[0] =~ /\.rar$/i }, 'Rar', 0);

trunk/soft/ObsData/ObsData/Archive/Tar.pm

@@ -81 +81 @@
 }
 
-1;
+ObsData::Archive::register(
+    sub {
+        $_[0] =~ /\.tar\.(gz|bz2|Z)$/i;
+    }, 
+    'Tar', 
+    0
+);

trunk/soft/ObsData/ObsData/Archive/Zip.pm

@@ -74 +74 @@
 }
 
-1;
+ObsData::Archive::register(sub { $_[0] =~ /\.zip$/i }, 'Zip', 5);