Changeset 99

Timestamp:

12/05/05 05:29:06 (19 years ago)

Author:

thauvin

Message:

• perform check separatly, add callback possibility

Location:

trunk/soft/ObsData

Files:

• ObsData/Repository.pm (modified) (10 diffs, 1 prop)
• t/OR-03.t (modified) (3 diffs, 1 prop)

trunk/soft/ObsData/ObsData/Repository.pm

@@ -12 +12 @@
 our $CVSID = q$Id$;
 our $CVSREV = (q$Revision$ =~ /^Revision: (.*) $/)[0];
-
-my %default_do_if_change = (
-    archive_new         => 1,
-    archive_time        => 0,
-    archive_size        => 0,
-    archive_configmtime => 0,
-
-    data_new            => 1,
-    data_configmtime    => 0,
-);
-
-sub default_do_if_change {
-    return %default_do_if_change;
-}
 
 =head1 METHODS
@@ -53 +39 @@
         # -default => '.', # Is this a good idea
     );
-    
+
     bless($or, $class);
 
-    $or->set_do_if_change;
     $or;
 }
@@ -84 +69 @@
 }
 
-sub set_do_if_change {
-    my ($self, %settings) = @_;
-    
-    foreach (keys %default_do_if_change) {
-        $self->{do_if_change}{$_} =
-            defined($settings{$_}) ? $settings{$_} : $default_do_if_change{$_};
-    }
-}
-
 package ObsData::Repository::dir;
 
@@ -141 +117 @@
             archivefile => $file,
         );
