--- trunk/bin/BackupPC_burnArchiveCLI 2005/10/15 13:40:04 207 +++ trunk/bin/BackupPC_burnArchiveCLI 2005/12/13 22:53:30 275 @@ -1,7 +1,8 @@ #!/usr/bin/perl use strict; -use lib "__INSTALLDIR__/lib"; +#use lib "__INSTALLDIR__/lib"; +use lib "/data/backuppc-agi/lib"; use DBI; use BackupPC::Lib; @@ -10,6 +11,7 @@ use POSIX qw/strftime/; use Term::Menus; use File::Which; +use File::Path; use Data::Dumper; @@ -247,20 +249,31 @@ goto SKIP; } -my $sth_archive_backup = $dbh->prepare( qq{ +sub add_symlink($$) { + my ($from, $to) = @_; + symlink $from, $to || skip("can't symlink $from to $to: $!"); +} + +my $sth_archive_backup_parts = $dbh->prepare( qq{ select - backup_id, + archive_backup.backup_id, archive_id, hosts.name as host, shares.name as share, backups.num as num, - backups.parts as parts + backups.parts as parts, + backup_parts.part_nr as part_nr, + backup_parts.size as part_size, + backup_parts.md5 as md5, + backup_parts.items from archive_backup join archive on archive_id = archive.id - join backups on backup_id = backups.id + join backups on archive_backup.backup_id = backups.id join hosts on hostid = hosts.id join shares on shareid = shares.id + join backup_parts on archive_backup.backup_id = backup_parts.backup_id where archive.dvd_nr = ? + order by archive_backup.backup_id, backup_parts.part_nr }); my $sth_archive_burned = $dbh->prepare( qq{ @@ -281,79 +294,112 @@ print "Working on DVD #$dvd_nr in $tmp_dir\n"; - my $part_path = ''; - my $part_nr = 1; - my $parts = 0; - - $sth_archive_backup->execute($dvd_nr); - - my $disk_name = 'unknown disk'; - my $iso_size = 0; + $sth_archive_backup_parts->execute($dvd_nr); - do { + my @volumes; + my $v; # emtpy volume + my $v_size = 0; + + my $max_archive_size = $Conf{MaxArchiveSize} || die "no MaxArchiveSize"; + while (my $row = $sth_archive_backup_parts->fetchrow_hashref) { + if (($v->{size} || 0) + $row->{part_size} > $max_archive_size) { + push @volumes, $v; + $v = {}; + } + $v->{size} += $row->{part_size}; + # this part + my $p = { + filename => BackupPC::SearchLib::getGzipName($row->{'host'}, $row->{'share'}, $row->{'num'}), + }; + foreach my $fld (qw/part_nr md5/) { + $p->{$fld} = $row->{$fld} || die "missing $fld in row!"; + } + push @{ $v->{parts} }, $p; + } + push @volumes, $v if ($v); - # do we need to re-execute query for multi-part increments? - $sth_archive_backup->execute($dvd_nr) if ($parts > 1); + my $volumes = $#volumes + 1; + my $volume_nr = 1; - my $row = $sth_archive_backup->fetchrow_hashref || die "can't fetch row"; + foreach my $v (@volumes) { + print Dumper($v); - $parts = $row->{'parts'} || die "no parts?"; - $disk_name = $dvd_nr; + my $iso_size = 0; + my $disk_name = $dvd_nr; + # suffix added to multi-volume archives + my $volume_suffix = $dvd_nr; - if ($parts > 1) { - # parts start with 0, so we have -1 here - $part_path = '.' . ($part_nr - 1); - $disk_name .= '.' . $part_nr; + if ($volumes > 1) { + $volume_suffix = '_' . $volume_nr; + $disk_name .= ' ' . $volume_nr . '/' . $volumes; } - print "Processing part $part_nr/$parts\n"; + print "Processing DVD #$dvd_nr, volume $volume_nr/$volumes\n"; - my $list_file = my $iso_file = my $xml_file = "${iso_dir}/${dvd_nr}"; - $list_file .= $part_path . '.list'; - $iso_file .= $part_path . '.iso'; + my $iso_file = my $xml_file = my $stage = + "${iso_dir}/${dvd_nr}"; + + $iso_file .= $volume_suffix . '.iso'; $xml_file .= '.xml'; + $stage .= $volume_suffix . '.stage'; + + my $md5_file = "${stage}/${dvd_nr}${volume_suffix}.md5"; + # # check if ISO file exists # if (! -e $iso_file) { - open(my $list, "> $list_file") || skip "can't open $list_file: $!"; + # create stage directory + if (-e $stage) { + rmtree($stage) || die "can't remove $stage: $!"; + } + mkpath($stage); + + # open file for md5sums + open(my $md5, "> $md5_file") || skip "can't open $md5_file: $!"; - my $inc = 0; + my $parts_on_this_volume = 0; - do { - my $tar_file = BackupPC::SearchLib::getGzipName($row->{'host'}, $row->{'share'}, $row->{'num'}); - if (-f "$tar_dir/$tar_file") { - skip "can't find increment $tar_file: $!" unless (-r "$tar_dir/$tar_file"); - print $list "$tar_dir/$tar_file\n"; - } else { - my $len = length("$parts"); - my $nr = sprintf("%0${len}d", ($part_nr - 1)); - print $list "$tar_dir/$tar_file/part$nr\n"; + foreach my $p (@{ $v->{parts} }) { + my $tar_file = $p->{filename} || die "no filename in part", Dumper($p); + my $rel_path = $tar_file; + + if (-d "$tar_dir/$rel_path") { + $rel_path .= '/' . $p->{part_nr}; + mkpath("$stage/$rel_path") unless (-d "$stage/$rel_path"); } - $inc++; - } while ($row = $sth_archive_backup->fetchrow_hashref); + $rel_path .= '.tar.gz'; + + skip "can't find increment $rel_path: $!" unless (-r "$tar_dir/$rel_path"); + + add_symlink("$tar_dir/$rel_path", "$stage/$rel_path"); + + my $md5sum = $p->{md5} || die "no md5 in part ", Dumper($p); + print $md5 "$md5sum\s\s$rel_path\n" || die "can't write md5sum: $!"; + + $parts_on_this_volume++; + } # add file list and note in xml dumpArchive2XML($dbh, $dvd_nr, $xml_file) unless (-f $xml_file); - print $list "$xml_file\n"; + + add_symlink($xml_file, "$stage/${dvd_nr}.xml"); # add css file for archive my $css_file = $Conf{CgiImageDir} . '/archive.css'; if (-r $css_file) { - print $list "$css_file\n"; + add_symlink($css_file, "$stage/archive.css"); } else { print "WARNING: missing $css_file, not added to iso image!\n"; } - close($list); - - print "Running mkisofs now for $inc increments, disk $disk_name\n"; + print "Running mkisofs now for $parts_on_this_volume increments, disk $disk_name\n"; - my $cmd = $bin->{'mkisofs'} . qq{ -A BackupPC -gui -J -r -T --input-charset ISO-8859-2 -V $disk_name -o ${iso_file}.tmp -path-list $list_file }; + my $cmd = $bin->{'mkisofs'} . qq{ -A BackupPC -gui -J -r -T --input-charset ISO-8859-2 -V "$disk_name" -o ${iso_file}.tmp -f $stage }; system($cmd) == 0 or skip "can't run $cmd: $?"; @@ -363,6 +409,9 @@ print "Created $iso_file [$iso_size bytes] in ", fmt_time(time() - $t), "\n"; + # FIXME + #rmtree($stage) || warn "can't remove stage directory $stage: $!"; + } else { print "ISO $iso_file allready exists\n"; } @@ -385,13 +434,13 @@ print "\n\nPLEASE REMOVE DVD MEDIA AND LABEL IT WITH $disk_name\n\n"; - $sth_archive_burned->execute($dvd_nr, $iso_size, $part_nr, $copy_nr); + $sth_archive_burned->execute($dvd_nr, $iso_size, $volume_nr, $copy_nr); print "Media burn for $disk_name copy $copy_nr recorded\n"; } - $part_nr++; - } until ($part_nr > $parts); + $volume_nr++; + } SKIP: @@ -403,7 +452,7 @@ print "Recoding finished, exiting...\n"; $sth->finish; -$sth_archive_backup->finish; +$sth_archive_backup_parts->finish; $sth_archive_burned->finish; $dbh->disconnect;