Changeset 274 for obsdata/trunk

Timestamp:

10/27/06 00:30:40 (18 years ago)

Author:

nanardon

Message:

• perltidyfication (beautify indentation)

Location:

obsdata/trunk

Files:

• ObsData.pm (modified) (26 diffs)
• ObsData/Archive.pm (modified) (8 diffs)
• ObsData/Archive/Compressed.pm (modified) (2 diffs)
• ObsData/Archive/FlatFile.pm (modified) (2 diffs)
• ObsData/Archive/Lha.pm (modified) (5 diffs)
• ObsData/Archive/Rar.pm (modified) (3 diffs)
• ObsData/Archive/Tar.pm (modified) (6 diffs)
• ObsData/Archive/Zip.pm (modified) (4 diffs)
• ObsData/Event.pm (modified) (7 diffs)
• ObsData/Repository.pm (modified) (38 diffs)

obsdata/trunk/ObsData.pm

@@ -12 +12 @@
 use File::Basename;
 
-my @loglevel = (
-    'DEBUG',
-    'INFO',
-    'RESULT',
-    'WARNING',
-    'ERROR',
-    'FATAL',
-);
+my @loglevel = ( 'DEBUG', 'INFO', 'RESULT', 'WARNING', 'ERROR', 'FATAL', );
 
 our $VERSION = "0.3.1";
-our $CVSID = q$Id$;
-our $CVSREV = (q$Revision$ =~ /^Revision: (.*) $/)[0];
+our $CVSID   = q$Id$;
+our $CVSREV  = ( q$Revision$ =~ /^Revision: (.*) $/ )[0];
 
 =head1 NAME
