Fixed size calculation in DiskDump's updateManifest()
This commit is contained in:
parent
0b6cf80c88
commit
6d527d2e46
1 changed files with 3 additions and 3 deletions
|
|
@ -999,7 +999,7 @@ DiskDump.updateManifest = function(disk, sManifestFile, sDiskPath, sOutputFile,
|
||||||
var size = 0, sCHS = "";
|
var size = 0, sCHS = "";
|
||||||
if (disk.dataDisk) {
|
if (disk.dataDisk) {
|
||||||
sCHS = disk.dataDisk.length + ':' + disk.dataDisk[0].length + ':' + disk.dataDisk[0][0].length;
|
sCHS = disk.dataDisk.length + ':' + disk.dataDisk[0].length + ':' + disk.dataDisk[0][0].length;
|
||||||
size = disk.dataDisk.length * disk.dataDisk[0].length * disk.dataDisk[0][0].length * disk.dataDisk[0][0][0].length;
|
size = disk.dataDisk.length * disk.dataDisk[0].length * disk.dataDisk[0][0].length * (disk.dataDisk[0][0][0].length || 512);
|
||||||
}
|
}
|
||||||
var sXMLDisk = '\t<disk id="' + sIDDisk + '"';
|
var sXMLDisk = '\t<disk id="' + sIDDisk + '"';
|
||||||
sXMLDisk += (size? ' size="' + size + '"' : '');
|
sXMLDisk += (size? ' size="' + size + '"' : '');
|
||||||
|
|
@ -1590,10 +1590,10 @@ DiskDump.prototype.buildManifestInfo = function(sImage)
|
||||||
var asFiles = glob.sync(sDir + "**");
|
var asFiles = glob.sync(sDir + "**");
|
||||||
for (var i = 0; i < asFiles.length; i++) {
|
for (var i = 0; i < asFiles.length; i++) {
|
||||||
var sFile = asFiles[i];
|
var sFile = asFiles[i];
|
||||||
|
if (!sFile.substr(sDir.length)) continue;
|
||||||
var fileInfo = {};
|
var fileInfo = {};
|
||||||
fileInfo.FILE_PATH = sFile;
|
fileInfo.FILE_PATH = sFile;
|
||||||
fileInfo.FILE_NAME = sFile.substr(sDir.length);
|
fileInfo.FILE_NAME = path.basename(sFile);
|
||||||
if (!fileInfo.FILE_NAME) continue;
|
|
||||||
var stats = fs.statSync(sFile);
|
var stats = fs.statSync(sFile);
|
||||||
fileInfo.FILE_ATTR = stats.isDirectory()? DiskDump.ATTR_SUBDIR : DiskDump.ATTR_ARCHIVE;
|
fileInfo.FILE_ATTR = stats.isDirectory()? DiskDump.ATTR_SUBDIR : DiskDump.ATTR_ARCHIVE;
|
||||||
fileInfo.FILE_SIZE = stats.size;
|
fileInfo.FILE_SIZE = stats.size;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue