my $size = -1;
- if (-f $tgz) {
- $size = (stat($tgz))[7];
+ if (-f "${tgz}.tar.gz") {
+ $size = (stat("${tgz}.tar.gz"))[7];
} elsif (-d $tgz) {
opendir(my $dir, $tgz) || die "can't opendir $tgz: $!";
- my @parts = grep { !/^\./ && -f "$tgz/$_" } readdir($dir);
+ my @parts = grep { !/^\./ && !/md5/ && -f "$tgz/$_" } readdir($dir);
$size = 0;
foreach my $part (@parts) {
$size += (stat("$tgz/$part"))[7] || die "can't stat $tgz/$part: $!";
}
closedir $dir;
+ } else {
+ return -1;
}
return $size;
);
}
+sub getVolumes($) {
+ my $id = shift;
+
+ my $max_archive_size = $Conf{MaxArchiveSize} || die "no MaxArchiveSize";
+
+ my $sth = $dbh->prepare(qq{
+ select
+ size
+ from backup_parts
+ where backup_id = ?
+ order by part_nr asc
+ });
+
+ $sth->execute($id);
+
+ my $cumulative_size = 0;
+ my $volumes = 1;
+
+ while(my ($size) = $sth->fetchrow_array) {
+ if ($cumulative_size + $size > $max_archive_size) {
+ $volumes++;
+ $cumulative_size = $size;
+ } else {
+ $cumulative_size += $size;
+ }
+ }
+
+ return ($volumes,$cumulative_size);
+}
+
sub getBackupsNotBurned($) {
my $param = shift;
while ( my $row = $sth->fetchrow_hashref() ) {
$row->{'age'} = sprintf("%0.1f", ( $row->{'age'} / 86400 ) );
#$row->{'age'} = sprintf("%0.1f", ( (time() - $row->{'date'}) / 86400 ) );
- $row->{'size'} = sprintf("%0.2f", $row->{'size'} / 1024 / 1024);
- # do some cluster calculation (approximate) and convert to kB
- $row->{'inc_size'} = int(($row->{'inc_size'} + 1023 ) / ( 2 * 1024 ) * 2);
+ my $max_archive_size = $Conf{MaxArchiveSize} || die "no MaxArchiveSize";
+ if ($row->{size} > $max_archive_size) {
+ ($row->{volumes}, $row->{inc_size_calc}) = getVolumes($row->{id});
+ }
+
+ $row->{size} = sprintf("%0.2f", $row->{size} / 1024 / 1024);
+
+ # do some cluster calculation (approximate)
+ $row->{inc_size} = int(( ($row->{inc_size} + 1023 ) / 2 ) * 2);
+ $row->{inc_size_calc} ||= $row->{inc_size};
push @ret, $row;
}
- return @ret;
+ return @ret;
}
sub displayBackupsGrid($) {
background-color: transparent;
}
-#parts {
+#volumes {
padding: 0.4em;
display: none;
width: 100%;
$retHTML .= <<'EOF3';
function debug(msg) {
- return; // Disable debugging
+// return; // Disable debugging
if (! debug_div) debug_div = document.getElementById('debug');
function update_sum(suma, suma_disp) {
if (! suma_disp) suma_disp = suma;
- element_id('forma').elements['totalsize'].value = suma_disp;
+ suma_disp = Math.floor(suma_disp / 1024);
+ element_id('forma').elements['totalsize_kb'].value = suma_disp;
+ element_id('forma').elements['totalsize'].value = suma;
pbar_set(suma, media_size);
debug('total size: ' + suma);
}
-function sumiraj(e) {
- var suma = parseInt(element_id('forma').elements['totalsize'].value) || 0;
- var len = element_id('forma').elements.length;
- if (e) {
- var size = parseInt( element_id("fss" + e.name.substr(3)).value);
- if (e.checked) {
- suma += size;
+function update_size(name, checked, suma) {
+ var size = parseInt( element_id("fss" + name).value);
+
+ if (checked) {
+ suma += size;
+ } else {
+ suma -= size;
+ }
+
+ var volumes = parseInt( element_id("prt" + name).value);
+ debug('update_size('+name+','+checked+') suma: '+suma+' volumes: '+volumes);
+ if (volumes > 1) {
+ if (checked) {
+ element_id("volumes").innerHTML = "This will take "+volumes+" mediums!";
+ element_id("volumes").style.display = 'block';
+ suma = size;
+ update_sum(suma);
} else {
suma -= size;
+ element_id("volumes").style.display = 'none';
}
+ }
- var parts = parseInt( element_id("prt" + e.name.substr(3)).value);
- if (suma > max_file_size && suma == size && parts > 1) {
- element_id("parts").innerHTML = "This will take "+parts+" mediums!";
- element_id("parts").style.display = 'block';
- update_sum(media_size, suma);
- suma = media_size;
- return suma;
- } else {
- element_id("parts").style.display = 'none';
- }
+ return suma;
+}
+function sumiraj(e) {
+ var suma = parseInt(element_id('forma').elements['totalsize'].value) || 0;
+ var len = element_id('forma').elements.length;
+ if (e) {
+ suma = update_size(e.name.substr(3), e.checked, suma);
if (suma < 0) suma = 0;
} else {
suma = 0;
for (var i = 0; i < len; i++) {
- var e = element_id('forma').elements[i];
- if (e.name != 'all' && e.checked && e.name.substr(0,3) == 'fcb') {
- var el = element_id("fss" + e.name.substr(3));
- if (el && el.value) suma += parseInt(el.value) || 0;
+ var fel = element_id('forma').elements[i];
+ if (fel.name != 'all' && fel.checked && fel.name.substr(0,3) == 'fcb') {
+ suma = update_size(fel.name.substr(3), fel.checked, suma);
}
}
}
</script>
<div id="fixedBox">
-Size: <input type="text" name="totalsize" size="7" readonly="readonly" style="text-align:right;" value="0" /> kB
+<input type="hidden" name="totalsize"/>
+Size: <input type="text" name="totalsize_kb" size="7" readonly="readonly" style="text-align:right;" value="0" /> kB
<div id="mContainer">
<div id="gradient"> </div>
</div>
<br/>
-<div id="parts"> </div>
+<div id="volumes"> </div>
Note:
<textarea name="note" cols="10" rows="5" id="note"></textarea>
sort_header($param, 'Size/Mb', 'size', 'center') .
sort_header($param, 'gzip size/Kb', 'incsize', 'center') .
qq{
- </tr>
+ <td align="center">medias</td></tr>
};
my @color = (' bgcolor="#e0e0e0"', '');
<input type="checkbox" name="fcb' . $checkbox_key . '" value="' . $checkbox_key . '" onClick="sumiraj(this);">';
}
+ my $img_url = $Conf{CgiImageDirURL};
+
$retHTML .=
'</td>' .
'<td align="right">' . $backup->{'host'} . ':' . $backup->{'share'} . '</td>' .
'<td align="center">' . epoch_to_iso( $backup->{'date'} ) . '</td>' .
'<td align="center">' . $backup->{'age'} . '</td>' .
'<td align="right">' . $backup->{'size'} . '</td>' .
- '<td align="right">' . $backup->{'inc_size'} .
- '<input type="hidden" id="fss'.$checkbox_key .'" value="'. $backup->{'inc_size'} .'"></td>' .
- '<input type="hidden" id="prt'.$checkbox_key .'" value="'. $backup->{'parts'} .'"></td>' .
+ '<td align="right">' . sprintf("%0.1f", $backup->{'inc_size'} / 1024 ) .
+ '<input type="hidden" id="fss'.$checkbox_key .'" value="'. $backup->{'inc_size_calc'} .'"></td>' .
+ '<input type="hidden" id="prt'.$checkbox_key .'" value="'. $backup->{'volumes'} .'"></td>' .
+ '<td align="left">' . ( qq{<img src="$img_url/icon-cd.gif" alt="media">} x $backup->{volumes} ) . '</td>' .
"</tr>\n";
}
projects / BackupPC.git / blobdiff