yetangitu/bitjs
1
0
Fork 0
mirror of https://github.com/codedread/bitjs synced 2025-10-04 10:09:16 +02:00
Code Issues Releases Wiki Activity

Transition unrar and untar over to using UnarchiveEvents. Update Unarchiver to accept an optional path to the location of the BitJS files

Browse source
This commit is contained in:
codedread 2011-09-18 15:03:21 -05:00
parent 4925062e3d
commit b2d58e9f49
3 changed files with 71 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

31
untar.js
View file

@ -30,6 +30,7 @@ var err = function(str) {
var postProgress = function() {
postMessage(new bitjs.archive.UnarchiveProgressEvent(
currentFilename,
currentFileNumber,
currentBytesUnarchivedInFile,
currentBytesUnarchived,
totalUncompressedBytesInArchive,
@ -90,7 +91,6 @@ var TarLocalFile = function(bstream) {
this.fileData = new Uint8Array(bstream.bytes.buffer, bstream.ptr, this.size);
if (this.name.length > 0 && this.size > 0 && this.fileData && this.fileData.buffer) {
this.isValid = true;
this.imageString = createURLFromArray(this.fileData);
}
bstream.readBytes(this.size);
@ -125,11 +125,10 @@ var untar = function(arrayBuffer) {
var oneLocalFile = new TarLocalFile(bstream);
if (oneLocalFile && oneLocalFile.isValid) {
localFiles.push(oneLocalFile);
progress.totalNumFilesInZip++;
progress.totalSizeInBytes += oneLocalFile.size;
totalUncompressedBytesInArchive += oneLocalFile.size;
}
}
progress.totalNumFilesInZip = localFiles.length;
totalFilesInArchive = localFiles.length;
// got all local files, now sort them
localFiles.sort(function(a,b) {
@ -152,11 +151,9 @@ var untar = function(arrayBuffer) {
return anum - bnum;
});
progress.isValid = true;
// report # files and total length
if (localFiles.length > 0) {
postMessage(progress);
postProgress();
}
// now do the shipping of each file
@ -165,23 +162,17 @@ var untar = function(arrayBuffer) {
info("Sending file '" + localfile.filename + "' up");
// update progress
progress.currentFilename = localfile.filename;
progress.currentFileBytesUnzipped = localfile.size;
progress.totalBytesUnzipped += localfile.size;
progress.isValid = true;
progress.localFiles.push(localfile);
postMessage(progress);
// Wipe out old localFiles array now that has been copied out of the thread.
progress.localFiles = [];
currentFilename = localfile.filename;
currentFileNumber = i;
currentBytesUnarchivedInFile = localfile.size;
currentBytesUnarchived += localfile.size;
postMessage(new bitjs.archive.UnarchiveExtractEvent(localfile));
postProgress();
}
progress.isDone = true;
postMessage(progress);
postProgress();
postMessage(new bitjs.archive.UnarchiveFinishEvent());
return progress;
};
// event.data.file has the ArrayBuffer.