@@ -44 +37 @@
 
 sub new {
-    my ($class, $configfile, %options) = @_;
+    my ( $class, $configfile, %options ) = @_;
     my $obsdata = {
         config => new Config::IniFiles(
-            -file => $configfile,
-            -default => 'global',
+            -file          => $configfile,
+            -default       => 'global',
             -allowcontinue => 1
         ),
-        verbose => defined($options{verbose}) ? $options{verbose} : 1,
-        logcallback => $options{logcallback},
-        logfile => $options{logfile},
-        dry_run => $options{dry_run},
+        verbose => defined( $options{verbose} ) ? $options{verbose} : 1,
+        logcallback          => $options{logcallback},
+        logfile              => $options{logfile},
+        dry_run              => $options{dry_run},
         interactive_callback => $options{interactive_callback},
-        processed_lists => [],
+        processed_lists      => [],
     };
 
-    if (!($configfile && -f $configfile && -r _)) {
+    if ( !( $configfile && -f $configfile && -r _ ) ) {
         return undef;
     }
@@ -66 +59 @@
 
     # directory where to search plugins
-    @{$obsdata->{plugindir}} = grep { $_ && -d $_ } (
+    @{ $obsdata->{plugindir} } = grep { $_ && -d $_ } (
         $options{plugindir},
         dirname($0),
-        split(/\s+/, $obsdata->{config}->val('global', 'plugindir') || ''),
+        split( /\s+/, $obsdata->{config}->val( 'global', 'plugindir' ) || '' ),
     );
 
-    $obsdata->{logfile} ||= $obsdata->{config}->val('global', 'logfile') || 'obsdata.log';
-
-    bless($obsdata, $class);
+    $obsdata->{logfile} ||= $obsdata->{config}->val( 'global', 'logfile' )
+      || 'obsdata.log';
+
+    bless( $obsdata, $class );
 }
 
@@ -80 +74 @@
     my ($self) = @_;
 
-    $self->logging(0, "END process: %s (%s)",
-        $VERSION,
-        $CVSID,
-    );
-
-    if ($self->{loghandle}) {
-        close($self->{loghandle});
+    $self->logging( 0, "END process: %s (%s)", $VERSION, $CVSID, );
+
+    if ( $self->{loghandle} ) {
+        close( $self->{loghandle} );
         $self->{loghandle} = undef;
     }
@@ -100 +91 @@
     my ($self) = @_;
 
-    if (!open($self->{loghandle}, ">> $self->{logfile}")) {
+    if ( !open( $self->{loghandle}, ">> $self->{logfile}" ) ) {
         $self->{loghandle} = undef;
-        $self->logging(5, "Can't open log file %s, exiting", "$self->{logfile}");
+        $self->logging( 5, "Can't open log file %s, exiting",
+            "$self->{logfile}" );
         return 0;
     }
 
-    $self->logging(0, "BEGIN process: %s (%s)",
-        $VERSION,
-        $CVSID,
-    );
+    $self->logging( 0, "BEGIN process: %s (%s)", $VERSION, $CVSID, );
 
     my $path = `pwd`;
     chomp($path);
-    $self->logging(0, "Using config file `%s' (%s)",
-        $self->{config}->GetFileName(),
-        $path,
+    $self->logging(
+        0,
+        "Using config file `%s' (%s)",
+        $self->{config}->GetFileName(), $path,
     );
-    
+
     $self->load_plugins() or return 0;
-    
+
     return 1;
 }
@@ -131 +121 @@
 sub load_plugins {
     my ($self) = @_;
-    
-    $self->logging(0,
+
+    $self->logging(
+        0,
         "Plugin will be searched in: %s",
-        join(', ', @{$self->{plugindir}}),
+        join( ', ', @{ $self->{plugindir} } ),
     );
-        
-    foreach my $datatype ($self->list_datatype()) {
+
+    foreach my $datatype ( $self->list_datatype() ) {
         foreach my $plugin (qw/match_plugin/) {
-            my ($plugfile, @plugarg) = 
-                split(/\s+/, $self->getvalue($datatype, $plugin) ||'');
-            $plugfile or next; # if no plugin, skipping
+            my ( $plugfile, @plugarg ) =
+              split( /\s+/, $self->getvalue( $datatype, $plugin ) || '' );
+            $plugfile or next;    # if no plugin, skipping
             my ($plugfilename) = grep { -f $_ }
-                map { "$_/$plugfile" } @{$self->{plugindir}};
-            if (!$plugfilename) {
-                $self->logging(5,
-                    "Cannot find plugin %s (%s) for %s datatype",
-                    $plugfile,
-                    $plugin,
-                    $datatype,
-                );
+              map { "$_/$plugfile" } @{ $self->{plugindir} };
+            if ( !$plugfilename ) {
+                $self->logging( 5, "Cannot find plugin %s (%s) for %s datatype",
+                    $plugfile, $plugin, $datatype, );
                 return 0;
             }
             my $sub = do $plugfilename;
             if ($@) {
-                $self->logging(4,
+                $self->logging( 4,
                     "Cannot load plugin %s for %s: %s, exiting !",
-                    $plugin,
-                    $datatype,
-                    $@,
+                    $plugin, $datatype, $@, );
+                return 0;
+            }
+            if ( $sub && ref $sub eq 'CODE' ) {
+                $self->{plugin}{$datatype}{$plugin} = {
+                    code => $sub,
+                    arg  => \@plugarg,
+                };
+                $self->logging( 0, "loading plugin %s for %s (%s)",
+                    $plugin, $datatype, $sub, );
+            }
+            else {
+                $self->logging(
+                    4, "Cannot load plugin %s for %s (is %s)",
+                    $plugin, $datatype, $sub ? ref $sub : 'undef or empty',
                 );
-                return 0;
-            }
-            if ($sub && ref $sub eq 'CODE') {
-                $self->{plugin}{$datatype}{$plugin} = {
-                   code => $sub,
-                   arg => \@plugarg,
-                };
-                $self->logging(0,
-                    "loading plugin %s for %s (%s)",
-                    $plugin,
-                    $datatype,
-                    $sub,
-                );
-            } else {
-                $self->logging(4,
-                    "Cannot load plugin %s for %s (is %s)",
-                    $plugin,
-                    $datatype,
-                    $sub ? ref $sub : 'undef or empty',
-                );
             }
         }
@@ -194 +173 @@
 
 sub get_sub_plugin {
-    my ($self, $datatype, $plugintype) = @_;
-    if (exists($self->{plugin}{$datatype}{$plugintype})) {
+    my ( $self, $datatype, $plugintype ) = @_;
+    if ( exists( $self->{plugin}{$datatype}{$plugintype} ) ) {
         my $ref = $self->{plugin}{$datatype}{$plugintype};
-        return($ref->{code}, @{$ref->{arg}});
-    } else {
+        return ( $ref->{code}, @{ $ref->{arg} } );
+    }
+    else {
         return undef;
     }
@@ -213 +193 @@
 
 sub logging {
-    my ($self, $level, $fmt, @val) = @_;
-    my $msg = sprintf($fmt, @val);
+    my ( $self, $level, $fmt, @val ) = @_;
+    my $msg = sprintf( $fmt, @val );
     my $logh = $self->{loghandle};
-    if ($self->{logcallback}) {
-        $self->{logcallback}->($level, $msg);
-    }
-    if($level >= 0 && $level >= $self->{verbose}) {
+    if ( $self->{logcallback} ) {
+        $self->{logcallback}->( $level, $msg );
+    }
+    if ( $level >= 0 && $level >= $self->{verbose} ) {
         if ($logh) {
-            printf $logh 
-                "%-9s %s %s\n", 
-                sprintf("[%s]", $self->loglevel($level)),
-                strftime("%b %d %H:%M:%S %Y", gmtime),
-                $msg;
-        }
-    }
-    $msg
+            printf $logh "%-9s %s %s\n",
+              sprintf( "[%s]", $self->loglevel($level) ),
+              strftime( "%b %d %H:%M:%S %Y", gmtime ), $msg;
+        }
+    }
+    $msg;
 }
 
@@ -240 +218 @@
     my $l = pop(@_);
     defined($l) or $l = pop(@_);
-    return $loglevel[ $l ] || "?????";
+    return $loglevel[$l] || "?????";
 }
 
@@ -254 +232 @@
     my ($self) = @_;
     my $result = 1;
-    foreach my $g ($self->{config}->GroupMembers('Obs')) {
+    foreach my $g ( $self->{config}->GroupMembers('Obs') ) {
         my ($obs) = $g =~ /\S+\s+(.*)/;
-        if (!$self->{config}->SectionExists($obs)) {
+        if ( !$self->{config}->SectionExists($obs) ) {
             print STDERR "E: '$obs' is listed as Obs but it does not exists\n";
             next;
         }
-        foreach my $param ($self->{config}->Parameters($obs)) {
-        }
-        foreach my $datatype ($self->list_datatype) {
+        foreach my $param ( $self->{config}->Parameters($obs) ) {
+        }
+        foreach my $datatype ( $self->list_datatype ) {
             foreach my $var (qw(match match_archive)) {
-                my $regexp = $self->getvalue($datatype, $var) or next; # next ? are we sure ?
-                eval { qr/$regexp/ }; # Many thanks Rafael
+                my $regexp = $self->getvalue( $datatype, $var )
+                  or next;    # next ? are we sure ?
+                eval { qr/$regexp/ };    # Many thanks Rafael
                 if ($@) {
-                    $self->logging(4, "error in regexp for %s: '%s': %s",
-                        $datatype,
-                        $regexp,
-                        $@,
-                    );
+                    $self->logging( 4, "error in regexp for %s: '%s': %s",
+                        $datatype, $regexp, $@, );
                     $result = 0;
+
                     # TODO set this reg unavalable
                 }
@@ -278 +255 @@
         }
     }
-    return($result);
+    return ($result);
 }
 
@@ -288 +265 @@
 
 sub getvalue {
-    my ($self, $section, $var, $default) = @_;
-    $self->{config}->val($section, $var, $default);
+    my ( $self, $section, $var, $default ) = @_;
+    $self->{config}->val( $section, $var, $default );
 }
 
@@ -300 +277 @@
 sub config_mtime {
     my ($self) = @_;
-    return $self->{configmtime} ||= (stat($self->{config}->GetFileName))[9];
+    return $self->{configmtime} ||= ( stat( $self->{config}->GetFileName ) )[9];
 }
 
@@ -312 +289 @@
     my ($self) = @_;
     grep { $self->{config}->SectionExists($_) }
-        map { s/^\S+\s+//; $_ }
-        $self->{config}->GroupMembers('Obs');
+      map { s/^\S+\s+//; $_ } $self->{config}->GroupMembers('Obs');
 }
 
@@ -323 +299 @@
 
 sub is_obs {
-    my ($self, $obs) = @_;
-    scalar(grep { $_ eq "Obs $obs" } $self->{config}->GroupMembers('Obs'));
+    my ( $self, $obs ) = @_;
+    scalar( grep { $_ eq "Obs $obs" } $self->{config}->GroupMembers('Obs') );
 }
 
@@ -334 +310 @@
 
 sub list_obsdatadir {
-    my ($self, $obs) = @_;
+    my ( $self, $obs ) = @_;
     $self->is_obs($obs) or return undef;
-    map { m,^datadir/(.*),; ( ($1 || "") => $self->{config}->val($obs, $_) ) }
-        grep { m,^datadir/, || $_ eq 'datadir' }
-        $self->{config}->Parameters($obs)
+    map {
+        m,^datadir/(.*),;
+        ( ( $1 || "" ) => $self->{config}->val( $obs, $_ ) )
+      }
+      grep { m,^datadir/, || $_ eq 'datadir' }
+      $self->{config}->Parameters($obs);
 }
 
@@ -348 +327 @@
 
 sub list_typedatadir {
-    my ($self, $type) = @_;
+    my ( $self, $type ) = @_;
     my %dirs;
-    foreach my $obs ($self->list_obs) {
-        $dirs{$_} = 1 foreach(grep { $_ } $self->get_datadir($obs, $type));
-    }
-    keys %dirs; 
-        
+    foreach my $obs ( $self->list_obs ) {
+        $dirs{$_} = 1 foreach ( grep { $_ } $self->get_datadir( $obs, $type ) );
+    }
+    keys %dirs;
+
 }
 
@@ -364 +343 @@
 
 sub get_datadir {
-    my ($self, $obs, $type) = @_;
+    my ( $self, $obs, $type ) = @_;
     $self->is_obs($obs) or return undef;
-    grep { defined($_) } ($self->getvalue($obs, "datadir/$type"), $self->getvalue($obs, "datadir"));
+    grep { defined($_) } (
+        $self->getvalue( $obs, "datadir/$type" ),
+        $self->getvalue( $obs, "datadir" )
+    );
 }
 
@@ -378 +360 @@
     my ($self) = @_;
     grep { $_ ne 'global' }
-    grep { $_ !~ /^Obs\s+/ }
-    grep { !$self->is_obs($_) } $self->{config}->Sections;
+      grep { $_ !~ /^Obs\s+/ }
+      grep { !$self->is_obs($_) } $self->{config}->Sections;
 }
 
@@ -391 +373 @@
 
 sub get_obs_data_handle {
-    my ($self, $obs, $datatype) = @_;
-
-    my $dir = $self->getvalue($obs, ($datatype ? "datadir/$datatype" : "datadir"));
-    if (!$dir) {
-        $self->logging(4,
-            "Can't find data directory for %s, type: %s",
-            $obs, $datatype || '(none)'
-        );
+    my ( $self, $obs, $datatype ) = @_;
+
+    my $dir =
+      $self->getvalue( $obs, ( $datatype ? "datadir/$datatype" : "datadir" ) );
+    if ( !$dir ) {
+        $self->logging( 4, "Can't find data directory for %s, type: %s",
+            $obs, $datatype || '(none)' );
         return undef;
     }
     my $or = ObsData::Repository::dir->new(
         {
-            obsdata => $self,
-            dir => $dir,
-            obs => $obs,
+            obsdata  => $self,
+            dir      => $dir,
+            obs      => $obs,
             datatype => $datatype,
             dry_run => $self->{dry_run}, # FIXME does this have a better place ?
-            patern => $self->getvalue(
-                $obs,
-                ($datatype ? "searchfiles/$datatype" : "searchfiles")
+            patern  => $self->getvalue(
+                $obs, ( $datatype ? "searchfiles/$datatype" : "searchfiles" )
             ),
             statusfile => $self->getvalue(
-                $obs, 
-                ($datatype ? "index/$datatype" : "index"),
+                $obs, ( $datatype ? "index/$datatype" : "index" ),
                 "$dir/obsdata.ini"
             ),
         }
     );
-    if (!defined($or)) {
-        $self->logging(4, "Can't parse %s, check directory exists", $dir);
+    if ( !defined($or) ) {
+        $self->logging( 4, "Can't parse %s, check directory exists", $dir );
         return undef;
     }
-    
-    return($or);
+
+    return ($or);
 }
 
@@ -434 +413 @@
 
 sub process_obs {
-    my ($self, $obs) = @_;
+    my ( $self, $obs ) = @_;
     my %datadir = $self->list_obsdatadir($obs);
-    $self->logging(0, "Starting %s() for %s", (caller(0))[3], $obs);
-    
-    foreach my $datatype (keys %datadir) {
-        my $or = $self->get_obs_data_handle($obs, $datatype);
+    $self->logging( 0, "Starting %s() for %s", ( caller(0) )[3], $obs );
+
+    foreach my $datatype ( keys %datadir ) {
+        my $or = $self->get_obs_data_handle( $obs, $datatype );
         $or or next;
         $or->process;
@@ -446 +425 @@
 
 sub processed {
-    my ($self, $obs, $archive, $datafile, $datatype, $dest) = @_;
-    push(@{$self->{processed_lists}},
+    my ( $self, $obs, $archive, $datafile, $datatype, $dest ) = @_;
+    push(
+        @{ $self->{processed_lists} },
         {
-            obs => $obs,
-            archive => $archive,
+            obs      => $obs,
+            archive  => $archive,
             datafile => $datafile,
             datatype => $datatype,
@@ -456 +436 @@
         }
     );
-    $self->logging(
-        2, "Extraction of %s/%s done as %s",
-        $archive,
-        $datafile,
-        $dest,
-    ) if ($dest);
+    $self->logging( 2, "Extraction of %s/%s done as %s",
+        $archive, $datafile, $dest, )
+      if ($dest);
 }
 
@@ -467 +444 @@
     my ($self) = @_;
     my $result = {
-        all => [],
+        all   => [],
         users => {},
     };
 
-    foreach my $entry (@{$self->{processed_lists}}) {
+    foreach my $entry ( @{ $self->{processed_lists} } ) {
         my %people = map { $_ => 1 } grep { $_ } (
-            ($entry->{datatype} ?
-                split(/\s*,\s*/, $self->getvalue($entry->{datatype}, 'reportto') || "") :
-                split(/\s*,\s*/, $self->getvalue('global', 'nodestreportto') || "")
+            (
+                $entry->{datatype}
+                ? split( /\s*,\s*/,
+                    $self->getvalue( $entry->{datatype}, 'reportto' ) || "" )
+                : split(
+                    /\s*,\s*/,
+                    $self->getvalue( 'global', 'nodestreportto' ) || ""
+                )
             ),
-            split(/\s*,\s*/, $self->getvalue($entry->{obs}, 'reportto') || ""),
-            split(/\s*,\s*/, $self->getvalue('global', 'allreportto') || "")
+            split(
+                /\s*,\s*/, $self->getvalue( $entry->{obs}, 'reportto' ) || ""
+            ),
+            split(
+                /\s*,\s*/, $self->getvalue( 'global', 'allreportto' ) || ""
+            )
         );
         keys %people or next;
-        foreach my $p (keys %people) {
-            push(@{$result->{users}{$p}}, $entry);
-        }
-    }
-
-    foreach my $p (keys(%{$result->{users} || {}})) {
+        foreach my $p ( keys %people ) {
+            push( @{ $result->{users}{$p} }, $entry );
+        }
+    }
+
+    foreach my $p ( keys( %{ $result->{users} || {} } ) ) {
         my %obs_entries = ();
-        foreach (@{$result->{users}{$p}}) {
-            push(@{$obs_entries{$_->{obs}}},  $_);
-        }
-
-        foreach my $obs (keys %obs_entries) {
+        foreach ( @{ $result->{users}{$p} } ) {
+            push( @{ $obs_entries{ $_->{obs} } }, $_ );
+        }
+
+        foreach my $obs ( keys %obs_entries ) {
             my %datatype_entries = ();
-            foreach (@{$obs_entries{$obs}}) {
-                push(@{$datatype_entries{$_->{datatype} || '!'}}, $_);
+            foreach ( @{ $obs_entries{$obs} } ) {
+                push( @{ $datatype_entries{ $_->{datatype} || '!' } }, $_ );
             }
 
             my %msg = (
-                Subject => 'ObsData Report: ' . $obs,
-                To => $p,
+                Subject             => 'ObsData Report: ' . $obs,
+                To                  => $p,
                 'X-ObsData-Version' => $VERSION,
-                'Content-Type' => "TEXT/PLAIN;\n  charset=ISO-8859-1",
+                'Content-Type'      => "TEXT/PLAIN;\n  charset=ISO-8859-1",
                 'Content-Transfer-Encoding' => 'QUOTED-PRINTABLE',
                 From => 'ObsData <robot@aero.jussieu.fr>',
             );
             my $message = "";
-            foreach my $d (sort keys(%datatype_entries)) {
-                if ($d eq '!') {
+            foreach my $d ( sort keys(%datatype_entries) ) {
+                if ( $d eq '!' ) {
                     $message .= "\nNot proceed:\n";
-                    foreach (@{$datatype_entries{$d} || []}) {
-                        $message .= sprintf("  file %s from %s\n",
-                            $_->{datafile},
-                            $_->{archive},
-                        );
-                    }
-                } else {
-                    $message .= "\nDataType: $d\n";
-                    foreach (@{$datatype_entries{$d} || []}) {
-                        $message .= sprintf("  file %s from %s => %s\n",
-                            $_->{datafile},
-                            $_->{archive},
-                            $_->{destfile},
-                        );
+                    foreach ( @{ $datatype_entries{$d} || [] } ) {
+                        $message .= sprintf( "  file %s from %s\n",
+                            $_->{datafile}, $_->{archive}, );
                     }
                 }
+                else {
+                    $message .= "\nDataType: $d\n";
+                    foreach ( @{ $datatype_entries{$d} || [] } ) {
+                        $message .= sprintf( "  file %s from %s => %s\n",
+                            $_->{datafile}, $_->{archive}, $_->{destfile}, );
+                    }
+                }
             }
             sendmail(
                 %msg,
-                smtp => 'mailhost',
+                smtp    => 'mailhost',
                 Message => encode_qp($message),
-            ) or $self->log(4, "Cannot send mail to %s: %s",
+              )
+              or $self->log(
+                4,        "Cannot send mail to %s: %s",
                 $msg{To}, $Mail::Sendmail::error,
-            );
+              );
         }
     }
@@ -542 +526 @@
     my ($self) = @_;
     my %datastype;
-    foreach my $entry (@{$self->{processed_lists}}) {
+    foreach my $entry ( @{ $self->{processed_lists} } ) {
         $entry->{datatype} or next;
-        push(@{$datastype{$entry->{datatype}}}, $entry);
-    }
-
-    foreach my $datatype (keys %datastype) {
-        my $command = $self->getvalue($datatype, 'postexec');
-        $self->logging(0, 'postexec for %s is %s',
-            $datatype,
-            $command ? "`$command'" : 'not set, skipping',
+        push( @{ $datastype{ $entry->{datatype} } }, $entry );
+    }
+
+    foreach my $datatype ( keys %datastype ) {
+        my $command = $self->getvalue( $datatype, 'postexec' );
+        $self->logging(
+            0, 'postexec for %s is %s',
+            $datatype, $command ? "`$command'" : 'not set, skipping',
         );
         if ($command) {
-            if (open(my $posthandle, "| $command")) {
-                foreach (@{$datastype{$datatype}}) {
+            if ( open( my $posthandle, "| $command" ) ) {
+                foreach ( @{ $datastype{$datatype} } ) {
                     print $posthandle "$_->{destfile}\n" or do {
-                        $self->logging(4, "cannot write to postexec handle for `%s': %s",
-                            $datatype,
-                            $!,
-                        );
+                        $self->logging( 4,
+                            "cannot write to postexec handle for `%s': %s",
+                            $datatype, $!, );
                         last;
                     };
                 }
                 my $exitstatus = close($posthandle);
-                $self->logging($exitstatus ? 0 : 4,
+                $self->logging(
+                    $exitstatus ? 0 : 4,
                     "postexec for %s exit %s",
                     $datatype,
-                    $exitstatus ? "correctly" : "with failure : " . ($! ? ($!) : "(??)"),
+                    $exitstatus
+                    ? "correctly"
+                    : "with failure : " . ( $! ? ($!) : "(??)" ),
                 );
-            } else {
-                $self->logging(4, "Cannot exec post `%s' for `%s'",
-                    $command,
-                    $datatype,
-                );
+            }
+            else {
+                $self->logging( 4, "Cannot exec post `%s' for `%s'",
+                    $command, $datatype, );
                 next;
             }
@@ -593 +578 @@
 
 =cut
+

obsdata/trunk/ObsData/Archive.pm

@@ -13 +13 @@
 
 our $CVSID = q$Id$;
-our $CVSREV = (q$Revision$ =~ /^Revision: (.*) $/)[0];
+our $CVSREV = ( q$Revision$ =~ /^Revision: (.*) $/ )[0];
 
 my $error = {};
@@ -20 +20 @@
 
 sub register {
-    my ($rule, $class, $priority) = @_;
+    my ( $rule, $class, $priority ) = @_;
     push(
         @ObsData::Archive::dynload,
         {
-            rule => $rule,
-            class => $class,
+            rule     => $rule,
+            class    => $class,
             priority => $priority,
         }
@@ -35 +35 @@
     my ($module) = @_;
     eval { require $module };
-    return($@ ? 0 : 1);
+    return ( $@ ? 0 : 1 );
 }
 
 sub new {
-    my ($class, $archive, %options) = @_;
+    my ( $class, $archive, %options ) = @_;
     my $beclass;
 
-    if (!$archive) {
+    if ( !$archive ) {
         seterror("No archive to read");
         return undef;
     }
-    if (!-r $archive) {
+    if ( !-r $archive ) {
         seterror("No such file or directory");
         return undef;
     }
     my $o;
-    
-    foreach (keys %options) {
+
+    foreach ( keys %options ) {
         $o->{$_} = $options{$_};
     }
     $o->{archive} = $archive;
-    
+
     for ($archive) {
-        foreach my $r (sort { $a->{priority} <=> $b->{priority} } @ObsData::Archive::dynload) {
-            if (ref($r->{rule}) eq 'CODE' ?
-                $r->{rule}->($_) :
-                /$r->{rule}/) {
+        foreach my $r ( sort { $a->{priority} <=> $b->{priority} }
+            @ObsData::Archive::dynload )
+        {
+            if (
+                ref( $r->{rule} ) eq 'CODE'
+                ? $r->{rule}->($_)
+                : /$r->{rule}/
+              )
+            {
                 $beclass = $r->{class};
                 last;
@@ -67 +72 @@
         }
     }
-    
+
     if ($beclass) {
         my $obj;
+
         # eval("require $class\:\:$beclass;");
         eval("\$obj = $class\:\:$beclass->new(\$o);");
@@ -83 +89 @@
 
 sub seterror {
-    my ($package, $filename, $line) = caller;
+    my ( $package, $filename, $line ) = caller;
     $error = {
-        'package' => $package,
+        'package'  => $package,
         'filename' => $filename,
-        'line' => $line,
-        'error' => $_[1] || $_[0],
+        'line'     => $line,
+        'error'    => $_[1] || $_[0],
     };
 }
@@ -97 +103 @@
 
 sub new {
-    my ($class, $o) = @_;
-    bless($o, $class);
+    my ( $class, $o ) = @_;
+    bless( $o, $class );
 }
 
@@ -107 +113 @@
 sub ls {
     my ($self) = @_;
-    seterror("ls not implement in class " . ref($self));
+    seterror( "ls not implement in class " . ref($self) );
     return;
 }
 
 sub extract {
-    my ($self, $file, $dest) = @_;
-    seterror("extract not implement in class " . ref($self));
+    my ( $self, $file, $dest ) = @_;
+    seterror( "extract not implement in class " . ref($self) );
     return;
 }
@@ -121 +127 @@
 sub _tempdir {
     my ($self) = @_;
-    $self->{tmpdir} || $ENV{TMPDIR}
+    $self->{tmpdir} || $ENV{TMPDIR};
 }
 

obsdata/trunk/ObsData/Archive/Compressed.pm

@@ -12 +12 @@
 
 sub new {
-    my ($class, $options) = @_;
+    my ( $class, $options ) = @_;
 
-    if (!$options->{uncomp}) {
-        for ($options->{archive}) {
+    if ( !$options->{uncomp} ) {
+        for ( $options->{archive} ) {
             /\.(Z|gz)$/ and $options->{uncomp} = 'gzip -dc';
-            /\.bz2$/ and $options->{uncomp} = 'bzip2 -dc';
+            /\.bz2$/    and $options->{uncomp} = 'bzip2 -dc';
         }
     }
-    
-    bless($options, $class);
+
+    bless( $options, $class );
 }
 
@@ -35 +35 @@
 
 sub extract {
-    my ($self, $file, $dest) = @_;
+    my ( $self, $file, $dest ) = @_;
+
     # the devel should specify the file he want
     # as the basic contains only 1 file... this does not matter
 
-    my ($fh, $fname);
-    
+    my ( $fh, $fname );
+
     if ($dest) {
         $fname = $dest;
-        open($fh, '>', $dest) or do {
+        open( $fh, '>', $dest ) or do {
             $self->seterror("Can't uncompress archive: $!");
             return undef;
         };
-    } else {
-        ($fh, $fname) = tempfile(
-            DIR => $self->_tempdir,
+    }
+    else {
+        ( $fh, $fname ) = tempfile(
+            DIR    => $self->_tempdir,
             UNLINK => 1,
-        ) or do {
+          )
+          or do {
             $self->seterror("Can't create temp file: $!");
             return undef;
-        };
+          };
     }
 
-    open(my $sourcefh, "$self->{uncomp} '$self->{archive}' 2>/dev/null |") or return undef;
-    
-    if(!copy($sourcefh, $fh)) {
+    open( my $sourcefh, "$self->{uncomp} '$self->{archive}' 2>/dev/null |" )
+      or return undef;
+
+    if ( !copy( $sourcefh, $fh ) ) {
         $self->seterror("Can't copy file to destination: $!");
         unlink($fname);
         return undef;
     }
-    
+
     close($fh);
-    if(!close($sourcefh)) {
-        $self->seterror("$self->{uncomp} exit with error" . ($! ? (" " . $!) : ""));
+    if ( !close($sourcefh) ) {
+        $self->seterror(
+            "$self->{uncomp} exit with error" . ( $! ? ( " " . $! ) : "" ) );
         unlink($fname);
         return undef;
     }
-    $fname
+    $fname;
 }
 
-ObsData::Archive::register(sub { $_[0] =~ /\.(gz|Z|bz2)$/i }, 'Compressed', 5);
+ObsData::Archive::register( sub { $_[0] =~ /\.(gz|Z|bz2)$/i }, 'Compressed',
+    5 );

obsdata/trunk/ObsData/Archive/FlatFile.pm

@@ -12 +12 @@
 
 sub new {
-    my ($class, $options) = @_;
-    bless($options, $class);
+    my ( $class, $options ) = @_;
+    bless( $options, $class );
 }
 
@@ -27 +27 @@
 
 sub extract {
-    my ($self, $file, $dest) = @_;
+    my ( $self, $file, $dest ) = @_;
+
     # the devel should specify the file he want
     # as the basic contains only 1 file... this does not matter
 
-    my ($fh, $fname);
-    
+    my ( $fh, $fname );
+
     if ($dest) {
         $fname = $dest;
-        if(!open($fh, '>', $dest)) {
+        if ( !open( $fh, '>', $dest ) ) {
             $self->seterror($!);
             return undef;
         }
-    } else {
-        ($fh, $fname) = tempfile(
-            DIR => $self->_tempdir,
+    }
+    else {
+        ( $fh, $fname ) = tempfile(
+            DIR    => $self->_tempdir,
             UNLINK => 1,
-        ) or do {
+          )
+          or do {
             $self->seterror("Can't create tempfile: $!");
             return undef;
-        };
+          };
     }
-    
-    if(!copy($self->{archive}, $fh)) {
+
+    if ( !copy( $self->{archive}, $fh ) ) {
         unlink($fname);
         $self->seterror("Cant copy the archive: $!");
         return undef;
     }
-    
+
     close($fh);
-    $fname
+    $fname;
 }
 
-ObsData::Archive::register('.*', 'FlatFile', 10);
+ObsData::Archive::register( '.*', 'FlatFile', 10 );

obsdata/trunk/ObsData/Archive/Lha.pm

@@ -12 +12 @@
 
 sub new {
-    my ($class, $options) = @_;
-    bless($options, $class);
+    my ( $class, $options ) = @_;
+    bless( $options, $class );
 }
 
@@ -22 +22 @@
 sub ls {
     my ($self) = @_;
-    open(my $hlha, '-|', "lha '$self->{archive}'") or do {
+    open( my $hlha, '-|', "lha '$self->{archive}'" ) or do {
         $self->seterror("Can't read lha/lzh file: $!");
         return undef;
@@ -29 +29 @@
     <$hlha>;
     <$hlha> =~ /^-{9}/ or return;
-    while(<$hlha>) {
+    while (<$hlha>) {
         chomp;
         /^(\[\w*\]|(-|d|l|c|b)((-|r)(-|w)(-|x)){3} [^-])/ or next;
         /^.{51}(.*)$/;
-        push(@list, $1);
+        push( @list, $1 );
     }
     close($hlha);
@@ -40 +40 @@
 
 sub extract {
-    my ($self, $file, $dest) = @_;
-    
+    my ( $self, $file, $dest ) = @_;
+
     $file or return undef;
-    
+
     my $dir = tempdir();
 
-    if (system("lha xfw=$dir '$self->{archive}' '$file'")) {
-         $self->seterror("Can't uncompress archive: $!");
-         return undef;
+    if ( system("lha xfw=$dir '$self->{archive}' '$file'") ) {
+        $self->seterror("Can't uncompress archive: $!");
+        return undef;
     }
-    
+
     if ($dest) {
-        open(my $fh, '>', $dest) or do {
+        open( my $fh, '>', $dest ) or do {
             $self->seterror("Can't uncompress archive: $!");
             return undef;
         };
-        open(my $sourcefh, '<', "$dir/$file") or do {
+        open( my $sourcefh, '<', "$dir/$file" ) or do {
             $self->seterror("Can't open temp file for reading: $!");
             return undef;
         };
 
-        if(!copy($sourcefh, $fh)) {
+        if ( !copy( $sourcefh, $fh ) ) {
             $self->seterror("Can't copy file to destination: $!");
             unlink("$dir/$file");
@@ -69 +69 @@
         close($sourcefh);
     }
-    
+
     return $dest || "$dir/$file";
 }
 
-ObsData::Archive::register(sub { $_[0] =~ /\.(lzh|lha)$/i }, 'Lha', 0);
+ObsData::Archive::register( sub { $_[0] =~ /\.(lzh|lha)$/i }, 'Lha', 0 );

obsdata/trunk/ObsData/Archive/Rar.pm

@@ -12 +12 @@
 
 sub new {
-    my ($class, $options) = @_;
-    bless($options, $class);
+    my ( $class, $options ) = @_;
+    bless( $options, $class );
 }
 
@@ -22 +22 @@
 sub ls {
     my ($self) = @_;
-    open(my $hrar, '-|', "unrar lb '$self->{archive}'") or do {
+    open( my $hrar, '-|', "unrar lb '$self->{archive}'" ) or do {
         $self->seterror("Can't read rar file: $!");
         return undef;
     };
     my @list;
-    while(<$hrar>) {
+    while (<$hrar>) {
         chomp;
-        push(@list, $_);
+        push( @list, $_ );
     }
     close($hrar);
@@ -36 +36 @@
 
 sub extract {
-    my ($self, $file, $dest) = @_;
+    my ( $self, $file, $dest ) = @_;
 
     $file or return undef;
-    
-    my ($fh, $fname);
-    
+
+    my ( $fh, $fname );
+
     if ($dest) {
         $fname = $dest;
-        open($fh, '>', $dest) or do {
+        open( $fh, '>', $dest ) or do {
             $self->seterror("Can't uncompress archive: $!");
             return undef;
         };
-    } else {
-        ($fh, $fname) = tempfile(
-            DIR => $self->_tempdir,
+    }
+    else {
+        ( $fh, $fname ) = tempfile(
+            DIR    => $self->_tempdir,
             UNLINK => 1,
-        ) or do {
+          )
+          or do {
             $self->seterror("Can't create temp file: $!");
             return undef;
-        };
+          };
     }
 
-    open(my $sourcefh, "unrar p -ierr '$self->{archive}' '$file' 2>/dev/null |") or return undef;
-    
-    if(!copy($sourcefh, $fh)) {
+    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;
     }
-    
+
     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" . ($! ? (" " . $!) : ""));
+    if ( !close($sourcefh) ) {
+        $self->seterror(
+            "unrar -p exit with error" . ( $! ? ( " " . $! ) : "" ) );
         unlink($fname);
         return undef;
     }
-    $fname
+    $fname;
 }
 
-ObsData::Archive::register(sub { $_[0] =~ /\.rar$/i }, 'Rar', 0);
+ObsData::Archive::register( sub { $_[0] =~ /\.rar$/i }, 'Rar', 0 );

obsdata/trunk/ObsData/Archive/Tar.pm

@@ -13 +13 @@
 
 sub new {
-    my ($class, $options) = @_;
+    my ( $class, $options ) = @_;
 
-    if (!$options->{uncomp}) {
-        for ($options->{archive}) {
+    if ( !$options->{uncomp} ) {
+        for ( $options->{archive} ) {
             /\.(Z|gz)$/ and $options->{uncomp} = 'gzip -dc';
-            /\.bz2$/ and $options->{uncomp} = 'bzip2 -dc';
+            /\.bz2$/    and $options->{uncomp} = 'bzip2 -dc';
         }
     }
     $options->{uncomp} ||= 'cat';
-    bless($options, $class);
+    bless( $options, $class );
 }
 
@@ -31 +31 @@
 sub ls {
     my ($self) = @_;
-    open(my $htar, '-|', "$self->{uncomp} '$self->{archive}' | tar tf -") or do {
+    open( my $htar, '-|', "$self->{uncomp} '$self->{archive}' | tar tf -" )
+      or do {
         seterror("Can't read tar file: $!");
         return undef;
-    };
+      };
     my @list;
-    while(<$htar>) {
+    while (<$htar>) {
         chomp;
-        push(@list, $_);
+        push( @list, $_ );
     }
     close($htar);
@@ -45 +46 @@
 
 sub extract {
-    my ($self, $file, $dest) = @_;
+    my ( $self, $file, $dest ) = @_;
 
     $file or return undef;
-    
-    my $tempdir = tempdir();
-    my $here = getcwd();
-    my $abs_path = Cwd::abs_path($self->{archive});
+
+    my $tempdir  = tempdir();
+    my $here     = getcwd();
+    my $abs_path = Cwd::abs_path( $self->{archive} );
     my $abs_dest = Cwd::abs_path($dest);
-    
-    if(!chdir($tempdir)) {
+
+    if ( !chdir($tempdir) ) {
         $self->seterror("Can't chdir: $!");
         return undef;
@@ -64 +65 @@
         return undef;
     };
-    
+
     if ($dest) {
-        open(my $fh, '>', $abs_dest) or return undef;
-        if(!copy("$tempdir/$file", $fh)) {
+        open( my $fh, '>', $abs_dest ) or return undef;
+        if ( !copy( "$tempdir/$file", $fh ) ) {
             $self->seterror("Can't copy file to destination: $!");
             unlink($abs_dest);
@@ -77 +78 @@
         chdir($here);
         return $dest;
-    } else {
+    }
+    else {
         chdir($here);
         return "$tempdir/$file";
@@ -86 +88 @@
     sub {
         $_[0] =~ /\.tar\.(gz|bz2|Z)$/i;
-    }, 
-    'Tar', 
+    },
+    'Tar',
     0
 );

obsdata/trunk/ObsData/Archive/Zip.pm

@@ -12 +12 @@
 
 sub new {
-    my ($class, $options) = @_;
-    bless($options, $class);
+    my ( $class, $options ) = @_;
+    bless( $options, $class );
 }
 
@@ -22 +22 @@
 sub ls {
     my ($self) = @_;
-    open(my $hzip, '-|', "zipinfo -1 '$self->{archive}'") or do {
+    open( my $hzip, '-|', "zipinfo -1 '$self->{archive}'" ) or do {
         $self->seterror("Can't read zip file: $!");
         return undef;
     };
     my @list;
-    while(<$hzip>) {
+    while (<$hzip>) {
         chomp;
-        push(@list, $_);
+        push( @list, $_ );
     }
     close($hzip);
@@ -36 +36 @@
 
 sub extract {
-    my ($self, $file, $dest) = @_;
+    my ( $self, $file, $dest ) = @_;
 
     $file or return undef;
-    
-    my ($fh, $fname);
-    
+
+    my ( $fh, $fname );
+
     if ($dest) {
         $fname = $dest;
-        open($fh, '>', $dest) or do {
+        open( $fh, '>', $dest ) or do {
             $self->seterror("Can't uncompress archive: $!");
             return undef;
         };
-    } else {
-        ($fh, $fname) = tempfile(
-            DIR => $self->_tempdir,
+    }
+    else {
+        ( $fh, $fname ) = tempfile(
+            DIR    => $self->_tempdir,
             UNLINK => 1,
-        ) or do {
+          )
+          or do {
             $self->seterror("Can't create temp file: $!");
             return undef;
-        };
+          };
     }
 
-    open(my $sourcefh, "unzip -p '$self->{archive}' '$file' 2>/dev/null |") or return undef;
-    
-    if(!copy($sourcefh, $fh)) {
+    open( my $sourcefh, "unzip -p '$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;
     }
-    
+
     close($fh);
-    if(!close($sourcefh)) {
-        $self->seterror("unzip -p exit with error" . ($! ? (" " . $!) : ""));
+    if ( !close($sourcefh) ) {
+        $self->seterror(
+            "unzip -p exit with error" . ( $! ? ( " " . $! ) : "" ) );
         unlink($fname);
         return undef;
@@ -76 +80 @@
 }
 
-ObsData::Archive::register(sub { $_[0] =~ /\.zip$/i }, 'Zip', 5);
+ObsData::Archive::register( sub { $_[0] =~ /\.zip$/i }, 'Zip', 5 );

obsdata/trunk/ObsData/Event.pm

@@ -31 +31 @@
 
 sub new {
-    my ($class, $id, $message) = @_;
-    
-    if(!($id && $message)) {
+    my ( $class, $id, $message ) = @_;
+
+    if ( !( $id && $message ) ) {
         return undef;
     }
-    
+
     bless(
         {
-            id => $id,
-            message => $message,
-            test => {},
+            id         => $id,
+            message    => $message,
+            test       => {},
             test_order => [],
         },
@@ -56 +56 @@
 sub id {
     my ($self) = @_;
-    return($self->{id});
+    return ( $self->{id} );
 }
 
@@ -67 +67 @@
 sub message {
     my ($self) = @_;
-    return($self->{message});
+    return ( $self->{message} );
 }
 
@@ -77 +77 @@
 
 sub add_test {
-    my ($self, $test_id, $message, $result) = @_;
-    if (!exists($self->{test}{$test_id})) {
-        push(@{$self->{test_order}}, $test_id);
+    my ( $self, $test_id, $message, $result ) = @_;
+    if ( !exists( $self->{test}{$test_id} ) ) {
+        push( @{ $self->{test_order} }, $test_id );
     }
     $self->{test}{$test_id}{message} ||= $message;
@@ -93 +93 @@
 sub list_test {
     my ($self) = @_;
-    return(@{$self->{test_order}});
+    return ( @{ $self->{test_order} } );
 }
 
@@ -103 +103 @@
 
 sub test_message {
-    my ($self, $test_id) = @_;
-    return($self->{test}{$test_id}{message});
+    my ( $self, $test_id ) = @_;
+    return ( $self->{test}{$test_id}{message} );
 }
 
@@ -114 +114 @@
 
 sub test_result {
-    my ($self, $test_id) = @_;
-    return($self->{test}{$test_id}{result});
+    my ( $self, $test_id ) = @_;
+    return ( $self->{test}{$test_id}{result} );
 }
 

obsdata/trunk/ObsData/Repository.pm

@@ -14 +14 @@
 
 our $CVSID = q$Id$;
-our $CVSREV = (q$Revision$ =~ /^Revision: (.*) $/)[0];
+our $CVSREV = ( q$Revision$ =~ /^Revision: (.*) $/ )[0];
 
 =head1 METHODS
@@ -67 +67 @@
 
 sub new {
-    my ($class, $parent, %param) = @_;
-
-    my $or = { %$parent };
-    foreach (keys %param) {
+    my ( $class, $parent, %param ) = @_;
+
+    my $or = {%$parent};
+    foreach ( keys %param ) {
         $or->{$_} = $param{$_};
     }
-    
+
     $or->{obsdata} or die "Error #1de8d015, please insult programmer";
-    $or->{dir} or die "No dir given";
-    -d $or->{dir} or return undef;
-    
+    $or->{dir}     or die "No dir given";
+    -d $or->{dir}  or return undef;
+
     $or->{status} ||= new Config::IniFiles(
-        -file => (($or->{statusfile} && -f $or->{statusfile}) ? $or->{statusfile} : undef),
+        -file => (
+            ( $or->{statusfile} && -f $or->{statusfile} )
+            ? $or->{statusfile}
+            : undef
+        ),
+
         # -default => '.', # Is this a good idea
     );
-    $or->{statusfile} ||= $or->{status}->GetFileName;
+    $or->{statusfile}           ||= $or->{status}->GetFileName;
     $or->{interactive_callback} ||= $or->{obsdata}->{interactive_callback};
 
-    bless($or, $class);
+    bless( $or, $class );
 
     $or;
@@ -92 +97 @@
 sub DESTROY {
     my ($self) = @_;
-    $self->logging(0, "Destroy ObsData::Repository for %s", ref($self));
+    $self->logging( 0, "Destroy ObsData::Repository for %s", ref($self) );
     $self->save_status;
 }
@@ -103 +108 @@
 
 sub mydir {
-    $_[0]->{dir}
+    $_[0]->{dir};
 }
 
@@ -115 +120 @@
     my ($self) = @_;
     $self->{status}->AddSection('.');
-    $self->{status}->SetSectionComment('.',
-        $ObsData::CVSID,
-        $ObsData::Repository::CVSID,
-        scalar(localtime),
-    );
+    $self->{status}
+      ->SetSectionComment( '.', $ObsData::CVSID, $ObsData::Repository::CVSID,
+        scalar(localtime), );
 
     my $hostname = `hostname`;
     chomp($hostname);
-    $self->{status}->newval('.', 'hostname', $hostname);
-    $self->{status}->SetParameterComment(
-        '.',
-        'hostname',
-        'The computer host name'
-    );
-
-    $self->{status}->newval('.', 'directory', $self->{dir});
-    $self->{status}->SetParameterComment(
-        '.',
-        'directory', 
-        'Directory where archive where located'
-    );
-    
-    $self->{status}->newval('.', 'runfrom', getcwd());
-    $self->{status}->SetParameterComment(
-        '.',
-        'runfrom',
-        'The current directory'
-    );
+    $self->{status}->newval( '.', 'hostname', $hostname );
+    $self->{status}
+      ->SetParameterComment( '.', 'hostname', 'The computer host name' );
+
+    $self->{status}->newval( '.', 'directory', $self->{dir} );
+    $self->{status}->SetParameterComment( '.', 'directory',
+        'Directory where archive where located' );
+
+    $self->{status}->newval( '.', 'runfrom', getcwd() );
+    $self->{status}
+      ->SetParameterComment( '.', 'runfrom', 'The current directory' );
 }
 
@@ -154 +148 @@
     my ($self) = @_;
     $self->{statusfile} or return;
-    if (!$self->{dry_run}) {
-        $self->logging(0,
-            "Writing status file: %s",
-            $self->{statusfile},
-        );
+    if ( !$self->{dry_run} ) {
+        $self->logging( 0, "Writing status file: %s", $self->{statusfile}, );
         $self->update_global_status;
-        $self->{status}->WriteConfig($self->{statusfile});
+        $self->{status}->WriteConfig( $self->{statusfile} );
     }
 }
@@ -172 +163 @@
 
 sub dump_status {
-    my ($self, $output) = @_;
+    my ( $self, $output ) = @_;
     $self->update_global_status;
     $self->{status}->WriteConfig($output);
@@ -203 +194 @@
 
 sub new {
-    my ($class, $infos, %param) = @_;
-
-    my $or = ObsData::Repository->new($infos, %param) or return;
-
-    bless($or, $class);
+    my ( $class, $infos, %param ) = @_;
+
+    my $or = ObsData::Repository->new( $infos, %param ) or return;
+
+    bless( $or, $class );
 }
 
@@ -220 +211 @@
     my @files;
 
-    if (!-d $self->{dir}) {
-        $self->logging(3,
-            "directory %s does not exists",
-            $self->{dir},
-        );
+    if ( !-d $self->{dir} ) {
+        $self->logging( 3, "directory %s does not exists", $self->{dir}, );
         return;
     }
 
     my $patern = $self->{patern} || '*';
-    foreach my $f (glob("$self->{dir}/$patern")) {
-
-        -f $f or next; # skip no regular files
-        $f =~ m/obsdata\.ini$/ and next; # avoid default status file
-        
+    foreach my $f ( glob("$self->{dir}/$patern") ) {
+
+        -f $f or next;    # skip no regular files
+        $f =~ m/obsdata\.ini$/ and next;    # avoid default status file
+
         my $bf = $f;
         $bf =~ s!^\Q$self->{dir}\E/*!!;
-        push(@files, $bf);
-    }
-    @files
+        push( @files, $bf );
+    }
+    @files;
 }
 
@@ -250 +238 @@
     my ($self) = @_;
 
-    grep { $_ ne '.' } $self->{status}->Sections
+    grep { $_ ne '.' } $self->{status}->Sections;
 }
 
@@ -261 +249 @@
 sub process {
     my ($self) = @_;
-    $self->logging(0, "%s() start for %s", (caller(0))[3], $self->{dir});
-
-    foreach my $file ($self->findfile) {
-        my $orda = ObsData::Repository::dir::archive->new(
-            $self,
-            archivefile => $file,
-        );
-
-        my $oe = ObsData::Event->new('do_archive', "Should I parse $file");
-        
-        $oe->add_test('archive_exists',
-            $self->{status}->SectionExists($orda->{archivefile}) ?
-            ("Archive file found in index", 1) :
-            ("Archive file not found in index", 0)
-        );
-        
-        if (defined(my $oldsize = $orda->getvalue('size'))) {
-            my $size = (stat("$orda->{dir}/$orda->{archivefile}"))[7];
-            
-            $oe->add_test('archive_size',
-                ($size <=> $oldsize) == 0 ?
-                (sprintf("size does not differ (%d)", $size), 1) :
-                (sprintf("differ %d => %d", $oldsize, $size), 0)
-            );
-        }
-
-        if (defined(my $oldmtime = $orda->getvalue('mtime'))) {
-            my $mtime = (stat("$orda->{dir}/$orda->{archivefile}"))[9];
-            $oe->add_test('archive_mtime',
-                ($mtime <=> $oldmtime) == 0 ?
-                (sprintf("mtime does not differ (%d)", $mtime), 1) :
-                (sprintf("differ %d => %d", $oldmtime, $mtime), 0)
-            );
-        }
-        
+    $self->logging( 0, "%s() start for %s", ( caller(0) )[3], $self->{dir} );
+
+    foreach my $file ( $self->findfile ) {
+        my $orda =
+          ObsData::Repository::dir::archive->new( $self, archivefile => $file,
+          );
+
+        my $oe = ObsData::Event->new( 'do_archive', "Should I parse $file" );
+
+        $oe->add_test( 'archive_exists',
+            $self->{status}->SectionExists( $orda->{archivefile} )
+            ? ( "Archive file found in index", 1 )
+            : ( "Archive file not found in index", 0 ) );
+
+        if ( defined( my $oldsize = $orda->getvalue('size') ) ) {
+            my $size = ( stat("$orda->{dir}/$orda->{archivefile}") )[7];
+
+            $oe->add_test( 'archive_size',
+                  ( $size <=> $oldsize ) == 0
+                ? ( sprintf( "size does not differ (%d)", $size ), 1 )
+                : ( sprintf( "differ %d => %d", $oldsize, $size ), 0 ) );
+        }
+
+        if ( defined( my $oldmtime = $orda->getvalue('mtime') ) ) {
+            my $mtime = ( stat("$orda->{dir}/$orda->{archivefile}") )[9];
+            $oe->add_test( 'archive_mtime',
+                  ( $mtime <=> $oldmtime ) == 0
+                ? ( sprintf( "mtime does not differ (%d)", $mtime ), 1 )
+                : ( sprintf( "differ %d => %d", $oldmtime, $mtime ), 0 ) );
+        }
+
         $orda->ask_user($oe) or next;
-        
+
         $orda->process;
     }
@@ -304 +288 @@
 sub get_archives_from_status {
     my ($self) = @_;
-    map {
-        ObsData::Repository::dir::archive->new(
-            $self,
-            archivefile => $_,
-        ) 
-    } $self->list_archive_from_status();
+    map { ObsData::Repository::dir::archive->new( $self, archivefile => $_, ) }
+      $self->list_archive_from_status();
 }
 
@@ -337 +317 @@
 
 sub new {
-    my ($class, $infos, %param) = @_;
-
-    my $or = ObsData::Repository->new($infos, %param) or return;
+    my ( $class, $infos, %param ) = @_;
+
+    my $or = ObsData::Repository->new( $infos, %param ) or return;
+
     # dir directory to parse
     $or->{archivefile} or die "No archivefile given";
@@ -345 +326 @@
     # $or->{interactive_callback}
     $or->{_cache_checks} = {};
-    
-    $or->logging(0,
-        "Preparing to parse %s/%s",
-         $or->{dir},
-         $or->{archivefile}
-    );
-
-    bless($or, $class);
+
+    $or->logging( 0, "Preparing to parse %s/%s",
+        $or->{dir}, $or->{archivefile} );
+
+    bless( $or, $class );
 }
 
 sub DESTROY {
     my ($self) = @_;
-    $self->logging(0, "Destroy ObsData::Repository for %s", ref($self));
-    if ($self->{status_changed}) {
-        $self->save_status
+    $self->logging( 0, "Destroy ObsData::Repository for %s", ref($self) );
+    if ( $self->{status_changed} ) {
+        $self->save_status;
     }
 }
@@ -370 +348 @@
 
 sub archivefile {
-    $_[0]->{archivefile}
+    $_[0]->{archivefile};
 }
 
@@ -381 +359 @@
 sub load_archive {
     my ($self) = @_;
-    if ($self->{Oarchive}) {
+    if ( $self->{Oarchive} ) {
         return 1;
-    } else {
-        $self->{Oarchive} = ObsData::Archive->new("$self->{dir}/$self->{archivefile}");
-        if ($self->{Oarchive}) {
-            $self->logging(0,
-                "Archive %s/%s properly load",
-                $self->{dir}, $self->{archivefile}
-            );
+    }
+    else {
+        $self->{Oarchive} =
+          ObsData::Archive->new("$self->{dir}/$self->{archivefile}");
+        if ( $self->{Oarchive} ) {
+            $self->logging( 0, "Archive %s/%s properly load",
+                $self->{dir}, $self->{archivefile} );
             return 1;
-        } else {
-            $self->logging(4, 
-                "Can't handle archive %s/%s: %s, skipping",
-                $self->{dir}, $self->{archivefile},
-                ObsData::Archive->error
-            );
+        }
+        else {
+            $self->logging( 4, "Can't handle archive %s/%s: %s, skipping",
+                $self->{dir}, $self->{archivefile}, ObsData::Archive->error );
             return 0;
         }
@@ -411 +387 @@
 sub archive {
     my ($self) = @_;
-    if ($self->load_archive()) {
+    if ( $self->load_archive() ) {
         return $self->{Oarchive};
-    } else {
+    }
+    else {
         return undef;
     }
@@ -425 +402 @@
 
 sub getvalue {
-    my ($self, $var, $default) = @_;
-    return $self->{status}->val($self->{archivefile}, $var, $default);
+    my ( $self, $var, $default ) = @_;
+    return $self->{status}->val( $self->{archivefile}, $var, $default );
 }
 
@@ -436 +413 @@
 
 sub setvalue {
-    my ($self, $var, $val, $comment) = @_;
-    if (!$self->{status}->SectionExists($self->{archivefile})) {
-        $self->{status}->AddSection($self->{archivefile});
-    }
-    $self->{status}->newval($self->{archivefile}, $var, $val) if(defined($val));
-    $self->{status}->SetParameterComment(
-        $self->{archivefile}, $var, $comment
-    ) if(defined($comment));
+    my ( $self, $var, $val, $comment ) = @_;
+    if ( !$self->{status}->SectionExists( $self->{archivefile} ) ) {
+        $self->{status}->AddSection( $self->{archivefile} );
+    }
+    $self->{status}->newval( $self->{archivefile}, $var, $val )
+      if ( defined($val) );
+    $self->{status}->SetParameterComment( $self->{archivefile}, $var, $comment )
+      if ( defined($comment) );
     $self->{status_changed} = 1;
 }
@@ -454 +431 @@
 
 sub get_data_value {
-    my ($self, $datafile, $var, $default) = @_;
-    return $self->getvalue(
-        sprintf('data_%s_%s', $var, $datafile),
-        $default
-    );
+    my ( $self, $datafile, $var, $default ) = @_;
+    return $self->getvalue( sprintf( 'data_%s_%s', $var, $datafile ),
+        $default );
 }
 
@@ -468 +443 @@
 
 sub set_data_value {
-    my ($self, $datafile, $var, $val, $comment) = @_;
-    $self->setvalue(
-        sprintf('data_%s_%s', $var, $datafile),
-        $val,
-        $comment
-    );
+    my ( $self, $datafile, $var, $val, $comment ) = @_;
+    $self->setvalue( sprintf( 'data_%s_%s', $var, $datafile ), $val, $comment );
 }
 
@@ -488 +459 @@
 
 sub default_choice {
-    my ($self, $oevent) = @_;
-
-    for ($oevent->id) {
+    my ( $self, $oevent ) = @_;
+
+    for ( $oevent->id ) {
         /^do_archive$/ and do {
-            return($oevent->test_result('archive_exists') ? 0 : 1);
+            return ( $oevent->test_result('archive_exists') ? 0 : 1 );
             last;
         };
         /^do_data$/ and do {
-            return 1; # TODO
+            return 1;    # TODO
             last;
         };
         /^overwrite$/ and do {
-            return($oevent->test_result('dest_exists') ? 0 : 1);
+            return ( $oevent->test_result('dest_exists') ? 0 : 1 );
             last;
         };
@@ -514 +485 @@
 
 sub ask_user {
-    my ($self, $oevent) = @_;
-
-    $self->logging(0, "Event(%s): %s",
-        $oevent->id,
-        $oevent->message);
-    foreach ($oevent->list_test) {
-        $self->logging(0, "  (%s) %s: %s",
+    my ( $self, $oevent ) = @_;
+
+    $self->logging( 0, "Event(%s): %s", $oevent->id, $oevent->message );
+    foreach ( $oevent->list_test ) {
+        $self->logging(
+            0, "  (%s) %s: %s",
             $_,
             $oevent->test_message($_),
@@ -528 +498 @@
 
     my $res =
-        $self->{interactive_callback} ?
-        $self->{interactive_callback}->($self, $oevent) :
-        $self->default_choice($oevent);
-
-    $self->logging(0, "Event(%s): Result: %s", $oevent->id, $res);
-    return($res);
+        $self->{interactive_callback}
+      ? $self->{interactive_callback}->( $self, $oevent )
+      : $self->default_choice($oevent);
+
+    $self->logging( 0, "Event(%s): Result: %s", $oevent->id, $res );
+    return ($res);
 }
 
@@ -544 +514 @@
 sub list_archive {
     my ($self) = @_;
-    if (my $archive = $self->archive) {
+    if ( my $archive = $self->archive ) {
         return $archive->ls();
-    } else {
+    }
+    else {
         return undef;
     }
@@ -560 +531 @@
     my ($self) = @_;
     my @filestats = stat("$self->{dir}/$self->{archivefile}");
-    
-    $self->setvalue('mtime', $filestats[9]);
-    $self->setvalue('size', $filestats[7]);
-    $self->setvalue('configtime', $self->{obsdata}->config_mtime);
+
+    $self->setvalue( 'mtime',      $filestats[9] );
+    $self->setvalue( 'size',       $filestats[7] );
+    $self->setvalue( 'configtime', $self->{obsdata}->config_mtime );
 }
 
@@ -575 +546 @@
 
 sub match_data_type {
-    my ($self, $datafile) =  @_;
-    foreach my $datatype (($self->{datatype}) || $self->{obsdata}->list_datatype) {
-        my $regexp = $self->{obsdata}->getvalue($datatype, 'match') or next;
+    my ( $self, $datafile ) = @_;
+    foreach
+      my $datatype ( ( $self->{datatype} ) || $self->{obsdata}->list_datatype )
+    {
+        my $regexp = $self->{obsdata}->getvalue( $datatype, 'match' ) or next;
         my @data = $datafile =~ /$regexp/;
         my @dataar = $self->archive_match($datatype);
-        my ($pret, %parg) = $self->get_info_from_plugin($datatype, $datafile);
+        my ( $pret, %parg ) =
+          $self->get_info_from_plugin( $datatype, $datafile );
+
         # if no regexp => return undef
         # if regexp and match, @dataar contain something
-        # if regexp no match, @dataar is empty 
-        if (@data && (@dataar || !defined($dataar[0])) && (!defined($pret) || $pret)) {
-            return ($datatype, \@data, \@dataar, \%parg);
+        # if regexp no match, @dataar is empty
+        if (   @data
+            && ( @dataar         || !defined( $dataar[0] ) )
+            && ( !defined($pret) || $pret ) )
+        {
+            return ( $datatype, \@data, \@dataar, \%parg );
         }
     }
@@ -597 +575 @@
 
 sub archive_match {
-    my ($self, $datatype) = @_;
-    my $regexp = $self->{obsdata}->getvalue($datatype, 'match_archive') or return undef;
+    my ( $self, $datatype ) = @_;
+    my $regexp = $self->{obsdata}->getvalue( $datatype, 'match_archive' )
+      or return undef;
     my @data = $self->{archivefile} =~ /$regexp/;
     return @data;
@@ -613 +592 @@
 
 sub get_info_from_plugin {
-    my ($self, $datatype, $datafile) = @_;
-    
+    my ( $self, $datatype, $datafile ) = @_;
+
     my %val;
-    
-    my ($sub, @args) = $self->{obsdata}->get_sub_plugin(
-        $datatype,
-        'match_plugin'
-    );
+
+    my ( $sub, @args ) =
+      $self->{obsdata}->get_sub_plugin( $datatype, 'match_plugin' );
     if ($sub) {
-        $self->logging(0,
-            "Found plugin %s for %s, running it",
-            'match_plugin',
-            $datatype,
-        );
-        my ($exitstatus, @result) = $sub->(
-            $self,
-            'match_plugin',
-            $datafile,
-            $datatype,
-            @args,
-        );
+        $self->logging( 0, "Found plugin %s for %s, running it",
+            'match_plugin', $datatype, );
+        my ( $exitstatus, @result ) =
+          $sub->( $self, 'match_plugin', $datafile, $datatype, @args, );
         if ($exitstatus) {
-            if (@result % 2 == 0) {
-                $self->logging(0,
-                    "Plugin %s for %s exit with %s (%d values)",
-                    'match_plugin',
-                    $datatype,
-                    $exitstatus,
-                    scalar(@result),
-                );
-                return(1, @result);
-            } else {
-                $self->logging(4,
-                    "Plugin %s for %s return impair values %d",
-                    $datatype,
-                    $exitstatus,
-                    scalar(@result),
-                );
+            if ( @result % 2 == 0 ) {
+                $self->logging( 0, "Plugin %s for %s exit with %s (%d values)",
+                    'match_plugin', $datatype, $exitstatus, scalar(@result), );
+                return ( 1, @result );
+            }
+            else {
+                $self->logging( 4, "Plugin %s for %s return impair values %d",
+                    $datatype, $exitstatus, scalar(@result), );
                 return undef;
             }
-        } else {
-            $self->logging(0,
-                "Plugin %s of %s exit with null, skipping",
-                'match_plugin',
-                $datatype,
-            );
+        }
+        else {
+            $self->logging( 0, "Plugin %s of %s exit with null, skipping",
+                'match_plugin', $datatype, );
             return 0;
         }
-    } else {
+    }
+    else {
         return undef;
     }
@@ -678 +638 @@
 
 sub build_dest_filename {
-    my ($self, $datafile) = @_;
-    my ($datatype, $data, $dataar, $parg) = $self->match_data_type($datafile);
-    
-    if (! $datatype) {
+    my ( $self, $datafile ) = @_;
+    my ( $datatype, $data, $dataar, $parg ) = $self->match_data_type($datafile);
+
+    if ( !$datatype ) {
         return;
     }
 
-    my %val = %{$parg || {}};
-
-    my $dest = $self->{obsdata}->getvalue($datatype, 'dest');
-    my @matcharg = split(/\s+/, $self->{obsdata}->getvalue($datatype, 'matcharg') || '');
-    my @matcharg_ar = split(/\s+/, $self->{obsdata}->getvalue($datatype, 'matcharg_archive') || '');
-    my @destarg = split(/\s+/, $self->{obsdata}->getvalue($datatype, 'destarg') || '');
+    my %val = %{ $parg || {} };
+
+    my $dest = $self->{obsdata}->getvalue( $datatype, 'dest' );
+    my @matcharg =
+      split( /\s+/, $self->{obsdata}->getvalue( $datatype, 'matcharg' ) || '' );
+    my @matcharg_ar =
+      split( /\s+/,
+        $self->{obsdata}->getvalue( $datatype, 'matcharg_archive' ) || '' );
+    my @destarg =
+      split( /\s+/, $self->{obsdata}->getvalue( $datatype, 'destarg' ) || '' );
     my @gmtime = gmtime;
 
@@ -699 +663 @@
         $val{$_} = shift(@$dataar);
     }
+
     # FIXME Is this need ?
     # foreach (keys %{$magic_words || {}}) {
     #    $val{'$' . $_} = $magic_words->{$_};
     #}
-    
-    $val{'$datafile'} = $datafile;
+
+    $val{'$datafile'}    = $datafile;
     $val{'$archivefile'} = $self->{archivefile};
-    ($val{'$basedatafile'}) = $datafile =~ m:([^/]*)$:;
-    my $destfile = sprintf(
-        $dest,
-        map { m/^%/ ? strftime($_, @gmtime) : $val{$_} || '' } grep { defined($_) } @destarg,
+    ( $val{'$basedatafile'} ) = $datafile =~ m:([^/]*)$:;
+    my $destfile = sprintf( $dest,
+        map { m/^%/ ? strftime( $_, @gmtime ) : $val{$_} || '' }
+          grep { defined($_) } @destarg,
     );
-    if (!$destfile) {
-        $self->logging(4, "Can evaluate destination file from %s, %s",
+    if ( !$destfile ) {
+        $self->logging(
+            4,
+            "Can evaluate destination file from %s, %s",
             $dest,
-            join(", ", map { m/^%/ ? strftime($_, @gmtime) : $val{$_} } @destarg)
+            join( ", ",
+                map { m/^%/ ? strftime( $_, @gmtime ) : $val{$_} } @destarg )
         );
-        return();
-    }
-    return($datatype, $destfile);
+        return ();
+    }
+    return ( $datatype, $destfile );
 }
 
@@ -730 +698 @@
 
 sub get_data_dest {
-    my ($self, $datafile) = @_;
-
-    my ($t, $d) = $self->build_dest_filename(
-        $datafile,
-        $self->{datatype}
-    );
-    $self->logging(0, "%s/%s file, datatype %s, destination %s",
-        $self->{archivefile},
-        $datafile,
+    my ( $self, $datafile ) = @_;
+
+    my ( $t, $d ) = $self->build_dest_filename( $datafile, $self->{datatype} );
+    $self->logging(
+        0, "%s/%s file, datatype %s, destination %s",
+        $self->{archivefile}, $datafile,
         $t || '(none)',
         $d || '(none)',
     );
     if ($t) {
-        $self->set_data_value($datafile, 'type', $t);
-    }
-    return($t, $d);
+        $self->set_data_value( $datafile, 'type', $t );
+    }
+    return ( $t, $d );
 }
 
@@ -762 +727 @@
 
 sub extract_data {
+
     # $datatype, informationnal only here
-    my ($self, $datafile, $datatype, $destfile) = @_;
+    my ( $self, $datafile, $datatype, $destfile ) = @_;
     $self->load_archive or return 0;
     my $ltime = time;
@@ -771 +737 @@
         'processtime',
         $ltime,
-        scalar(localtime($ltime)) .
-        ", $ObsData::VERSION: $ObsData::CVSREV, $ObsData::Repository::CVSREV",
+        scalar( localtime($ltime) )
+          . ", $ObsData::VERSION: $ObsData::CVSREV, $ObsData::Repository::CVSREV",
     );
-    $self->set_data_value(
-        $datafile,
-        'processversion',
-        $ObsData::VERSION,
-    );
-   
-    if (!$destfile) {
-        $self->logging(3,
-            "%s/%s has no destination",
-            $self->{archivefile}, $datafile,
-        );
-        $self->{obsdata}->processed(
-            $self->{obs},
-            $self->{archivefile},
-            $datafile,
-        );
+    $self->set_data_value( $datafile, 'processversion', $ObsData::VERSION, );
+
+    if ( !$destfile ) {
+        $self->logging( 3, "%s/%s has no destination",
+            $self->{archivefile}, $datafile, );
+        $self->{obsdata}
+          ->processed( $self->{obs}, $self->{archivefile}, $datafile, );
         return 0;
     }
-   
-    my $oe = ObsData::Event->new('overwrite',
-        "Should I overwrite $destfile"
-    );
-
-    $oe->add_test(
-        'dest_exists',
-        -e $destfile ? ("$destfile exists", 1) : ("$destfile don't exists", 0)
-    );
+
+    my $oe = ObsData::Event->new( 'overwrite', "Should I overwrite $destfile" );
+
+    $oe->add_test( 'dest_exists',
+        -e $destfile
+        ? ( "$destfile exists", 1 )
+        : ( "$destfile don't exists", 0 ) );
     $self->ask_user($oe) or return 0;
-    
-    $self->logging(0,
-        "Trying to extract %s from %s/%s",
-        $destfile,
-        $self->{archivefile}, $datafile
-    );
-
-    my ($dirname) = $destfile =~ m!(?:(.*)/)?(.*)$!; #! vim syntax sux
-    
-    if ($dirname && ! -d $dirname) {
-        $self->logging(1, "Creating directory %s", $dirname);
-        if ($self->{dry_run}) {
-            $self->logging(1,
-                "Testing mode, assume %s was correctly created",
-                $dirname
-            );
-        } else {
+
+    $self->logging( 0, "Trying to extract %s from %s/%s",
+        $destfile, $self->{archivefile}, $datafile );
+
+    my ($dirname) = $destfile =~ m!(?:(.*)/)?(.*)$!;    #! vim syntax sux
+
+    if ( $dirname && !-d $dirname ) {
+        $self->logging( 1, "Creating directory %s", $dirname );
+        if ( $self->{dry_run} ) {
+            $self->logging( 1, "Testing mode, assume %s was correctly created",
+                $dirname );
+        }
+        else {
             eval { File::Path::mkpath($dirname) };
-            if($@) {
-                $self->logging(
-                    4, "Can't create directory %s: %s", 
-                    $dirname,
-                    $@
-                );
+            if ($@) {
+                $self->logging( 4, "Can't create directory %s: %s",
+                    $dirname, $@ );
                 return 0;
             }
@@ -831 +779 @@
     }
 
-    if ($self->{dry_run}) {
-        $self->logging(2,
-            "Testing mode, %s/%s would be extracted as %s",
-            $self->{archivefile},
-            $datafile,
-            $destfile,
-        );
-    } else {
-        if ($self->{Oarchive}->extract($datafile, $destfile)) {
-            $self->set_data_value($datafile, 'dest', $destfile);
-            $self->{obsdata}->processed(
-                $self->{obs},
-                $self->{archivefile},
-                $datafile,
-                $datatype,
-                $destfile,
-            );
-        } else {
+    if ( $self->{dry_run} ) {
+        $self->logging( 2, "Testing mode, %s/%s would be extracted as %s",
+            $self->{archivefile}, $datafile, $destfile, );
+    }
+    else {
+        if ( $self->{Oarchive}->extract( $datafile, $destfile ) ) {
+            $self->set_data_value( $datafile, 'dest', $destfile );
+            $self->{obsdata}
+              ->processed( $self->{obs}, $self->{archivefile}, $datafile,
+                $datatype, $destfile, );
+        }
+        else {
             $self->logging(
                 4, "Can't extract %s/%s to %s: %s",
@@ -857 +799 @@
         }
     }
-    
+
     return 1;
 }
@@ -870 +812 @@
     my ($self) = @_;
 
-    foreach my $data ($self->list_archive) {
-        my $oe = ObsData::Event->new('do_data',
-            "Should I extract $data from $self->{archivefile}"
-        );
-        $oe->add_test('data_extracted',
-            $self->get_data_value($data, 'dest') ?
-            ('Data was already extract', 1) :
-            ('Data was not already extract', 0)
-        );
-  
+    foreach my $data ( $self->list_archive ) {
+        my $oe =
+          ObsData::Event->new( 'do_data',
+            "Should I extract $data from $self->{archivefile}" );
+        $oe->add_test( 'data_extracted',
+            $self->get_data_value( $data, 'dest' )
+            ? ( 'Data was already extract', 1 )
+            : ( 'Data was not already extract', 0 ) );
+
         $self->ask_user($oe) or next;
 
-        $self->extract_data($data, $self->get_data_dest($data));
-    }
-    
+        $self->extract_data( $data, $self->get_data_dest($data) );
+    }
+
     $self->update_status;
 
@@ -892 +833 @@
 sub list_data_from_status {
     my ($self) = @_;
-    map { m/data_processtime_(.*)/; $1 } grep {
-        $_ && index($_, 'data_processtime_') == 0
-    } $self->{status}->Parameters($self->{archivefile})
+    map { m/data_processtime_(.*)/; $1 }
+      grep { $_ && index( $_, 'data_processtime_' ) == 0 }
+      $self->{status}->Parameters( $self->{archivefile} );
 }
 
 sub data_extracted {
-    my ($self, $data) = @_;
-    return $self->get_data_value($data, 'dest');
+    my ( $self, $data ) = @_;
+    return $self->get_data_value( $data, 'dest' );
 }