add forceLocalTime option to override default of UTC times in archives.

Author: ctalkington

lib/archivers/zip/util.js

@@ -7,8 +7,10 @@
  */
 var util = module.exports = {};
 
-util.dateToDos = function(d) {
-  var year = d.getUTCFullYear();
+util.dateToDos = function(d, forceLocalTime) {
+  forceLocalTime = forceLocalTime || false;
+
+  var year = forceLocalTime ? d.getFullYear() : d.getUTCFullYear();
 
   if (year < 1980) {
     return 2162688; // 1980-1-1 00:00:00
@@ -18,26 +20,19 @@ util.dateToDos = function(d) {
 
   var val = {
     year: year,
-    month: d.getUTCMonth(),
-    date: d.getUTCDate(),
-    hours: d.getUTCHours(),
-    minutes: d.getUTCMinutes(),
-    seconds: d.getUTCSeconds()
+    month: forceLocalTime ? d.getMonth() : d.getUTCMonth(),
+    date: forceLocalTime ? d.getDate() : d.getUTCDate(),
+    hours: forceLocalTime ? d.getHours() : d.getUTCHours(),
+    minutes: forceLocalTime ? d.getMinutes() : d.getUTCMinutes(),
+    seconds: forceLocalTime ? d.getSeconds() : d.getUTCSeconds()
   };
 
   return ((val.year - 1980) << 25) | ((val.month + 1) << 21) | (val.date << 16) |
     (val.hours << 11) | (val.minutes << 5) | (val.seconds / 2);
 };
 
 util.dosToDate = function(dos) {
-  return new Date(
-    ((dos >> 25) & 0x7f) + 1980,
-    ((dos >> 21) & 0x0f) - 1,
-    (dos >> 16) & 0x1f,
-    (dos >> 11) & 0x1f,
-    (dos >> 5) & 0x3f,
-    (dos & 0x1f) << 1
-  );
+  return new Date(((dos >> 25) & 0x7f) + 1980, ((dos >> 21) & 0x0f) - 1, (dos >> 16) & 0x1f, (dos >> 11) & 0x1f, (dos >> 5) & 0x3f, (dos & 0x1f) << 1);
 };
 
 util.fromDosTime = function(buf) {

lib/archivers/zip/zip-archive-entry.js

@@ -191,12 +191,12 @@ ZipArchiveEntry.prototype.setSize = function(size) {
   this.size = size;
 };
 
-ZipArchiveEntry.prototype.setTime = function(time) {
+ZipArchiveEntry.prototype.setTime = function(time, forceLocalTime) {
   if (!(time instanceof Date)) {
     throw new Error('invalid entry time');
   }
 
-  this.time = zipUtil.dateToDos(time);
+  this.time = zipUtil.dateToDos(time, forceLocalTime);
 };
 
 ZipArchiveEntry.prototype.setUnixMode = function(mode) {

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

@@ -36,7 +36,8 @@ var ZipArchiveOutputStream = module.exports = function(options) {
     finish: false,
     finished: false,
     processing: false,
-    forceZip64: options.forceZip64
+    forceZip64: options.forceZip64,
+    forceLocalTime: options.forceLocalTime
   };
 };
 
@@ -114,6 +115,7 @@ ZipArchiveOutputStream.prototype._defaults = function(o) {
   }
 
   o.forceZip64 = !!o.forceZip64;
+  o.forceLocalTime = !!o.forceLocalTime;
 
   return o;
 };
@@ -150,7 +152,7 @@ ZipArchiveOutputStream.prototype._normalizeEntry = function(ae) {
   }
 
   if (ae.getTime() === -1) {
-    ae.setTime(new Date());
+    ae.setTime(new Date(), this._archive.forceLocalTime);
   }
 
   ae._offsets = {
@@ -163,8 +165,8 @@ ZipArchiveOutputStream.prototype._normalizeEntry = function(ae) {
 ZipArchiveOutputStream.prototype._smartStream = function(ae, callback) {
   var deflate = ae.getMethod() === constants.METHOD_DEFLATED;
   var process = deflate ? new DeflateCRC32Stream(this.options.zlib) : new CRC32Stream();
+  var error = null;
 
-  var error = null
   function handleStuff() {
     ae.setCrc(process.digest());
     ae.setSize(process.size());

test/zip-archive-entry.js

@@ -6,7 +6,8 @@ var ZipArchiveEntry = commons.ZipArchiveEntry;
 var GeneralPurposeBit = require('../lib/archivers/zip/general-purpose-bit');
 
 var entry;
-var testDate = new Date('Jan 03 2013 14:26:38 GMT');
+// Jan 03 2013 14:26:38 GMT
+var testDate = new Date(Date.UTC(2013, 0, 3, 14, 26, 38, 0));
 
 describe('ZipArchiveEntry', function() {
 
@@ -257,9 +258,9 @@ describe('ZipArchiveEntry', function() {
   });
 
   describe('#setTime', function() {
-    it.skip('should set internal variable', function() {
+    it('should set internal variable', function() {
       entry.setTime(testDate);
-      assert.propertyVal(entry, 'time', 1109607251);
+      assert.propertyVal(entry, 'time', 1109619539);
     });
   });
 

test/zip-archive-output-stream.js

@@ -107,6 +107,22 @@ describe('ZipArchiveOutputStream', function() {
       });
     });
 
+    it('should force UTC', function(done) {
+      var archive = new ZipArchiveOutputStream({
+          forceUTC: true
+      });
+      var testStream = new WriteHashStream('tmp/zip-stream64.zip');
+      var entry = new ZipArchiveEntry('stream.txt');
+
+      testStream.on('close', function() {
+          done();
+      });
+
+      archive.pipe(testStream);
+
+      archive.entry(entry, fs.createReadStream('test/fixtures/test.txt')).finish();
+    });
+
     it('should force ZIP64', function(done) {
       var archive = new ZipArchiveOutputStream({
         forceZip64: true