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

Code cosmetis unrar

Browse Source
This commit is contained in:
Ozzieisaacs 2019-03-16 17:28:21 +01:00
parent a360b1759a
commit 149e9b4bd4
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cps/static/js/unrar.js
View File

@ -405,7 +405,7 @@ function rarMakeDecodeTables(BitLength, offset, dec, size) {
} }
// TODO: implement // TODO: implement
function Unpack15() { //bstream, Solid) { function unpack15() { //bstream, Solid) {
info("ERROR! RAR 1.5 compression not supported"); info("ERROR! RAR 1.5 compression not supported");
} }
@ -416,7 +416,7 @@ var rOldDist = [0, 0, 0, 0];
var lastDist = 0; var lastDist = 0;
var lastLength = 0; var lastLength = 0;
function Unpack20(bstream) { //, Solid) { function unpack20(bstream) { //, Solid) {
var destUnpSize = rBuffer.data.length; var destUnpSize = rBuffer.data.length;
var oldDistPtr = 0; var oldDistPtr = 0;
var Length; var Length;
@ -553,7 +553,7 @@ function rarReadTables20(bstream) {
} }
function Unpack29(bstream) { function unpack29(bstream) {
// lazy initialize rDDecode and rDBits // lazy initialize rDDecode and rDBits
var DDecode = new Array(rDC); var DDecode = new Array(rDC);
@ -650,8 +650,8 @@ function Unpack29(bstream) {
var DistNum = num - 259; var DistNum = num - 259;
Distance = rOldDist[DistNum]; Distance = rOldDist[DistNum];
for (var I = DistNum; I > 0; I--) { for (var I2 = DistNum; I2 > 0; I2--) {
rOldDist[I] = rOldDist[I - 1]; rOldDist[I2] = rOldDist[I2 - 1];
} }
rOldDist[0] = Distance; rOldDist[0] = Distance;
@ -707,10 +707,10 @@ function rarReadVMCode(bstream) {
//do something here with cheking readbuf //do something here with cheking readbuf
vmCode.push(bstream.readBits(8)); vmCode.push(bstream.readBits(8));
} }
return RarAddVMCode(FirstByte, vmCode, Length); return rarAddVMCode(vmCode);
} }
function RarAddVMCode(firstByte, vmCode, length) { function rarAddVMCode(vmCode) {
//console.log(vmCode); //console.log(vmCode);
if (vmCode.length > 0) { if (vmCode.length > 0) {
info("Error! RarVM not supported yet!"); info("Error! RarVM not supported yet!");
@ -752,24 +752,23 @@ function unpack(v) {
// TODO: implement what happens when unpVer is < 15 // TODO: implement what happens when unpVer is < 15
var Ver = v.header.unpVer <= 15 ? 15 : v.header.unpVer, var Ver = v.header.unpVer <= 15 ? 15 : v.header.unpVer,
Solid = v.header.LHD_SOLID,
bstream = new bitjs.io.BitStream(v.fileData.buffer, true /* rtl */, v.fileData.byteOffset, v.fileData.byteLength ); bstream = new bitjs.io.BitStream(v.fileData.buffer, true /* rtl */, v.fileData.byteOffset, v.fileData.byteLength );
rBuffer = new bitjs.io.ByteBuffer(v.header.unpackedSize); rBuffer = new bitjs.io.ByteBuffer(v.header.unpackedSize);
info("Unpacking " + v.filename + " RAR v" + Ver); info("Unpacking " + v.filename + " RAR v" + Ver);
switch(Ver) { switch (Ver) {
case 15: // rar 1.5 compression case 15: // rar 1.5 compression
Unpack15(); //(bstream, Solid); unpack15(); //(bstream, Solid);
break; break;
case 20: // rar 2.x compression case 20: // rar 2.x compression
case 26: // files larger than 2GB case 26: // files larger than 2GB
Unpack20(bstream); //, Solid); unpack20(bstream); //, Solid);
break; break;
case 29: // rar 3.x compression case 29: // rar 3.x compression
case 36: // alternative hash case 36: // alternative hash
Unpack29(bstream); unpack29(bstream);
break; break;
} // switch(method) } // switch(method)
@ -870,7 +869,9 @@ var unrar = function(arrayBuffer) {
return aname > bname ? 1 : -1; return aname > bname ? 1 : -1;
}); });
info(localFiles.map(function(a) {return a.filename;}).join(", ")); info(localFiles.map(function(a) {
return a.filename;
}).join(", "));
for (var i = 0; i < localFiles.length; ++i) { for (var i = 0; i < localFiles.length; ++i) {
var localfile = localFiles[i]; var localfile = localFiles[i];