});
});
-subcommand("show", "show", "scan all slots in the changer, starting with the current slot",
+subcommand("show", "show [<slots>]", "scan all slots (or listed slots) in the changer, starting with the current slot",
sub {
my ($finished_cb, @args) = @_;
my $last_slot;
my %seen_slots;
my $chg;
- if (@args != 0) {
+ if (@args > 1) {
return usage($finished_cb);
}
+ my $what = $args[0];
+ my @slots;
+
+ if (defined $what) {
+ my @what1 = split /,/, $what;
+ foreach my $what1 (@what1) {
+ if ($what1 =~ /^(\d*)-(\d*)$/) {
+ my $begin = $1;
+ my $end = $2;
+ $end = $begin if $begin > $end;
+ while ($begin <= $end) {
+ push @slots, $begin;
+ $begin++;
+ }
+ } else {
+ push @slots, $what1;
+ }
+ }
+ }
+
+ my $use_slots = @slots > 0;
+
$chg = load_changer($finished_cb) or return;
my $steps = define_steps
my ($err, %info) = @_;
return failure($err, $finished_cb) if $err;
- print STDERR "amtape: scanning all $info{num_slots} slots in changer:\n";
+ if ($use_slots) {
+ my $slot = shift @slots;
+ $chg->load(slot => $slot,
+ mode => "read",
+ res_cb => $steps->{'loaded'});
- $steps->{'load_current'}->();
- };
+ } else {
+ print STDERR "amtape: scanning all $info{num_slots} slots in changer:\n";
- step load_current => sub {
- $chg->load(relative_slot => 'current', mode => "read", res_cb => $steps->{'loaded'});
+ $chg->load(relative_slot => 'current',
+ mode => "read",
+ res_cb => $steps->{'loaded'});
+ }
};
step loaded => sub {
};
step released => sub {
- $chg->load(relative_slot => 'next', slot => $last_slot,
- except_slots => { %seen_slots }, res_cb => $steps->{'loaded'});
+ if ($use_slots) {
+ return $finished_cb->() if @slots == 0;
+ my $slot = shift @slots;
+ $chg->load(slot => $slot,
+ mode => "read",
+ res_cb => $steps->{'loaded'});
+
+ } else {
+ $chg->load(relative_slot => 'next',
+ slot => $last_slot,
+ except_slots => { %seen_slots },
+ res_cb => $steps->{'loaded'});
+ }
};
});
} elsif ($sl->{'device_status'} == $DEVICE_STATUS_VOLUME_UNLABELED) {
$line .= " blank";
} elsif ($sl->{'device_status'} != $DEVICE_STATUS_SUCCESS) {
- $line .= "device error";
+ if (defined $sl->{'device_error'}) {
+ $line .= " " . $sl->{'device_error'};
+ } else {
+ $line .= "device error";
+ }
} elsif ($sl->{'f_type'} != $Amanda::Header::F_TAPESTART) {
$line .= " blank";
} else {
my $result_cb = make_cb(result_cb => sub {
my ($err, $res, $label, $mode) = @_;
if ($err) {
- $taperscan->quit() if defined $taperscan;
- return failure($err, $finished_cb);
+ if ($res) {
+ $res->release(finished_cb => sub {
+ $taperscan->quit() if defined $taperscan;
+ return failure($err, $finished_cb);
+ });
+ return;
+ } else {
+ $taperscan->quit() if defined $taperscan;
+ return failure($err, $finished_cb);
+ }
}
my $modestr = ($mode == $ACCESS_APPEND)? "append" : "write";
my $slot = $res->{'this_slot'};
- print STDERR "Will $modestr to volume $label in slot $slot.\n";
+ if (defined $res->{'device'} and defined $res->{'device'}->volume_label()) {
+ print STDERR "Will $modestr to volume '$label' in slot $slot.\n";
+ } else {
+ print STDERR "Will $modestr label '$label' to new volume in slot $slot.\n";
+ }
$res->release(finished_cb => sub {
my ($err) = @_;
die "$err" if $err;
},
finished_cb => sub {
my ($err) = @_;
+ $chg->quit();
return failure($err, $finished_cb) if $err;
print STDERR "update complete\n";
- $chg->quit();
$finished_cb->();
});
});
my $config_overrides = new_config_overrides($#ARGV+1);
+debug("Arguments: " . join(' ', @ARGV));
Getopt::Long::Configure(qw(bundling));
GetOptions(
+ 'version' => \&Amanda::Util::version_opt,
'help|usage|?' => \&usage,
'o=s' => sub { add_config_override_opt($config_overrides, $_[1]); },
) or usage();