stored buffers now implemented. lots of other little things.

Author: ctalkington

lib/archivers/zip/constants.js

@@ -6,11 +6,17 @@
  * https://github.com/ctalkington/node-compress-commons/blob/master/LICENSE-MIT
  */
 module.exports = {
-  ZERO_SHORT: new Buffer(Array(2)),
-  ZERO_LONG: new Buffer(Array(4)),
+  WORD: 4,
+  DWORD: 8,
+  EMPTY: new Buffer(0),
 
-  DATA_DESCRIPTOR_MIN_VERSION: 20,
+  SHORT: 2,
+  SHORT_MASK: 0xffff,
+  SHORT_SHIFT: 16,
+  SHORT_ZERO: new Buffer(Array(2)),
+  LONG_ZERO: new Buffer(Array(4)),
 
+  DATA_DESCRIPTOR_MIN_VERSION: 20,
   INITIAL_VERSION: 10,
 
   METHOD_STORED: 0,
@@ -19,20 +25,13 @@ module.exports = {
   PLATFORM_UNIX: 3,
   PLATFORM_FAT: 0,
 
-  SHORT_MASK: 0xffff,
-  SHORT_SHIFT: 16,
-
   SIG_LFH: 0x04034b50,
   SIG_DD: 0x08074b50,
   SIG_CFH: 0x02014b50,
   SIG_EOCD: 0x06054b50,
   SIG_ZIP64_EOCD: 0x06064B50,
   SIG_ZIP64_EOCD_LOC: 0x07064B50,
 
-  SHORT: 2,
-  WORD: 4,
-  DWORD: 8,
-
   ZIP64_MIN_VERSION: 45,
   ZIP64_MAGIC_SHORT: 0xffff,
   ZIP64_MAGIC: 0xffffffff

lib/archivers/zip/general-purpose-bit.js

@@ -20,10 +20,10 @@ var GeneralPurposeBit = module.exports = function() {
   }
 
   this.descriptor = false;
-  this.encrpytion = false;
+  this.encryption = false;
   this.language = false;
   this.numberOfShannonFanoTrees = 0;
-  this.strongEncrpytion = false;
+  this.strongEncryption = false;
   this.slidingDictionarySize = 0;
 };
 
@@ -44,8 +44,8 @@ GeneralPurposeBit.prototype.parse = function(buf, offset) {
   gbp.useUTF8ForNames((flag & UFT8_NAMES_FLAG) !== 0);
   gbp.useStrongEncryption((flag & STRONG_ENCRYPTION_FLAG) !== 0);
   gbp.useEncryption((flag & ENCRYPTION_FLAG) !== 0);
-  gbp.setSlidingDictionarySize = (flag & SLIDING_DICTIONARY_SIZE_FLAG) !== 0 ? 8192 : 4096;
-  gbp.setNumberOfShannonFanoTrees = (flag & NUMBER_OF_SHANNON_FANO_TREES_FLAG) !== 0 ? 3 : 2;
+  gbp.setSlidingDictionarySize((flag & SLIDING_DICTIONARY_SIZE_FLAG) !== 0 ? 8192 : 4096);
+  gbp.setNumberOfShannonFanoTrees((flag & NUMBER_OF_SHANNON_FANO_TREES_FLAG) !== 0 ? 3 : 2);
 
   return gbp;
 };
@@ -75,19 +75,19 @@ GeneralPurposeBit.prototype.usesDataDescriptor = function() {
 };
 
 GeneralPurposeBit.prototype.useEncryption = function(b) {
-  this.encrpytion = b;
+  this.encryption = b;
 };
 
 GeneralPurposeBit.prototype.usesEncryption = function() {
-  return this.encrpytion;
+  return this.encryption;
 };
 
 GeneralPurposeBit.prototype.useStrongEncryption = function(b) {
-  this.strongEncrpytion = b;
+  this.strongEncryption = b;
 };
 
 GeneralPurposeBit.prototype.usesStrongEncryption = function() {
-  return this.strongEncrpytion;
+  return this.strongEncryption;
 };
 
 GeneralPurposeBit.prototype.useUTF8ForNames = function(b) {

lib/archivers/zip/headers.js

@@ -27,11 +27,12 @@ var ZipArchiveEntry = module.exports = function(name) {
   this.size = -1;
   this.csize = -1;
   this.gpb = new GeneralPurposeBit();
-  this.crc = -1;
+  this.crc = 0;
   this.time = -1;
 
+  this.minver = constants.INITIAL_VERSION;
   this.mode = -1;
-  this.extra = 0;
+  this.extra = null;
   this.exattr = 0;
   this.inattr = 0;
   this.comment = null;
@@ -43,8 +44,13 @@ var ZipArchiveEntry = module.exports = function(name) {
 
 inherits(ZipArchiveEntry, ArchiveEntry);
 
+ZipArchiveEntry.prototype.getCentralDirectoryExtra = function() {
+  var extra = this.getExtra();
+  return extra !== null ? extra : constants.EMPTY;
+};
+
 ZipArchiveEntry.prototype.getComment = function() {
-  return this.comment;
+  return this.comment !== null ? this.comment : constants.EMPTY;
 };
 
 ZipArchiveEntry.prototype.getCompressedSize = function() {
@@ -59,6 +65,10 @@ ZipArchiveEntry.prototype.getExternalAttributes = function() {
   return this.exattr;
 };
 
+ZipArchiveEntry.prototype.getExtra = function() {
+  return this.extra;
+};
+
 ZipArchiveEntry.prototype.getGeneralPurposeBit = function() {
   return this.gpb;
 };
@@ -71,6 +81,11 @@ ZipArchiveEntry.prototype.getLastModifiedDate = function() {
   return this.getTime();
 };
 
+ZipArchiveEntry.prototype.getLocalFileDataExtra = function() {
+  var extra = this.getExtra();
+  return extra !== null ? extra : constants.EMPTY;
+};
+
 ZipArchiveEntry.prototype.getMethod = function() {
   return this.method;
 };
@@ -101,6 +116,10 @@ ZipArchiveEntry.prototype.getUnixMode = function() {
   return this.platform !== constants.PLATFORM_UNIX ? 0 : ((this.getExternalAttributes() >> constants.SHORT_SHIFT) & constants.SHORT_MASK);
 };
 
+ZipArchiveEntry.prototype.getVersionNeededToExtract = function() {
+  return this.minver;
+};
+
 ZipArchiveEntry.prototype.setComment = function(comment) {
   this.comment = comment;
 };
@@ -125,6 +144,10 @@ ZipArchiveEntry.prototype.setExternalAttributes = function(attr) {
   this.exattr = attr;
 };
 
+ZipArchiveEntry.prototype.setExtra = function(extra) {
+  this.extra = extra;
+};
+
 ZipArchiveEntry.prototype.setGeneralPurposeBit = function(gpb) {
   if (!(gpb instanceof GeneralPurposeBit)) {
     throw new Error('invalid entry GeneralPurposeBit');
@@ -179,6 +202,10 @@ ZipArchiveEntry.prototype.setUnixMode = function(mode) {
   this.platform = constants.PLATFORM_UNIX;
 };
 
+ZipArchiveEntry.prototype.setVersionNeededToExtract = function(minver) {
+  this.minver = minver;
+};
+
 ZipArchiveEntry.prototype.isDirectory = function() {
   return this.getName().slice(-1) === '/';
 };