forked from cthackers/adm-zip
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed crc32 function.\nAdded END header support.\nMoved and renamed s…
…ome files.\nOther refactoring
- Loading branch information
Showing
11 changed files
with
894 additions
and
715 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,114 +1,133 @@ | ||
| var ZipConstants = require("./zipConstants").ZipConstants, | ||
| ZipUtils = require("./zipUtils").ZipUtils; | ||
|
|
||
| exports.ZipFileHeader = function ZipFileHeader() { | ||
|
|
||
| var _version = 0, | ||
| _flags = 0, | ||
| _method = 0, | ||
| _time = 0, | ||
| _crc = 0, | ||
| _compressedSize = 0, | ||
| _size = 0, | ||
| _fnameLen = 0, | ||
| _extraLen = 0; | ||
|
|
||
| return { | ||
| get version () { return _version; }, | ||
| set version (val) { _version = val }, | ||
|
|
||
| get flags () { return _flags }, | ||
| set flags (val) { _flags = val; }, | ||
|
|
||
| get method () { return _method; }, | ||
| set method (val) { _method = val; }, | ||
|
|
||
| get time () { | ||
| return new Date( | ||
| ((_time >> 25) & 0x7f) + 1980, | ||
| ((_time >> 21) & 0x0f) - 1, | ||
| (_time >> 16) & 0x1f, | ||
| (_time >> 11) & 0x1f, | ||
| (_time >> 5) & 0x3f, | ||
| (_time & 0x1f) << 1 | ||
| ); | ||
| }, | ||
| set time (val) { | ||
| val = new Date(val); | ||
| _time = (val.getFullYear() - 1980 & 0x7f) << 25 | ||
| | (val.getMonth() + 1) << 21 | ||
| | val.getDay() << 16 | ||
| | val.getHours() << 11 | ||
| | val.getMinutes() << 5 | ||
| | val.getSeconds() >> 1; | ||
| }, | ||
|
|
||
| get crc () { return _crc; }, | ||
| set crc (val) { _crc = val; }, | ||
|
|
||
| get compressedSize () { return _compressedSize; }, | ||
| set compressedSize (val) { _compressedSize = val; }, | ||
|
|
||
| get size () { return _size; }, | ||
| set size (val) { _size = val; }, | ||
|
|
||
| get fileNameLength () { return _fnameLen; }, | ||
| set fileNameLenght (val) { _fnameLen = val; }, | ||
|
|
||
| get extraLength () { return _extraLen }, | ||
| set extraLength (val) { _extraLen = val; }, | ||
|
|
||
| get encripted () { return (_flags & 1) == 1 }, | ||
|
|
||
| get fileHeaderSize () { | ||
| return ZipConstants.LOCHDR + _fnameLen + _extraLen; | ||
| }, | ||
|
|
||
| loadFromBinary : function(/*Buffer*/data) { | ||
|
|
||
| if (data.length != ZipConstants.LOCHDR || data.readUInt32LE(0) != ZipConstants.LOCSIG) { | ||
| throw "readEntries::Invalid CEN header (bad signature)"; | ||
| } | ||
|
|
||
| _version = data.readUInt16LE(ZipConstants.LOCVER); | ||
| _flags = data.readUInt16LE(ZipConstants.LOCFLG); | ||
| _method = data.readUInt16LE(ZipConstants.LOCHOW); | ||
| _time = data.readUInt32LE(ZipConstants.LOCTIM); | ||
| _crc = data.readUInt32LE(ZipConstants.LOCCRC); | ||
| _compressedSize = data.readUInt32LE(ZipConstants.LOCSIZ); | ||
| _size = data.readUInt32LE(ZipConstants.LOCLEN); | ||
| _fnameLen = data.readUInt16LE(ZipConstants.LOCNAM); | ||
| _extraLen = data.readUInt16LE(ZipConstants.LOCEXT); | ||
| }, | ||
|
|
||
| toBinary : function() { | ||
| var data = new Buffer(ZipConstants.LOCHDR); | ||
| data.writeUInt32LE(ZipConstants.LOCSIG, 0); | ||
| data.writeUInt16LE(_version, ZipConstants.LOCVER); | ||
| data.writeUInt16LE(_flags, ZipConstants.LOCFLG); | ||
| data.writeUInt16LE(_method, ZipConstants.LOCHOW); | ||
| data.writeUInt32LE(_time, ZipConstants.LOCTIM); | ||
| data.writeInt32LE(_crc, ZipConstants.LOCCRC); | ||
| data.writeUInt32LE(_compressedSize, ZipConstants.LOCSIZ); | ||
| data.writeUInt32LE(_size, ZipConstants.LOCLEN); | ||
| data.writeUInt16LE(_fnameLen, ZipConstants.LOCNAM); | ||
| data.writeUInt16LE(_extraLen, ZipConstants.LOCEXT); | ||
| return data; | ||
| }, | ||
|
|
||
| toString : function() { | ||
| return '{\n' + | ||
| '\t"version" : ' + _version + ",\n" + | ||
| '\t"flags" : ' + _flags + ",\n" + | ||
| '\t"method" : ' + ZipUtils.methodToString(_method) + ",\n" + | ||
| '\t"time" : ' + _time + ",\n" + | ||
| '\t"crc" : 0x' + _crc.toString(16).toUpperCase() + ",\n" + | ||
| '\t"compressedSize" : ' + _compressedSize + " bytes,\n" + | ||
| '\t"size" : ' + _size + " bytes,\n" + | ||
| '\t"fnameLen" : ' + _fnameLen + ",\n" + | ||
| '\t"extraLen" : ' + _extraLen + " bytes,\n" + | ||
| '\t"fileHeaderSize" : ' + (ZipConstants.LOCHDR + _fnameLen + _extraLen) + " bytes\n" + | ||
| '}'; | ||
| } | ||
| } | ||
| /* The local file header */ | ||
| var ZipConstants = require("../zipConstants.js").ZipConstants, | ||
| ZipUtils = require("../zipUtils.js").ZipUtils; | ||
|
|
||
| exports.ZipDataHeader = function ZipDataHeader() { | ||
| var _version = 0, | ||
| _flags = 0, | ||
| _method = 0, | ||
| _time = 0, | ||
| _crc = 0, | ||
| _compressedSize = 0, | ||
| _size = 0, | ||
| _fnameLen = 0, | ||
| _extraLen = 0; | ||
|
|
||
| return { | ||
| get version () { return _version; }, | ||
| set version (val) { _version = val }, | ||
|
|
||
| get flags () { return _flags }, | ||
| set flags (val) { _flags = val; }, | ||
|
|
||
| get method () { return _method; }, | ||
| set method (val) { _method = val; }, | ||
|
|
||
| get time () { | ||
| return new Date( | ||
| ((_time >> 25) & 0x7f) + 1980, | ||
| ((_time >> 21) & 0x0f) - 1, | ||
| (_time >> 16) & 0x1f, | ||
| (_time >> 11) & 0x1f, | ||
| (_time >> 5) & 0x3f, | ||
| (_time & 0x1f) << 1 | ||
| ); | ||
| }, | ||
| set time (val) { | ||
| val = new Date(val); | ||
| _time = (val.getFullYear() - 1980 & 0x7f) << 25 | ||
| | (val.getMonth() + 1) << 21 | ||
| | val.getDay() << 16 | ||
| | val.getHours() << 11 | ||
| | val.getMinutes() << 5 | ||
| | val.getSeconds() >> 1; | ||
| }, | ||
|
|
||
| get crc () { return _crc; }, | ||
| set crc (val) { _crc = val; }, | ||
|
|
||
| get compressedSize () { return _compressedSize; }, | ||
| set compressedSize (val) { _compressedSize = val; }, | ||
|
|
||
| get size () { return _size; }, | ||
| set size (val) { _size = val; }, | ||
|
|
||
| get fileNameLength () { return _fnameLen; }, | ||
| set fileNameLenght (val) { _fnameLen = val; }, | ||
|
|
||
| get extraLength () { return _extraLen }, | ||
| set extraLength (val) { _extraLen = val; }, | ||
|
|
||
| get encripted () { return (_flags & 1) == 1 }, | ||
|
|
||
| get fileHeaderSize () { | ||
| return ZipConstants.LOCHDR + _fnameLen + _extraLen; | ||
| }, | ||
|
|
||
| loadFromBinary : function(/*Buffer*/data) { | ||
| // 30 bytes and should start with "PK\003\004" | ||
| if (data.length != ZipConstants.LOCHDR || data.readUInt32LE(0) != ZipConstants.LOCSIG) { | ||
| throw "Invalid LOC header (bad signature)"; | ||
| } | ||
| // version needed to extract | ||
| _version = data.readUInt16LE(ZipConstants.LOCVER); | ||
| // general purpose bit flag | ||
| _flags = data.readUInt16LE(ZipConstants.LOCFLG); | ||
| // compression method | ||
| _method = data.readUInt16LE(ZipConstants.LOCHOW); | ||
| // modification time (2 bytes time, 2 bytes date) | ||
| _time = data.readUInt32LE(ZipConstants.LOCTIM); | ||
| // uncompressed file crc-32 value | ||
| _crc = data.readUInt32LE(ZipConstants.LOCCRC); | ||
| // compressed size | ||
| _compressedSize = data.readUInt32LE(ZipConstants.LOCSIZ); | ||
| // uncompressed size | ||
| _size = data.readUInt32LE(ZipConstants.LOCLEN); | ||
| // filename length | ||
| _fnameLen = data.readUInt16LE(ZipConstants.LOCNAM); | ||
| // extra field length | ||
| _extraLen = data.readUInt16LE(ZipConstants.LOCEXT); | ||
| }, | ||
|
|
||
| toBinary : function() { | ||
| // LOC header size (30 bytes) | ||
| var data = new Buffer(ZipConstants.LOCHDR); | ||
| // "PK\003\004" | ||
| data.writeUInt32LE(ZipConstants.LOCSIG, 0); | ||
| // version needed to extract | ||
| data.writeUInt16LE(_version, ZipConstants.LOCVER); | ||
| // general purpose bit flag | ||
| data.writeUInt16LE(_flags, ZipConstants.LOCFLG); | ||
| // compression method | ||
| data.writeUInt16LE(_method, ZipConstants.LOCHOW); | ||
| // modification time (2 bytes time, 2 bytes date) | ||
| data.writeUInt32LE(_time, ZipConstants.LOCTIM); | ||
| // uncompressed file crc-32 value | ||
| data.writeUInt32LE(_crc, ZipConstants.LOCCRC); | ||
| // compressed size | ||
| data.writeUInt32LE(_compressedSize, ZipConstants.LOCSIZ); | ||
| // uncompressed size | ||
| data.writeUInt32LE(_size, ZipConstants.LOCLEN); | ||
| // filename length | ||
| data.writeUInt16LE(_fnameLen, ZipConstants.LOCNAM); | ||
| // extra field length | ||
| data.writeUInt16LE(_extraLen, ZipConstants.LOCEXT); | ||
| return data; | ||
| }, | ||
|
|
||
| toString : function() { | ||
| return '{\n' + | ||
| '\t"version" : ' + _version + ",\n" + | ||
| '\t"flags" : ' + _flags + ",\n" + | ||
| '\t"method" : ' + ZipUtils.methodToString(_method) + ",\n" + | ||
| '\t"time" : ' + _time + ",\n" + | ||
| '\t"crc" : 0x' + _crc.toString(16).toUpperCase() + ",\n" + | ||
| '\t"compressedSize" : ' + _compressedSize + " bytes,\n" + | ||
| '\t"size" : ' + _size + " bytes,\n" + | ||
| '\t"fnameLen" : ' + _fnameLen + ",\n" + | ||
| '\t"extraLen" : ' + _extraLen + " bytes,\n" + | ||
| '\t"fileHeaderSize" : ' + (ZipConstants.LOCHDR + _fnameLen + _extraLen) + " bytes\n" + | ||
| '}'; | ||
| } | ||
| } | ||
| }; |
Oops, something went wrong.