Changeset 141

Timestamp:

12/13/05 23:26:06 (19 years ago)

Author:

thauvin

Message:

• add --dry-run

Location:

trunk/soft/ObsData

Files:

• ObsData.pm (modified) (2 diffs, 1 prop)
• ObsData/Repository.pm (modified) (2 diffs, 1 prop)
• bin/obsdata (modified) (3 diffs, 1 prop)

trunk/soft/ObsData/ObsData.pm

@@ -51 +51 @@
         logcallback => $options{logcallback},
         logfile => $options{logfile} || "obsdata.log",
+        dry_run => $options{dry_run},
     };
 
@@ -367 +368 @@
             obs => $obs,
             datatype => $datatype,
+            dry_run => $self->{dry_run}, # FIXME does this have a better place ?
             patern => $self->getvalue(
                 $obs,

trunk/soft/ObsData/ObsData/Repository.pm

@@ -132 +132 @@
     );
    
-    $self->{status}->WriteConfig($self->{statusfile});
+    $self->{status}->WriteConfig($self->{statusfile}) if(!$self->{dry_run});
 }
 
@@ -622 +622 @@
     if ($dirname && ! -d $dirname) {
         $self->logging(0, "Creating directory %s", $dirname);
-        if( ! File::Path::mkpath($dirname)) { 
-            $self->logging(
-                4, "Can't create directory %s", 
+        if ($self->{dry_run}) {
+            if( ! File::Path::mkpath($dirname)) { 
+                $self->logging(
+                    4, "Can't create directory %s", 
+                    $dirname
+                );
+                return 0;
+            }
+        } else {
+            $self->logging(0,
+                "Testing mode, assume %s was correctly created",
                 $dirname
             );
-            return 0;
-        }
-    }
-
-    if ($self->{Oarchive}->extract($datafile, $destfile)) {
-        $self->set_data_value($datafile, 'dest', $destfile);
-        $self->logging(
-            1, "Extraction of %s/%s done as %s",
+        }
+    }
+
+    if ($self->{dry_run}) {
+        $self->logging(1,
+            "Testing mode, %s/%s would be extracted as %s",
             $self->{archivefile},
             $datafile,
             $destfile,
         );
-            
     } else {
-        $self->logging(
-            4, "Can't extract %s/%s to %s: %s",
-            $self->{archivefile}, $datafile, $destfile,
-            $self->{Oarchive}->error,
-        );
-        return 0;
-    }
-
+        if ($self->{Oarchive}->extract($datafile, $destfile)) {
+            $self->set_data_value($datafile, 'dest', $destfile);
+            $self->logging(
+                1, "Extraction of %s/%s done as %s",
+                $self->{archivefile},
+                $datafile,
+                $destfile,
+            );
+        } else {
+            $self->logging(
+                4, "Can't extract %s/%s to %s: %s",
+                $self->{archivefile}, $datafile, $destfile,
+                $self->{Oarchive}->error,
+            );
+            return 0;
+        }
+    }
+    
     return 1;
 }

trunk/soft/ObsData/bin/obsdata

@@ -24 +24 @@
     'c|config=s' => \my $configfile,
     'check' => \my $check_only,
+    'dry-run' => \my $dryrun,
     'l|logfile=s' => \my $log,
     'debug' => sub { $verbose = 0 },
@@ -55 +56 @@
 Increase verbosity (this does not affect log output)
 
+=item --dry-run
+
+Does everything except write on disk, log are filled anyway
+
 =item --debug
 
@@ -71 +76 @@
     logfile => $log,
     verbose => 0,
+    dry_run => $dryrun,
     logcallback => sub {
         return if($_[0] < $verbose);