-        $orda->get_info;
-        if(!$orda->file_need_parse) {
+        if(!$orda->do_continue('do_archive')) {
             $self->loging(0,
                 "Archive %s/%s allready parsed, skipping",
@@ -166 +141 @@
     $or->{dir} or die "No dir given";
     $or->{archivefile} or die "No archivefile given";
+
+    # $or->{interative_callback}
+    $or->{_cache_checks} = {};
     
     $or->loging(0,
@@ -175 +153 @@
     bless($or, $class);
 }
+
+my $checks = {
+    archive_exists => sub {
+        my ($self) = @_;
+        my $res;
+        if($self->{status}->SectionExists($self->{archivefile})) {
+            $res = 1;
+        } else {
+            $res = 0;
+        }
+        return(
+            $res, 
+            $self->loging(0,
+                "%s/%s is%s new archive",
+                $self->{dir},
+                $self->{archivefile},
+                $res ? " not" : "",
+            )
+        );      
+    },
+
+    archive_size => sub {
+        my ($self) = @_;
+        my $res;
+        if (defined(my $oldsize = $self->{status}->val($self->{archivefile}, 'size')) &&
+            defined(my $size = (stat("$self->{dir}/$self->{archivefile}"))[7])) {
+            my $res = $size <=> $oldsize;
+            return $res, $self->loging(0,
+                "Size for %s/%s %s",
+                $self->{dir},
+                $self->{archivefile},
+                $res == 0 ?
+                    sprintf("does not differ (%d)", $size) :
+                    sprintf("differ %d => %d", $oldsize, $size)
+            );
+        }
+    },
+
+    archive_mtime => sub {
+        my ($self) = @_;
+        my $res;
+        if (defined(my $oldmtime = $self->{status}->val($self->{archivefile}, 'mtime')) &&
+            defined(my $mtime = (stat("$self->{dir}/$self->{archivefile}"))[9])) {
+            my $res = $mtime <=> $oldmtime;
+            return $res, $self->loging(0,
+                "Mtime for %s/%s %s",
+                $self->{dir},
+                $self->{archivefile},
+                $res == 0 ?
+                    sprintf("does not differ (%d)", $mtime) :
+                    sprintf("differ %d => %d", $oldmtime, $mtime)
+            );
+        }
+    },
+
+    dest_exists => sub {
+        my ($self, $datafile, $dest) = @_;
+        if (-e $dest) {
+            return 1, "$dest exists";
+        } else {
+            return 0, "$dest don't exists";
+        }
+    },
+};
 
 #sub DESTROY {
@@ -182 +224 @@
 #}
 
-sub get_info {
-    my ($self) = @_;
-
-    $self->{filestats} = [ stat("$self->{dir}/$self->{archivefile}") ];
-
-    if (! @{$self->{filestats}}) {
-        $self->loging(4,
-            "Cannot get info of %s",
-            "$self->{dir}/$self->{archivefile}"
-        );
-        return 0;
-    }
-
-    if ($self->{status}->SectionExists($self->{archivefile})) {
-        if (my $oldmtime = $self->{status}->val($self->{archivefile}, 'mtime')) {
-            if ($oldmtime == $self->{filestats}[9]) {
-
-            } elsif ($oldmtime > $self->{filestats}[9]) {
-                $self->loging(3, 
-                    "Wahou, %s is older than my reference: %d => %d", 
-                    $oldmtime,
-                    $self->{filestats}[9],
-                );
-            } else {
-                $self->{changes}{archive_time} = $self->loging(0, 
-                    "%s is more recent %d => %d",
-                    $self->{archivefile},
-                    $oldmtime,
-                    $self->{filestats}[9],
-                );
-            }
-        }
-
-        if (defined(my $oldsize = $self->{status}->val($self->{archivefile}, 'size'))) {
-            if ($oldsize != $self->{filestats}[7]) {
-                $self->{changes}{archive_size} = $self->loging(0, 
-                    "%s size differ %d => %d",
-                    $self->{archivefile},
-                    $oldsize,
-                    $self->{filestats}[7],
-                );
-            }
-        }
-
-        if (defined(my $oldconftime = $self->{status}->val($self->{archivefile}, 'configtime'))) {
-            if ($self->{obsdata}->config_mtime > $oldconftime) {
-                $self->{changes}{archive_configmtime} = $self->loging(0, 
-                    "%s config has changed since last processing %d => %d",
-                    $self->{archivefile},
-                    $oldconftime,
-                    $self->{obsdata}->config_mtime,
-                );
-            }
-        }
+sub do_check {
+    my ($self, $check, @args) = @_;
+    
+    if (!$checks->{$check}) {
+        die $self->loging(5,
+            "check %s does not exists, exiting now",
+            $check
+        );
+    }
+    
+    return $checks->{$check}->($self, $check, @args);
+}
+
+sub do_continue {
+    my ($self, $why, @args) = @_;
+
+    if ($self->{interative_callback}) {
+        return $self->{interative_callback}->($self, $why, @args);
     } else {
-        $self->{changes}{archive_new} =
-            $self->loging(0, "%s is new file", $self->{archivefile});
-    }
-    return 1;
-}
-
-# TODO Define return code for this function, storing result somewhere to
-# pass to child.
-sub file_need_parse {
-    my ($self) = @_;
-
-    my $need = 0;
-    foreach (keys %{$self->{changes}}) {
-        if (defined($self->{changes}{$_}) && $self->{do_if_change}{$_}) {
-            $self->loging(0, "%s => make parse need", $self->{changes}{$_});
-            $need++;
-        }
-    }
-    
-    $need
+        return $self->default_checks($why, @args);
+    }
+}
+
+sub default_checks {
+    my ($self, $why, @args) = @_;
+    
+    my ($code, $text);
+    
+    if ($why eq 'do_archive') {
+        ($code, $text) = $self->do_check('archive_size');
+        if ($code) {
+            $self->loging(3, $text);
+        }
+
+        ($code, $text) = $self->do_check('archive_mtime');
+        if ($code) {
+            $self->loging(3, $text);
+        }
+        
+        ($code, $text) = $self->do_check('archive_exists');
+        if ($code != 0) {
+            $self->loging(0, "%s => skiping", $text);
+            return 0;
+        }
+    } elsif ($why eq 'do_data') {
+    
+    } elsif ($why eq 'overwrite') {
+        if ($self->do_check('dest_exists', @args)) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+    
+    1;
 }
 
@@ -289 +311 @@
 }
 
-sub parse_archive {
-    my ($self) = @_;
-
-    $self->load_archive or return;
-
-    foreach my $datafile ($self->{Oarchive}->ls) {
-        $self->loging(0, "archive %s: content %s", $self->{archivefile}, $datafile);
-        my $data = ObsData::Repository::dir::archive::data->new(
-            $self,
-            datafile => $datafile,
-        );
-        $data->dispatch;
-    }
-    return 1;
-}
-
 sub update_status {
     my ($self) = @_;
@@ -383 +389 @@
     }
     
-    if (-e $destfile) {
+    if(!$self->do_continue('overwrite', $datafile, $destfile)) {
         $self->loging(3,
             "%s extracted from %s/%s already exists, I won't overwrite it",
@@ -436 +442 @@
 
     foreach my $data ($self->list_archive) {
-        if ($self->data_lastcheck($data)) {
+        if (!$self->do_continue('do_data', $data)) {
             $self->loging(0,
                 "%s/%s has allready processed, skipping",

trunk/soft/ObsData/t/OR-03.t

@@ -1 +1 @@
 # $Id$
 
-use Test::More tests => 10;
+use Test::More tests => 13;
 use File::Temp qw(tempdir);
 
@@ -23 +23 @@
 
 {
+    my $callbackwhy;
     my $or = ObsData::Repository::dir::archive->new(
         {
@@ -28 +29 @@
             dir => 'testdata/ohp',
             archivefile => 'ozone34.gz',
+            interative_callback => sub {
+                my ($self, $why, @args) = @_;
+                $callbackwhy = $why;
+                if ($why eq 'overwrite') {
+                    return 1;
+                } else {
+                    return $self->default_checks($why, @args);
+                }
+            },
         }
     );
     isa_ok($or, "ObsData::Repository::dir::archive");
     ok($or->load_archive, "Can load an archive");
+    ok($or->do_continue('overwrite') eq 1, "Perform do_continue");
+    ok($callbackwhy eq 'overwrite', "arg are properly passed to callback");
     ok($or->list_archive, "Can list archive content");
     ok($or->get_data_dest('ozone34'), "Can get data destination");
+    ok($or->do_check('archive_exists'), 'Can perform check');
     ok($or->extract_data('ozone34', undef, '/dev/null'), "Can extract data");
 }