Merge pull request #153 from kadledav/master

Added support for electron original-fs

Author: cthackers

README.md

@@ -1,4 +1,6 @@
-# ADM-ZIP for NodeJS
+# ADM-ZIP for NodeJS with added support for electron original-fs
+
+* see comit https://github.com/kadledav/adm-zip/commit/3902bb2639dc4a39f1a2e8566219e085ff12a9d0
 
 ADM-ZIP is a pure JavaScript implementation for zip data compression for [NodeJS](http://nodejs.org/). 
 

adm-zip.js

@@ -1,11 +1,11 @@
-var fs = require("fs"),
+var Utils = require("./util");
+var fs = Utils.FileSystem.require(),
     pth = require("path");
 
 fs.existsSync = fs.existsSync || pth.existsSync;
 
 var ZipEntry = require("./zipEntry"),
-    ZipFile =  require("./zipFile"),
-    Utils = require("./util");
+    ZipFile =  require("./zipFile");
 
 var isWin = /^win/.test(process.platform);
 

package.json

@@ -1,14 +1,14 @@
 {
-    "name": "adm-zip",
+    "name": "adm-zip-electron",
     "version": "0.4.7",
-    "description": "A Javascript implementation of zip for nodejs. Allows user to create or extract zip files both in memory or to/from disk",
+    "description": "Fork of a Javascript implementation of zip for nodejs with support for electron original-fs. Allows user to create or extract zip files both in memory or to/from disk",
     "keywords": [
         "zip",
         "methods",
         "archive",
         "unzip"
     ],
-    "homepage": "http://github.com/cthackers/adm-zip",
+    "homepage": "https://github.com/kadledav/adm-zip",
     "author": "Nasca Iacob <[email protected]> (https://github.com/cthackers)",
     "bugs": {
         "email": "[email protected]",

util/fattr.js

@@ -1,4 +1,4 @@
-var fs = require("fs"),
+var fs = require("./fileSystem").require(),
     pth = require("path");
 
 fs.existsSync = fs.existsSync || pth.existsSync;

util/fileSystem.js

@@ -0,0 +1,3 @@
+exports.require = function() {
+  return require(process.versions['electron'] ? "original-fs" : "fs");
+};

util/index.js

@@ -1,4 +1,5 @@
 module.exports = require("./utils");
+module.exports.FileSystem = require("./fileSystem");
 module.exports.Constants = require("./constants");
 module.exports.Errors = require("./errors");
 module.exports.FileAttr = require("./fattr");

util/utils.js

@@ -1,4 +1,4 @@
-var fs = require("fs"),
+var fs = require("./fileSystem").require(),
     pth = require('path');
 
 fs.existsSync = fs.existsSync || pth.existsSync;

zipFile.js

@@ -7,7 +7,7 @@ module.exports = function(/*String|Buffer*/input, /*Number*/inputType) {
         entryTable = {},
         _comment = new Buffer(0),
         filename = "",
-        fs = require("fs"),
+        fs = Utils.FileSystem.require(),
         inBuffer = null,
         mainHeader = new Headers.MainHeader();