projects
/
BackupPC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
38abb9a
)
use Getopt::Long::Descriptive
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Thu, 27 Jan 2011 23:36:52 +0000
(
00:36
+0100)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Thu, 27 Jan 2011 23:36:52 +0000
(
00:36
+0100)
bin/BackupPC_ASA_PostArchive_Update
patch
|
blob
|
history
diff --git
a/bin/BackupPC_ASA_PostArchive_Update
b/bin/BackupPC_ASA_PostArchive_Update
index
11de07e
..
3d531ee
100755
(executable)
--- a/
bin/BackupPC_ASA_PostArchive_Update
+++ b/
bin/BackupPC_ASA_PostArchive_Update
@@
-13,8
+13,8
@@
use POSIX qw/strftime/;
use Cwd qw/abs_path/;
use Archive::Tar::Streamed;
use Algorithm::Diff;
use Cwd qw/abs_path/;
use Archive::Tar::Streamed;
use Algorithm::Diff;
-use Getopt::Std;
use File::Slurp;
use File::Slurp;
+use Getopt::Long::Descriptive;
=head1 NAME
=head1 NAME
@@
-22,43
+22,28
@@
BackupPC_ASA_PostArchive_Update
=head1 DESCRIPTION
=head1 DESCRIPTION
- # /etc/BackupPC/pc/
dvd_tar
.pl
+ # /etc/BackupPC/pc/
_search_archive
.pl
=cut
=cut
-# FIXME
-my $debug = $ENV{DEBUG} || 1;
-my $check = $ENV{CHECK} || 1;
-
my $bpc = BackupPC::Lib->new || die "can't create BackupPC::Lib";
my $bpc = BackupPC::Lib->new || die "can't create BackupPC::Lib";
+$bpc->ConfigRead('_search_archive'); # read our configuration
my %Conf = $bpc->Conf();
my %Conf = $bpc->Conf();
-warn "## ARGV=",dump @ARGV;
-
-
-my $args;
-my $name;
-foreach ( @ARGV ) {
- my $v = $_;
- if ( m/(\w+)=(.+)/ ) {
- $name = $1;
- $v = $2;
- }
- if ( $name =~ m/List/ ) {
- push @{ $args->{$name} }, $v;
- } else {
- $args->{$name} = $v;
- }
-}
-
-warn "args = ",dump($args);
-
use BackupPC::Search;
%BackupPC::Search::Conf = %Conf;
use BackupPC::Search;
%BackupPC::Search::Conf = %Conf;
-my $path = abs_path($0);
-$path =~ s{/[^/]+$}{/}; # FIXME remove?
+my ($opt,$usage) = describe_options(
+"%c %o",
+[ 'host|h=s@', "import just host(s)" ],
+[ 'num|n=s@', "import just backup number(s)" ],
+[ 'check|c', "check archives on disk and sync", { default => 1 } ],
+[ 'debug|d', "debug", { default => 1 } ],
+[ 'help', "show help" ],
+);
+
+print($usage->text), exit if $opt->help;
$|=1;
$|=1;
@@
-107,7
+92,7
@@
sub get_backup_id($$) {
$hsn_cache->{"$host $num"} = $id;
$hsn_cache->{"$host $num"} = $id;
- print STDERR "# $host $num == $id\n" if $debug;
+ print STDERR "# $host $num == $id\n" if $
opt->
debug;
return $id;
}
return $id;
}
@@
-137,15
+122,18
@@
my $sth_inc_size = $dbh->prepare(qq{
sub check_archive {
my ($host,$num) = @_;
sub check_archive {
my ($host,$num) = @_;
+ warn "# check_archive $host $num";
my $t = time();
my $t = time();
- my @tar_parts =
- sort map { s/^\Q$Conf{ArchiveDest}\E\/*//; $_ }
- glob "$Conf{ArchiveDest}/$host.$num.*"
- ;
+ my $glob = "$Conf{ArchiveDest}/$host.$num.*";
+
+ my @tar_parts = sort map { s/^\Q$Conf{ArchiveDest}\E\/*//; $_ } glob $glob ;
- return unless @tar_parts;
+ if ( ! @tar_parts ) {
+ warn "ERROR: no files for $glob";
+ return;
+ }
print curr_time, " check $host $num";
print curr_time, " check $host $num";
@@
-155,7
+143,7
@@
sub check_archive {
if ( ! -e $md5_path ) {
system_ok "cd $Conf{ArchiveDest} && /usr/bin/md5sum $host.$num.* > $md5_path";
} else {
if ( ! -e $md5_path ) {
system_ok "cd $Conf{ArchiveDest} && /usr/bin/md5sum $host.$num.* > $md5_path";
} else {
- system_ok "cd $Conf{ArchiveDest} && /usr/bin/md5sum -c $md5_path" if $check;
+ system_ok "cd $Conf{ArchiveDest} && /usr/bin/md5sum -c $md5_path" if $
opt->
check;
}
my $md5sum;
}
my $md5sum;
@@
-232,13
+220,13
@@
sub check_archive {
$dbh->commit;
}
$dbh->commit;
}
- print " [parts: ",join(", ", @tar_parts),"]" if $debug;
+ print " [parts: ",join(", ", @tar_parts),"]" if $
opt->
debug;
my @tar_files;
my $backup_part;
my @tar_files;
my $backup_part;
- print " reading" if $debug;
+ print " reading" if $
opt->
debug;
my $part_nr = 0;
my $inc_size = 0;
my $part_nr = 0;
my $inc_size = 0;
@@
-371,16
+359,16
@@
sub check_archive {
#----- main
#----- main
-foreach ( 0 .. $#{ $
args->{HostList}
} ) {
+foreach ( 0 .. $#{ $
opt->host
} ) {
- my $host = $
args->{'HostList'}
->[$_];
- my $num = $
args->{'BackupList'}
->[$_];
+ my $host = $
opt->host
->[$_];
+ my $num = $
opt->num
->[$_];
check_archive $host => $num;
}
check_archive $host => $num;
}
-exit;
+exit;
# FIXME
my $sth = $dbh->prepare( qq{
my $sth = $dbh->prepare( qq{
@@
-417,10
+405,10
@@
while (my $row = $sth->fetchrow_hashref) {
# this will return -1 if file doesn't exist
my $size = BackupPC::Search::get_tgz_size_by_name($tar_file);
# this will return -1 if file doesn't exist
my $size = BackupPC::Search::get_tgz_size_by_name($tar_file);
- print "# host: ".$row->{host}.", share: ".$row->{'share'}.", backup_num:".$row->{num}." size: $size backup.size: ", $row->{inc_size},"\n" if $debug;
+ print "# host: ".$row->{host}.", share: ".$row->{'share'}.", backup_num:".$row->{num}." size: $size backup.size: ", $row->{inc_size},"\n" if $
opt->
debug;
if ( $row->{'inc_size'} != -1 && $size != -1 && $row->{'inc_size'} >= $size && $row->{parts} == $row->{backup_parts}) {
if ( $row->{'inc_size'} != -1 && $size != -1 && $row->{'inc_size'} >= $size && $row->{parts} == $row->{backup_parts}) {
- if ($check) {
+ if ($
opt->
check) {
tar_check($row->{'host'}, $row->{'share'}, $row->{'num'}, $tar_file) && next;
} else {
next;
tar_check($row->{'host'}, $row->{'share'}, $row->{'num'}, $tar_file) && next;
} else {
next;
@@
-435,7
+423,7
@@
while (my $row = $sth->fetchrow_hashref) {
=for later
# re-create archive?
my $cmd = qq[ $tarIncCreate -h "$row->{host}" -s "$row->{share}" -n $row->{num} -f ];
=for later
# re-create archive?
my $cmd = qq[ $tarIncCreate -h "$row->{host}" -s "$row->{share}" -n $row->{num} -f ];
- print STDERR "## $cmd\n" if ($debug);
+ print STDERR "## $cmd\n" if ($
opt->
debug);
if (system($cmd) != 0) {
print STDERR " FAILED, marking this backup deleted";
if (system($cmd) != 0) {
print STDERR " FAILED, marking this backup deleted";