Bugfixes.

* lib/App/Glacier/Command.pm (option,check_job): New methods.
* lib/App/Glacier/Command/Get.pm: Rewrite debug messages (fixes
temporary solution in 6c6dab5d).
* lib/App/Glacier/Command/Jobs.pm: Rewrite the db->foreach sub.
* lib/App/Glacier/Command/Periodic.pm: Likewise.
* lib/App/Glacier/DB/GDBM.pm (CLONE_SKIP): New method.
* lib/App/Glacier/Job.pm: Overload the "" operator.
* lib/App/Glacier/Roster.pm (foreach): Overload method.

7 files changed, 77 insertions, 71 deletions

diff --git a/lib/App/Glacier/Command.pm b/lib/App/Glacier/Command.pm
index 7178a75..1f9a130 100644
--- a/lib/App/Glacier/Command.pm
+++ b/lib/App/Glacier/Command.pm
@@ -162,6 +162,14 @@ sub clone {
     $self
 }
 
+sub option {
+    my ($self, $opt, $val) = @_;
+    if (defined($val)) {
+        $self->{_options}{$opt} = $val;
+    }
+    return $self->{_options}{$opt};
+}
+
 sub touchdir {
     my ($self, $dir) = @_;
     unless (-d $dir) {
@@ -276,4 +284,39 @@ sub archive_cache_filename {
                                $archive_id);
 }
 
+sub check_job {
+    my ($self, $key, $descr, $vault) = @_;
+
+    $self->debug(2, "$descr->{JobId} $descr->{Action} $vault");
+    if ($descr->{StatusCode} eq 'Failed') {
+        $self->debug(1,
+                     "deleting failed $key $vault "
+                     . ($descr->{JobDescription} || $descr->{Action})
+                     . ' '
+                     . $descr->{JobId});
+        $self->jobdb()->delete($key) unless $self->dry_run;
+        return;
+    }
+
+    my $res = $self->glacier->Describe_job($vault, $descr->{JobId});
+    if ($self->glacier->lasterr) {
+        if ($self->glacier->lasterr('code') == 404) {
+            $self->debug(1,
+                         "deleting expired $key $vault "
+                         . ($descr->{JobDescription} || $descr->{Action})
+                         . ' '
+                         . $descr->{JobId});
+            App::Glacier::Job->fromdb($self, $vault, $key, $res)->delete()
+                unless $self->dry_run;
+        } else {
+            $self->error("can't describe job $descr->{JobId}: ",
+                         $self->glacier->last_error_message);
+        }
+        return;
+    } elsif (ref($res) ne 'HASH') {
+        croak "describe_job returned wrong datatype (".ref($res).") for \"$descr->{JobId}\"";
+    }
+    return $res;
+}
+
 1;
diff --git a/lib/App/Glacier/Command/Get.pm b/lib/App/Glacier/Command/Get.pm
index 0d17659..82b32c8 100644
--- a/lib/App/Glacier/Command/Get.pm
+++ b/lib/App/Glacier/Command/Get.pm
@@ -160,6 +160,8 @@ sub run {
     if ($job->is_completed) {
         my $cache_file = $job->cache_file;
         if (-f $cache_file) {
+            $self->debug(1, "$job: copying from $cache_file");
+            return if $self->dry_run;
             unless (copy($cache_file, $localname)) {
                 $self->abend(EX_FAILURE,
                              "can't copy $cache_file to $localname: $!");
@@ -193,6 +195,7 @@ use constant TWOMB => 2*MB;
 
 sub download {
     my ($self, $job, $localname) = @_;
+    
     my $archive_size = $job->get('ArchiveSizeInBytes');
     if ($archive_size < $self->cf_transfer_param(qw(download single-part-size))) {
         # simple download 
@@ -214,9 +217,7 @@ sub _open_output {
 sub _download_simple {
     my ($self, $job, $localname) = @_;
 
-    eval { # FIXME: file_name might be absent
-        $self->debug(1, "downloading", $job->file_name(1), "in single part");
-    };
+    $self->debug(1, "$job: downloading in single part");
     return if $self->dry_run;
     my $fd = $self->_open_output($localname);
     my ($res, $tree_hash) = $self->glacier->Get_job_output($job->vault,
@@ -256,8 +257,8 @@ sub _download_multipart {
     # Compute the number of parts per job
     my $job_parts = int(($total_parts + $njobs - 1) / $njobs);
 
-    $self->debug(1,
-                 "downloading", $job->file_name(1), "to $localname in chunks of $part_size bytes, in $njobs jobs, with $job_parts parts per job");
+    $self->debug(1, "$job: downloading in chunks of $part_size bytes, in $njobs jobs, with $job_parts parts per job");
+
     return if $self->dry_run;
 
     use Fcntl qw(SEEK_SET);
diff --git a/lib/App/Glacier/Command/Jobs.pm b/lib/App/Glacier/Command/Jobs.pm
index 5a5f488..7dc5d06 100644
--- a/lib/App/Glacier/Command/Jobs.pm
+++ b/lib/App/Glacier/Command/Jobs.pm
@@ -116,43 +116,18 @@ sub list {
 
     my $db = $self->jobdb();
     $db->foreach(sub {
-        my ($key, $descr) = @_;
-        my $vault = $descr->{VaultARN};
-        $vault =~ s{.*:vaults/}{};
+        my ($key, $descr, $vault) = @_;
 
         return if (@vault_names && ! grep { $_ eq $vault } @vault_names);
 
         unless ($self->{_options}{cached}) {
-            if ($descr->{StatusCode} eq 'Failed') {
-                $self->debug(1, "deleting failed $key $vault " .
-                             ($descr->{JobDescription} || $descr->{Action}) .
-                             $descr->{JobId});
-                $db->delete($key) unless $self->dry_run;
-                return;
-            }
-            
-            my $res = $self->glacier->Describe_job($vault, $descr->{JobId});
-            if ($self->glacier->lasterr) {
-                if ($self->glacier->lasterr('code') == 404) {
-                    $self->debug(1, "deleting expired $key $vault " .
-                             ($descr->{JobDescription} || $descr->{Action}) .
-                                 $descr->{JobId});
-                    App::Glacier::Job->fromdb($self, $vault, $key, $res)->delete()
-                        unless $self->dry_run;
-                    return;
-                } else {
-                    $self->error("can't describe job $descr->{JobId}: ",
-                                 $self->glacier->last_error_message);
-                }
-            } elsif (ref($res) ne 'HASH') {
-                croak "describe_job returned wrong datatype (".ref($res).") for \"$descr->{JobId}\"";
-            } else {
+            my $res = $self->check_job($key, $descr, $vault)
+                or return;
             $res = timestamp_deserialize($res);
             $self->debug(2, $res->{StatusCode});
             $db->store($key, $res) unless $self->dry_run;
             $descr = $res;
         }
-        }
         
         my $started = $self->format_date_time($descr, 'CreationDate');
             
diff --git a/lib/App/Glacier/Command/Periodic.pm b/lib/App/Glacier/Command/Periodic.pm
index 5a4dc2a..39a2d7a 100644
--- a/lib/App/Glacier/Command/Periodic.pm
+++ b/lib/App/Glacier/Command/Periodic.pm
@@ -7,6 +7,7 @@ use Carp;
 use Data::Dumper;
 use File::Basename;
 use App::Glacier::Job;
+use App::Glacier::Command::Get;
 
 =head1 NAME
 
@@ -38,39 +39,10 @@ sub run {
 
     my $db = $self->jobdb();
     $db->foreach(sub {
-        my ($key, $descr) = @_;
-        my $vault = $descr->{VaultARN};
-        $vault =~ s{.*:vaults/}{};
-
-        my $completed = $descr->{Completed};
-        
-        $self->debug(2, "$descr->{JobId} $descr->{Action} $vault");
-        if ($descr->{StatusCode} eq 'Failed') {
-            $self->debug(1,
-                         "deleting failed $key $vault "
-                         . ($descr->{JobDescription} || $descr->{Action})
-                         . ' '
-                         . $descr->{JobId});
-            $db->delete($key) unless $self->dry_run;
-        }
+        my ($key, $descr, $vault) = @_;
 
-        my $res = $self->glacier->Describe_job($vault, $descr->{JobId});
-        if ($self->glacier->lasterr) {
-            if ($self->glacier->lasterr('code') == 404) {
-                $self->debug(1,
-                             "deleting expired $key $vault "
+        my $res = $self->check_job($key, $descr, $vault);
+        if ($res && $res->{Completed} ne $descr->{Completed}) {