Fix fstream

README.md

@@ -1,6 +1,7 @@
-# unzip [![Build Status](https://travis-ci.org/nearinfinity/node-unzip.png)](https://travis-ci.org/nearinfinity/node-unzip)
+# node-unzip-2
 
-Streaming cross-platform unzip tool written in node.js.
+Streaming cross-platform unzip tool written in node.js. 
+It is an improved version of [Evan Oxfeld's node-unzip](https://github.com/isaacs/node-tar), which supports unzipping for files with a "STORE" compression (uncompressed files).
 
 Unzip provides simple APIs similar to [node-tar](https://github.com/isaacs/node-tar) for parsing and extracting zip files.
 There are no added compiled dependencies - inflation is handled by node.js's built in zlib support.  Unzip is also an
@@ -9,7 +10,7 @@ example use case of [node-pullstream](https://github.com/nearinfinity/node-pulls
 ## Installation
 
 ```bash
-$ npm install unzip
+$ npm install node-unzip-2
 ```
 
 ## Quick Examples

lib/parse.js

@@ -117,7 +117,7 @@ Parse.prototype._readFile = function () {
         if (err) {
           return self.emit('error', err);
         }
-        if (vars.compressionMethod === 0) {
+        if (entry.type === 'Directory') {
           self._pullStream.pull(vars.compressedSize, function (err, compressedData) {
             if (err) {
               return self.emit('error', err);
@@ -132,17 +132,32 @@ Parse.prototype._readFile = function () {
           });
         } else {
           var fileSizeKnown = !(vars.flags & 0x08);
+          var has_compression = !(vars.compressionMethod === 0);
+          var inflater;
 
-          var inflater = zlib.createInflateRaw();
-          inflater.on('error', function (err) {
-            self.emit('error', err);
-          });
+          if(has_compression) {
+            inflater = zlib.createInflateRaw(self._opts.zlibOptions || {});
+            inflater.on('error', function (err) {
+              self.emit('error', err);
+            });
+          }
 
           if (fileSizeKnown) {
             entry.size = vars.uncompressedSize;
             if (hasEntryListener) {
               entry.on('finish', self._readRecord.bind(self));
-              self._pullStream.pipe(vars.compressedSize, inflater).pipe(entry);
+              if(has_compression) {
+                self._pullStream.pipe(vars.compressedSize, inflater).pipe(entry);
+              } else {
+                self._pullStream.pull(vars.compressedSize, function (err, compressedData) {
+                  if (err) {
+                    return self.emit('error', err);
+                  }
+
+                  entry.write(compressedData);
+                  entry.end();
+                });
+              }
             } else {
               self._pullStream.drain(vars.compressedSize, function (err) {
                 if (err) {
@@ -162,17 +177,21 @@ Parse.prototype._readFile = function () {
                 }
                 this.push(buf);
               }
+              self._pullStream.unpipe();
+              self._pullStream.prepend(extra);
               setImmediate(function() {
-                self._pullStream.unpipe();
-                self._pullStream.prepend(extra);
                 self._processDataDescriptor(entry);
               });
               return this.push(null);
             });
 
             self._pullStream.pipe(matchStream);
             if (hasEntryListener) {
-              matchStream.pipe(inflater).pipe(entry);
+              if(has_compression) {
+                matchStream.pipe(inflater).pipe(entry);
+              } else {
+                matchStream.pipe(entry);
+              }
             }
           }
         }
@@ -304,8 +323,9 @@ Parse.prototype._flush = function (callback) {
     return setImmediate(this._flush.bind(this, callback));
   }
 
+  var r = callback();
   this.emit('close');
-  return callback();
+  return r;
 };
 
 Parse.prototype.addListener = function(type, listener) {

package.json

@@ -1,25 +1,18 @@
 {
-  "name": "unzip",
-  "version": "0.1.9",
+  "name": "node-unzip-2",
+  "version": "0.2.8",
   "description": "Unzip cross-platform streaming API compatible with fstream and fs.ReadStream",
-  "author": "Evan Oxfeld <evan.oxfeld@nearinfinity.com>",
+  "author": "Hlib Dmytriiev <glebdmitriew@gmail.com>",
   "maintainers": [
-    {
-      "name": "Evan Oxfeld",
-      "email": "[email protected]"
-    },
-    {
-      "name": "Joe Ferner",
-      "email": "[email protected]"
-    }
+    "Hlib Dmytriiev <[email protected]>"
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/nearinfinity/node-unzip.git"
+    "url": "https://github.com/glebdmitriew/node-unzip-2.git"
   },
   "license": "MIT",
   "dependencies": {
-    "fstream": "~0.1.21",
+    "fstream": "^1.0.12",
     "pullstream": "~0.4.0",
     "binary": "~0.3.0",
     "readable-stream": "~1.0.0",
@@ -33,7 +26,6 @@
     "stream-buffers": "~0.2.3"
   },
   "directories": {
-    "example": "examples",
     "test": "test"
   },
   "keywords": [
@@ -47,6 +39,10 @@
   ],
   "main": "unzip.js",
   "scripts": {
-    "test": "./node_modules/.bin/tap ./test/*.js"
-  }
+    "test": "tap ./test/*.js"
+  },
+  "bugs": {
+    "url": "https://github.com/glebdmitriew/node-unzip-2/issues"
+  },
+  "homepage": "https://github.com/glebdmitriew/node-unzip-2"
 }

test/uncompressed.js

@@ -46,4 +46,46 @@ test("extract uncompressed archive", function (t) {
       });
     }
   });
+});
+
+test("parse really uncompressed archive", function (t) {
+    var archive = path.join(__dirname, '../testData/uncompressed/lorem.zip');
+
+    var unzipParser = unzip.Parse();
+    fs.createReadStream(archive).pipe(unzipParser);
+    unzipParser.on('error', function(err) {
+        throw err;
+    });
+
+    unzipParser.on('close', t.end.bind(this));
+});
+
+test("extract really uncompressed archive", function (t) {
+    var archive = path.join(__dirname, '../testData/uncompressed/lorem.zip');
+
+    temp.mkdir('node-unzip-', function (err, dirPath) {
+        if (err) {
+            throw err;
+        }
+        console.log(dirPath);
+        var unzipExtractor = unzip.Extract({ path: dirPath });
+        unzipExtractor.on('error', function(err) {
+            throw err;
+        });
+        unzipExtractor.on('close', testExtractionResults);
+
+        fs.createReadStream(archive).pipe(unzipExtractor);
+
+        function testExtractionResults() {
+            dirdiff(path.join(__dirname, '../testData/uncompressed/lorem_unziped'), dirPath, {
+                fileContents: true
+            }, function (err, diffs) {
+                if (err) {
+                    throw err;
+                }
+                t.equal(diffs.length, 0, 'extracted directory contents');
+                t.end();
+            });
+        }
+    });
 });