user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix uncompressed cbz files

Browse Source 
merge from master -> file extension limitation
This commit is contained in:
Ozzieisaacs
2019-03-05 20:59:30 +01:00
parent 1561a4abdf
commit feb6a71f95
5 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cps/static/js/kthoom.js
+2 -1
View File
@@ -99,7 +99,8 @@ kthoom.setSettings = function() {
};
var createURLFromArray = function(array, mimeType) {
var offset = array.byteOffset, len = array.byteLength;
var offset = array.byteOffset;
var len = array.byteLength;
var url;
var blob;
cps/static/js/unzip.js
+29 -18
View File
@@ -68,23 +68,23 @@ var ZipLocalFile = function(bstream) {
this.filename = bstream.readString(this.fileNameLength);
}
console.log("Zip Local File Header:");
console.log(" version=" + this.version);
console.log(" general purpose=" + this.generalPurpose);
console.log(" compression method=" + this.compressionMethod);
console.log(" last mod file time=" + this.lastModFileTime);
console.log(" last mod file date=" + this.lastModFileDate);
console.log(" crc32=" + this.crc32);
console.log(" compressed size=" + this.compressedSize);
console.log(" uncompressed size=" + this.uncompressedSize);
console.log(" file name length=" + this.fileNameLength);
console.log(" extra field length=" + this.extraFieldLength);
console.log(" filename = '" + this.filename + "'");
info("Zip Local File Header:");
info(" version=" + this.version);
info(" general purpose=" + this.generalPurpose);
info(" compression method=" + this.compressionMethod);
info(" last mod file time=" + this.lastModFileTime);
info(" last mod file date=" + this.lastModFileDate);
info(" crc32=" + this.crc32);
info(" compressed size=" + this.compressedSize);
info(" uncompressed size=" + this.uncompressedSize);
info(" file name length=" + this.fileNameLength);
info(" extra field length=" + this.extraFieldLength);
info(" filename = '" + this.filename + "'");
this.extraField = null;
if (this.extraFieldLength > 0) {
this.extraField = bstream.readString(this.extraFieldLength);
console.log(" extra field=" + this.extraField);
info(" extra field=" + this.extraField);
}
// read in the compressed data
@@ -110,13 +110,14 @@ ZipLocalFile.prototype.unzip = function() {
// Zip Version 1.0, no compression (store only)
if (this.compressionMethod == 0 ) {
console.log("ZIP v" + this.version + ", store only: " + this.filename + " (" + this.compressedSize + " bytes)");
info("ZIP v" + this.version + ", store only: " + this.filename + " (" + this.compressedSize + " bytes)");
currentBytesUnarchivedInFile = this.compressedSize;
currentBytesUnarchived += this.compressedSize;
this.fileData = zeroCompression(this.fileData, this.uncompressedSize);
}
// version == 20, compression method == 8 (DEFLATE)
else if (this.compressionMethod == 8) {
console.log("ZIP v2.0, DEFLATE: " + this.filename + " (" + this.compressedSize + " bytes)");
info("ZIP v2.0, DEFLATE: " + this.filename + " (" + this.compressedSize + " bytes)");
this.fileData = inflate(this.fileData, this.uncompressedSize);
}
else {
@@ -164,7 +165,7 @@ var unzip = function(arrayBuffer) {
// archive extra data record
if (bstream.peekNumber(4) == zArchiveExtraDataSignature) {
console.log(" Found an Archive Extra Data Signature");
info(" Found an Archive Extra Data Signature");
// skipping this record for now
bstream.readNumber(4);
@@ -175,7 +176,7 @@ var unzip = function(arrayBuffer) {
// central directory structure
// TODO: handle the rest of the structures (Zip64 stuff)
if (bstream.peekNumber(4) == zCentralFileHeaderSignature) {
console.log(" Found a Central File Header");
info(" Found a Central File Header");
// read all file headers
while (bstream.peekNumber(4) == zCentralFileHeaderSignature) {
@@ -205,7 +206,7 @@ var unzip = function(arrayBuffer) {
// digital signature
if (bstream.peekNumber(4) == zDigitalSignatureSignature) {
console.log(" Found a Digital Signature");
info(" Found a Digital Signature");
bstream.readNumber(4);
var sizeOfSignature = bstream.readNumber(2);
@@ -493,6 +494,16 @@ function inflateBlockData(bstream, hcLiteralTable, hcDistanceTable, buffer) {
return blockSize;
}
function zeroCompression(compressedData, numDecompressedBytes) {
var bstream = new bitjs.io.BitStream(compressedData.buffer,
false /* rtl */,
compressedData.byteOffset,
compressedData.byteLength);
var buffer = new bitjs.io.ByteBuffer(numDecompressedBytes);
buffer.insertBytes(bstream.readBytes(numDecompressedBytes));
return buffer.data;
}
// {Uint8Array} compressedData A Uint8Array of the compressed file data.
// compression method 8
// deflate: http://tools.ietf.org/html/rfc1951