mark failed backups deleted (should they actually be deleted from backups table?)

[BackupPC.git] / bin / BackupPC_burnArchiveCLI

diff --git a/bin/BackupPC_burnArchiveCLI b/bin/BackupPC_burnArchiveCLI
index ab5a29f..cd54e42 100755 (executable)
--- a/bin/BackupPC_burnArchiveCLI
+++ b/bin/BackupPC_burnArchiveCLI
@@ -15,6 +15,8 @@ use File::Path;
 use Data::Dumper;
 
 my $debug = 0;
+# set this to 1 to prompt for DVD removal for each selected item.
+my $prompt_for_delete = shift @ARGV;
 $|=1;
 
 # don't check for user
@@ -109,6 +111,8 @@ sub dumpArchive2XML($$$)
                        AND hosts.id=backups.hostid
                        AND shares.id=backups.shareid
                        AND archive_backup.archive_id = ?
+               ORDER BY
+                       hosts.name, shares.name, backups.num
        };
 
        my $sth = $dbh->prepare("SELECT dvd_nr, total_size, note, username, date,id FROM archive WHERE dvd_nr=?");
@@ -162,7 +166,7 @@ sub dumpArchive2XML($$$)
                        $writer->endTag("file");
                }
                $writer->endTag("backup");
-       }       
+       }
                         
        $writer->endTag("archive");
        $writer->end(); 
@@ -253,6 +257,39 @@ sub add_symlink($$) {
        symlink $from, $to || skip("can't symlink $from to $to: $!");
 }
 
+sub delete_dvd($) {
+       my $dvd_nr = shift || return;
+
+       print "Do you want to delete DVD #$dvd_nr now? [NO/yes]: ";
+       my $ok = <STDIN>;
+       chomp($ok);
+       if (lc($ok) eq 'yes') {
+               print "Deleting DVD #$dvd_nr from database...\n";
+
+               $dbh->begin_work;
+
+               my $sth_delete_dvd = $dbh->prepare( qq{
+                       delete from archive where dvd_nr = ?
+               } );
+               $sth_delete_dvd->execute( $dvd_nr );
+               $dbh->do( qq{
+                       select setval('dvd_nr', (select max(dvd_nr) from archive), true)
+               } );
+
+               # remove files for this DVD
+               map {
+                       print "\tremoving $_\n";
+                       unlink($_) || die "can't rm $_: $!";
+               } glob ( "/$iso_dir/$dvd_nr.*" );
+
+               $dbh->commit;
+
+               return 1;
+       } else {
+               return 0;
+       }
+}
+
 my $sth_archive_backup_parts = $dbh->prepare( qq{
        select
                archive_backup.backup_id,
@@ -275,6 +312,15 @@ my $sth_archive_backup_parts = $dbh->prepare( qq{
        order by archive_backup.backup_id, backup_parts.part_nr
 });
 
+my $sth_archive_backup_check = $dbh->prepare( qq{
+               SELECT
+                       count(backups.id)
+               FROM backups
+               JOIN archive_backup on archive_backup.backup_id = backups.id
+               JOIN archive on archive_id = archive.id
+               WHERE dvd_nr = ?
+});
+
 my $sth_archive_burned = $dbh->prepare( qq{
        insert into archive_burned
                (archive_id, iso_size, part, copy)
@@ -295,8 +341,24 @@ foreach my $arc (@archives_to_burn) {
 
        $sth_archive_backup_parts->execute($dvd_nr);
 
+       $sth_archive_backup_check->execute($dvd_nr);
+
+       my ($parts_nr, $check_nr) = ($sth_archive_backup_parts->rows, $sth_archive_backup_check->fetchrow_array);
+
+       if ($parts_nr != $check_nr) {
+               warn "ERROR: DVD #$dvd_nr is still not in consistent state. Some backup parts are ",
+                       ($parts_nr < $check_nr) ? "missing ($parts_nr < $check_nr)" : "extra ($parts_nr > $check_nr)",
+                       " you should re-create this DVD after BackupPC_incPartsUpdate finish\n";
+               next if delete_dvd( $dvd_nr );
+       }
+
        if ($sth_archive_backup_parts->rows == 0) {
                warn "ERROR: no backup parts found for $dvd_nr. You should re-create that DVD.\n";
+               next if delete_dvd( $dvd_nr );
+       }
+
+       if ($prompt_for_delete) {
+               next if delete_dvd( $dvd_nr );
        }
 
        my @volumes;
@@ -333,7 +395,7 @@ foreach my $arc (@archives_to_burn) {
                my $iso_size = 0;
                my $disk_name = $dvd_nr;
                # suffix added to multi-volume archives
-               my $volume_suffix = $dvd_nr;
+               my $volume_suffix = '';
 
                if ($volumes > 1) {
                        $volume_suffix = '_' . $volume_nr;