r8607@llin: dpavlin | 2005-10-16 13:14:00 +0200

[BackupPC.git] / bin / BackupPC_incPartsUpdate

diff --git a/bin/BackupPC_incPartsUpdate b/bin/BackupPC_incPartsUpdate
index edf2afc..7e04e08 100755 (executable)
--- a/bin/BackupPC_incPartsUpdate
+++ b/bin/BackupPC_incPartsUpdate
@@ -11,6 +11,7 @@ use Time::HiRes qw/time/;
 use POSIX qw/strftime/;
 use BackupPC::SearchLib;
 use Cwd qw/abs_path/;
+use File::Which;
 
 my $path = abs_path($0);
 $path =~ s#/[^/]+$#/#;
@@ -18,6 +19,12 @@ my $tarIncCreate = $path .= 'BackupPC_tarIncCreate';
 
 die "can't find $tarIncCreate: $!\n" unless (-x $tarIncCreate);
 
+my $bin;
+foreach my $c (qw/gzip split/) {
+       $bin->{$c} = which($c) || die "$0 needs $c, install it\n";
+}
+
+
 my $debug = 0;
 $|=1;
 
@@ -64,7 +71,8 @@ select
        hosts.name as host,
        shares.name as share,
        backups.num as num,
-       inc_size
+       inc_size,
+       parts
 from backups
        join shares on backups.hostid = shares.hostid
                and shares.id = backups.shareid
@@ -76,7 +84,7 @@ order by backups.date
 
 $sth->execute();
 
-my $sth_inc_size = $dbh->prepare(qq{ update backups set inc_size = ? where id = ? });
+my $sth_inc_size = $dbh->prepare(qq{ update backups set inc_size = ?, parts = ? where id = ? });
 my $sth_inc_deleted = $dbh->prepare(qq{ update backups set inc_deleted = ? where id = ? });
 
 %BackupPC::SearchLib::Conf = %Conf;
@@ -93,29 +101,46 @@ while (my $row = $sth->fetchrow_hashref) {
 
        # re-create archive?
        if ($row->{'inc_size'} == -1 || $size == -1 || $row->{'inc_size'} != $size) {
-               my $cmd = qq{$tarIncCreate -h "$row->{'host'}" -s "$row->{'share'}" -n $row->{'num'} | gzip -9 > $tar_dir/$tar_file};
+               my $cmd = qq{rm -Rf $tar_dir/$tar_file && $tarIncCreate -h "$row->{'host'}" -s "$row->{'share'}" -n $row->{'num'} | $bin->{'gzip'} $Conf{GzipLevel} > ${tar_dir}/${tar_file}.tmp};
                print STDERR "## $cmd\n" if ($debug);
 
                system($cmd) == 0 or die "failed: $?";
-       
+
+               rename "${tar_dir}/${$tar_file}.tmp", "$tar_dir/$tar_file" or die "can't rename $tar_dir/$tar_file: $!";
+
                $size = (stat( "$tar_dir/$tar_file" ))[7];
        }
 
        if ($size > 45) {
 
                my $max_size = $Conf{'MaxArchiveSize'} || die "problem with MaxArchieSize parametar";
+               $max_size *= 1024;      # convert to bytes
+
+               my $parts = int( ($size + $max_size - 1) / $max_size );
+
+               if (-d "$tar_dir/$tar_file" && $parts != $row->{'parts'}) {
+                       print " join";
+
+                       my $in = my $out = "$tar_dir/$tar_file";
+                       $out .= '.tmp';
+
+                       # FIXME I should really order parts manually!
+                       system("cat $in/part* > $out && rm -Rf $in && mv $out $in") == 0 or die "can't join $in: $?";
+               }
 
                if ($size > $max_size && ! -d "$tar_dir/$tar_file") {
-                       print " split";
+                       print " split/$parts";
                        my $in = my $out = "$tar_dir/$tar_file";
                        $out .= '.tmp';
                        rename $in, $out || die "can't rename $in: $!";
                        mkdir $in || die "can't mkdir $in: $!";
-                       system("split -d -b $max_size $out $in/part") == 0 or die "can't split $out: $!";
+
+                       my $suffix_len = length("$parts");
+                       system("$bin->{'split'} -d -b $max_size -a $suffix_len $out $in/part") == 0 or die "can't split $out: $?";
                        unlink $out || die "can't unlink $out: $!";
                }
 
-               $sth_inc_size->execute($size, $row->{'backup_id'});
+               $sth_inc_size->execute($size, $parts, $row->{'backup_id'});
                $sth_inc_deleted->execute(0, $row->{'backup_id'});
 
                printf(" %1.2f MB", ($size / 1024 / 1024));