zip: make writeCentralDirectoryZip64 and writeDataDescriptor more testable.

Author: ctalkington

lib/archivers/zip/zip-archive-output-stream.js

@@ -41,9 +41,13 @@ var ZipArchiveOutputStream = module.exports = function(options) {
 
 inherits(ZipArchiveOutputStream, ArchiveOutputStream);
 
-ZipArchiveOutputStream.prototype._afterAppend = function(zae) {
-  this._entries.push(zae);
-  this._writeDataDescriptor(zae);
+ZipArchiveOutputStream.prototype._afterAppend = function(ae) {
+  this._entries.push(ae);
+
+  if (ae.getGeneralPurposeBit().usesDataDescriptor()) {
+    this._writeDataDescriptor(ae);
+  }
+
 
   this._archive.processing = false;
   this._entry = null;
@@ -116,7 +120,10 @@ ZipArchiveOutputStream.prototype._finish = function() {
 
   this._archive.centralLength = this.offset - this._archive.centralOffset;
 
-  this._writeCentralDirectoryZip64();
+  if (this.isZip64()) {
+    this._writeCentralDirectoryZip64();
+  }
+
   this._writeCentralDirectoryEnd();
 
   this._archive.processing = false;
@@ -200,10 +207,6 @@ ZipArchiveOutputStream.prototype._writeCentralDirectoryEnd = function() {
 };
 
 ZipArchiveOutputStream.prototype._writeCentralDirectoryZip64 = function() {
-  if (!this.isZip64()) {
-    return;
-  }
-
   // signature
   this.write(constants.SIG_ZIP64_EOCD);
 
@@ -336,10 +339,6 @@ ZipArchiveOutputStream.prototype._writeCentralFileHeader = function(ae) {
 };
 
 ZipArchiveOutputStream.prototype._writeDataDescriptor = function(ae) {
-  if (!ae.getGeneralPurposeBit().usesDataDescriptor()) {
-    return;
-  }
-
   // signature
   this.write(zipUtil.getLongBytes(constants.SIG_DD));