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

Code improvement

Browse Source
This commit is contained in:
Ozzieisaacs
2019-03-24 15:58:43 +01:00
parent 07649d04a3
commit 6940bb9b88
7 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cps/static/js/unrar.js
+4 -4
View File
@@ -641,7 +641,7 @@ function unpack29(bstream) {
continue;
}
if (num === 258) {
if (lastLength != 0) {
if (lastLength !== 0) {
rarCopyString(lastLength, lastDist);
}
continue;
@@ -690,7 +690,7 @@ function rarReadEndOfBlock(bstream) {
NewTable = !!bstream.readBits(1);
}
//tablesRead = !NewTable;
return !(NewFile || NewTable && !rarReadTables(bstream));
return !(NewFile || (NewTable && !rarReadTables(bstream)));
}
@@ -784,7 +784,7 @@ var RarLocalFile = function(bstream) {
this.header = new RarVolumeHeader(bstream);
this.filename = this.header.filename;
if (this.header.headType != FILE_HEAD && this.header.headType != ENDARC_HEAD) {
if (this.header.headType !== FILE_HEAD && this.header.headType !== ENDARC_HEAD) {
this.isValid = false;
info("Error! RAR Volume did not include a FILE_HEAD header ");
} else {
@@ -840,7 +840,7 @@ var unrar = function(arrayBuffer) {
info("Found RAR signature");
var mhead = new RarVolumeHeader(bstream);
if (mhead.headType != MAIN_HEAD) {
if (mhead.headType !== MAIN_HEAD) {
info("Error! RAR did not include a MAIN_HEAD header");
} else {
var localFiles = [];
cps/static/js/unzip.js
+8 -9
View File
@@ -179,7 +179,7 @@ var unzip = function(arrayBuffer) {
info(" Found a Central File Header");
// read all file headers
while (bstream.peekNumber(4) == zCentralFileHeaderSignature) {
while (bstream.peekNumber(4) === zCentralFileHeaderSignature) {
bstream.readNumber(4); // signature
bstream.readNumber(2); // version made by
bstream.readNumber(2); // version needed to extract
@@ -264,7 +264,7 @@ function getHuffmanCodes(bitLengths) {
return null;
}
// increment the appropriate bitlength count
if (blCount[length] == undefined) blCount[length] = 0;
if (typeof blCount[length] === "undefined") blCount[length] = 0;
// a length of zero means this symbol is not participating in the huffman coding
if (length > 0) blCount[length]++;
@@ -277,7 +277,7 @@ function getHuffmanCodes(bitLengths) {
for (var bits = 1; bits <= MAX_BITS; ++bits) {
var length2 = bits - 1;
// ensure undefined lengths are zero
if (blCount[length2] == undefined) blCount[length2] = 0;
if (typeof blCount[length2] === "undefined") blCount[length2] = 0;
code = (code + blCount[bits - 1]) << 1;
nextCode [bits] = code;
}
@@ -522,11 +522,11 @@ function inflate(compressedData, numDecompressedBytes) {
bFinal = bstream.readBits(1);
var bType = bstream.readBits(2);
blockSize = 0;
++numBlocks;
// ++numBlocks;
// no compression
if (bType == 0) {
// skip remaining bits in this byte
while (bstream.bitPtr != 0) bstream.readBits(1);
while (bstream.bitPtr !== 0) bstream.readBits(1);
var len = bstream.readBits(16);
bstream.readBits(16);
// TODO: check if nlen is the ones-complement of len?
@@ -535,11 +535,11 @@ function inflate(compressedData, numDecompressedBytes) {
blockSize = len;
}
// fixed Huffman codes
else if (bType == 1) {
else if (bType === 1) {
blockSize = inflateBlockData(bstream, getFixedLiteralTable(), getFixedDistanceTable(), buffer);
}
// dynamic Huffman codes
else if (bType == 2) {
else if (bType === 2) {
var numLiteralLengthCodes = bstream.readBits(5) + 257;
var numDistanceCodes = bstream.readBits(5) + 1,
numCodeLengthCodes = bstream.readBits(4) + 4;
@@ -576,8 +576,7 @@ function inflate(compressedData, numDecompressedBytes) {
if (symbol <= 15) {
literalCodeLengths.push(symbol);
prevCodeLength = symbol;
}
else if (symbol === 16) {
} else if (symbol === 16) {
var repeat = bstream.readBits(2) + 3;
while (repeat--) {
literalCodeLengths.push(prevCodeLength);