Merge pull request #135 from ZJONSSON/use-directory

Use endOfDirectory file header instead of local header
ZJONSSON · Jun 1, 2019 · ee69b43 · ee69b43
2 parents 26edb18 + e81a932
commit ee69b43
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/Open/directory.js b/lib/Open/directory.js
@@ -107,8 +107,9 @@ module.exports = function centralDirectory(source, options) {
         })
         .then(function(comment) {
           vars.comment = comment;
+          vars.type = (vars.uncompressedSize === 0 && /[\/\\]$/.test(vars.path)) ? 'Directory' : 'File';
           vars.stream = function(_password) {
-            return unzip(source, vars.offsetToLocalFileHeader,_password);
+            return unzip(source, vars.offsetToLocalFileHeader,_password, vars);
           };
           vars.buffer = function(_password) {
             return BufferStream(vars.stream(_password));

diff --git a/lib/Open/unzip.js b/lib/Open/unzip.js
@@ -11,7 +11,7 @@ var Buffer = require('../Buffer');
 if (!Stream.Writable || !Stream.Writable.prototype.destroy)
   Stream = require('readable-stream');
 
-module.exports = function unzip(source,offset,_password) {
+module.exports = function unzip(source,offset,_password, directoryVars) {
   var file = PullStream(),
       entry = Stream.PassThrough(),
       vars;
@@ -44,6 +44,9 @@ module.exports = function unzip(source,offset,_password) {
         .then(function(extraField) {
           var checkEncryption;
           vars.extra = parseExtraField(extraField, vars);
+          // Ignore logal file header vars if the directory vars are available
+          if (directoryVars && directoryVars.compressedSize) vars = directoryVars;
+
           if (vars.flags & 0x01) checkEncryption = file.pull(12)
             .then(function(header) {
               if (!_password)