From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Fri, 28 Jan 2011 12:49:18 +0000 (+0100)
Subject: rename MaxArchiveSize to ArchiveMediaSize
X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=commitdiff_plain;h=9f0ea642edefd2f8b6ad9e9f4807e6ab03485da7;hp=7cc35df2d8753d1eddd17d3f377fffd6ef316c1d

rename MaxArchiveSize to ArchiveMediaSize

grep -rl MaxArchiveSize . | xargs -i sh -cv "perl -p -i -n -e 's/MaxArchiveSize/ArchiveMediaSize/' {}"
---

diff --git a/bin/BackupPC_ASA_PostArchive_Update b/bin/BackupPC_ASA_PostArchive_Update
index 3d531ee..3ffb763 100755
--- a/bin/BackupPC_ASA_PostArchive_Update
+++ b/bin/BackupPC_ASA_PostArchive_Update
@@ -242,8 +242,8 @@ sub check_archive {
 
 		my $size = (stat( $path ))[7] || die "can't stat $path: $!";
 
-		if ($size > $Conf{MaxArchiveSize}) {
-			print ", part bigger than media $size > $Conf{MaxArchiveSize}\n";
+		if ($size > $Conf{ArchiveMediaSize}) {
+			print ", part bigger than media $size > $Conf{ArchiveMediaSize}\n";
 			return 0;
 		}
 
diff --git a/bin/BackupPC_burnArchiveCLI b/bin/BackupPC_burnArchiveCLI
index 4e2086b..768aa27 100755
--- a/bin/BackupPC_burnArchiveCLI
+++ b/bin/BackupPC_burnArchiveCLI
@@ -392,7 +392,7 @@ foreach my $copy_nr ( 1 .. $copies ) {
 		my $v;	# emtpy volume
 		my $v_size = 0;
 
-		my $max_archive_size = $Conf{MaxArchiveSize} || die "no MaxArchiveSize";
+		my $max_archive_size = $Conf{ArchiveMediaSize} || die "no ArchiveMediaSize";
 		while (my $row = $sth_archive_backup_parts->fetchrow_hashref) {
 			if (($v->{size} || 0) + $row->{part_size} > $max_archive_size) {
 				push @volumes, $v;
diff --git a/conf/config.pl b/conf/config.pl
index d0b1a68..235fe0b 100644
--- a/conf/config.pl
+++ b/conf/config.pl
@@ -2313,8 +2313,8 @@ $Conf{GzipSchema} = '\\h_\\s_\\n';
 # archive media size (in bytes)
 # default: 4.2Gb for DVD
 #
-#$Conf{MaxArchiveSize} = 4200 * 1024 * 1024;
-$Conf{MaxArchiveSize} = 4404019200;
+#$Conf{ArchiveMediaSize} = 4200 * 1024 * 1024;
+$Conf{ArchiveMediaSize} = 4404019200;
 
 #
 # maximum size of one (uncompressed) file on archive medium (in bytes)
diff --git a/lib/BackupPC/CGI/BurnMedia.pm b/lib/BackupPC/CGI/BurnMedia.pm
index 7d7eff3..1dc83a1 100644
--- a/lib/BackupPC/CGI/BurnMedia.pm
+++ b/lib/BackupPC/CGI/BurnMedia.pm
@@ -66,9 +66,9 @@ EOF
 			} 
 		}
 
-		if ($total_size > ($Conf{MaxArchiveSize} * $parts)) {
+		if ($total_size > ($Conf{ArchiveMediaSize} * $parts)) {
 			$cont .= eval( q{ ${h2(Error)}});
-			$cont .= "Selected backups size " . sprintf("%1.2f", $total_size / 1024) ." Kb exceed max archive size " . sprintf("%1.2f", $Conf{MaxArchiveSize} / 1024) ." Kb.";
+			$cont .= "Selected backups size " . sprintf("%1.2f", $total_size / 1024) ." Kb exceed max archive size " . sprintf("%1.2f", $Conf{ArchiveMediaSize} / 1024) ." Kb.";
 		} elsif ($total_size == 0) {
 			$cont .= eval( q{ ${h2(Error)}});
 			$cont .= "No backups selected.";
diff --git a/lib/BackupPC/Search.pm b/lib/BackupPC/Search.pm
index a1bd9a7..c996568 100644
--- a/lib/BackupPC/Search.pm
+++ b/lib/BackupPC/Search.pm
@@ -373,7 +373,7 @@ sub getGzipSize($$)
 sub getVolumes($) {
 	my $id = shift;
 
-	my $max_archive_size = $Conf{MaxArchiveSize} || die "no MaxArchiveSize";
+	my $max_archive_size = $Conf{ArchiveMediaSize} || die "no ArchiveMediaSize";
 
 	my $sth = $dbh->prepare(qq{
 		select
@@ -449,7 +449,7 @@ print STDERR "## sort=". ($param->{'sort'} || 'no sort param') . " burn sql orde
 		$row->{'age'} = sprintf("%0.1f", ( $row->{'age'} / 86400 ) );
 		#$row->{'age'} = sprintf("%0.1f", ( (time() - $row->{'date'}) / 86400 ) );
 
-		my $max_archive_size = $Conf{MaxArchiveSize} || die "no MaxArchiveSize";
+		my $max_archive_size = $Conf{ArchiveMediaSize} || die "no ArchiveMediaSize";
 		if ($row->{size} > $max_archive_size) {
 			($row->{volumes}, $row->{inc_size_calc}) = getVolumes($row->{id});
 		}
@@ -469,7 +469,7 @@ sub displayBackupsGrid($) {
 
 	my $param = shift;
 
-	my $max_archive_size = $Conf{MaxArchiveSize} || die "no MaxArchiveSize";
+	my $max_archive_size = $Conf{ArchiveMediaSize} || die "no ArchiveMediaSize";
 	my $max_archive_file_size = $Conf{MaxArchiveFileSize}  || die "no MaxFileInSize";
 
 	my $retHTML .= q{