more refinements.

Author: ctalkington

README.md

@@ -14,6 +14,7 @@ You can also use `npm install https://github.com/ctalkington/node-compress-commo
 
 ## Things of Interest
 
+- [Source Docs (coming soon)](http://docsrc.com/compress-commons/)
 - [Changelog](https://github.com/ctalkington/node-compress-commons/releases)
 - [Contributing](https://github.com/ctalkington/node-compress-commons/blob/master/CONTRIBUTING.md)
 - [MIT License](https://github.com/ctalkington/node-compress-commons/blob/master/LICENSE-MIT)

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

@@ -100,16 +100,14 @@ ZipArchiveEntry.prototype.getSize = function() {
   return this.size;
 };
 
-ZipArchiveEntry.prototype.getTime = function(dos) {
-  dos = dos || false;
-
-  if (dos) {
-    return this.time;
-  }
-
+ZipArchiveEntry.prototype.getTime = function() {
   return this.time !== -1 ? zipUtil.dosToDate(this.time) : -1;
 };
 
+ZipArchiveEntry.prototype.getTimeDos = function() {
+  return this.time !== -1 ? this.time : 0;
+};
+
 ZipArchiveEntry.prototype.getUnixMode = function() {
   return this.platform !== constants.PLATFORM_UNIX ? 0 : ((this.getExternalAttributes() >> constants.SHORT_SHIFT) & constants.SHORT_MASK);
 };
@@ -119,6 +117,10 @@ ZipArchiveEntry.prototype.getVersionNeededToExtract = function() {
 };
 
 ZipArchiveEntry.prototype.setComment = function(comment) {
+  if (Buffer.byteLength(comment) !== comment.length) {
+    this.getGeneralPurposeBit().useUTF8ForNames(true);
+  }
+
   this.comment = comment;
 };
 
@@ -167,8 +169,10 @@ ZipArchiveEntry.prototype.setMethod = function(method) {
 };
 
 ZipArchiveEntry.prototype.setName = function(name) {
-  if (name) {
-    name = name.replace(/\\/g, '/').replace(/:/g, '').replace(/^\/+/, '');
+  name = name.replace(/\\/g, '/').replace(/:/g, '').replace(/^\/+/, '');
+
+  if (Buffer.byteLength(name) !== name.length) {
+    this.getGeneralPurposeBit().useUTF8ForNames(true);
   }
 
   this.name = name;

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

@@ -103,6 +103,7 @@ ZipArchiveOutputStream.prototype._finish = function() {
 
   this._writeCentralDirectoryEnd();
 
+  this._archive.processing = false;
   this._archive.finish = true;
   this._archive.finished = true;
   this.end();
@@ -190,7 +191,7 @@ ZipArchiveOutputStream.prototype._writeCentralFileHeader = function(zae) {
   this.write(zipUtil.getShortBytes(method));
 
   // datetime
-  this.write(zipUtil.getLongBytes(zae.getTime(true)));
+  this.write(zipUtil.getLongBytes(zae.getTimeDos()));
 
   // crc32 checksum
   this.write(zipUtil.getLongBytes(zae.getCrc()));
@@ -267,7 +268,7 @@ ZipArchiveOutputStream.prototype._writeLocalFileHeader = function(zae) {
   this.write(zipUtil.getShortBytes(method));
 
   // datetime
-  this.write(zipUtil.getLongBytes(zae.getTime(true)));
+  this.write(zipUtil.getLongBytes(zae.getTimeDos()));
 
   zae._offsets.data = this.offset;
 

test/archive-output-stream.js

@@ -0,0 +1,18 @@
+/*global before,describe,it */
+var fs = require('fs');
+var assert = require('chai').assert;
+var mkdir = require('mkdirp');
+
+var helpers = require('./helpers');
+
+var commons = require('../lib/compress-commons');
+
+var testBuffer = helpers.binaryBuffer(1024 * 16);
+
+describe('ArchiveOutputStream', function() {
+
+  describe('#entry', function() {
+
+  });
+
+});

test/zip-archive-entry.js

@@ -116,8 +116,13 @@ describe('ZipArchiveEntry', function() {
       entry.time = 1109607251;
       assert.typeOf(entry.getTime(), 'Date');
     });
+  });
 
-    // add test for raw
+  describe('#getTimeDos', function() {
+    it('should return a number', function() {
+      entry.time = 1109607251;
+      assert.typeOf(entry.getTimeDos(), 'number');
+    });
   });
 
   describe('#getUnixMode', function() {
@@ -141,6 +146,11 @@ describe('ZipArchiveEntry', function() {
       entry.setComment('file comment');
       assert.propertyVal(entry, 'comment', 'file comment');
     });
+
+    it('should set utf8 bit when receiving strings byte count != string length', function() {
+      entry.setComment('ÀÁÂÃÄÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝàáâãäçèéêëìíîïñòóôõöùúûüýÿ');
+      assert.ok(entry.getGeneralPurposeBit().usesUTF8ForNames());
+    });
   });
 
   describe('#setCompressedSize', function() {
@@ -203,6 +213,11 @@ describe('ZipArchiveEntry', function() {
       entry.setName('\\windows\\file.txt');
       assert.propertyVal(entry, 'name', 'windows/file.txt');
     });
+
+    it('should set utf8 bit when receiving strings byte count != string length', function() {
+      entry.setName('ÀÁÂÃÄÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝàáâãäçèéêëìíîïñòóôõöùúûüýÿ.txt');
+      assert.ok(entry.getGeneralPurposeBit().usesUTF8ForNames());
+    });
   });
 
   describe('#setPlatform', function() {