v0.0.9 - fix file watching and function inheritance from pointer to file and folder

Author: DeadAlready

lib/file.js

@@ -16,7 +16,13 @@ function File(obj) {
 
 	// Copy properties from pointer
 	Object.getOwnPropertyNames(pointer).forEach(function (prop) {
-		Object.defineProperty(self, prop, Object.getOwnPropertyDescriptor(pointer, prop));
+        var desc = Object.getOwnPropertyDescriptor(pointer, prop);
+        if (prop.charAt(1) === '_') {
+            desc.value = function (arg1, arg2) {
+                pointer[prop](arg1, arg2);
+            }
+        }
+        Object.defineProperty(self, prop, desc);
 	});
 
 	Object.defineProperties(self, {

lib/folder.js

@@ -18,10 +18,16 @@ function Folder(obj) {
 	var pointer = obj.pointer || new Pointer(obj);
 	var pointers = undefined;
 
-	// Copy properties from pointer
-	Object.getOwnPropertyNames(pointer).forEach(function (prop) {
-		Object.defineProperty(self, prop, Object.getOwnPropertyDescriptor(pointer, prop));
-	});
+    // Copy properties from pointer
+    Object.getOwnPropertyNames(pointer).forEach(function (prop) {
+        var desc = Object.getOwnPropertyDescriptor(pointer, prop);
+        if (prop.charAt(1) === '_') {
+            desc.value = function (arg1, arg2) {
+                pointer[prop](arg1, arg2);
+            }
+        }
+        Object.defineProperty(self, prop, desc);
+    });
 
 	Object.defineProperties(self, {
 		// Overwrite type to directory

lib/pointer.js

@@ -56,6 +56,10 @@ function Pointer(obj) {
 		_stats: {
 			get: function () { return stats;},
 			set: function (s) {
+                // file changed
+                if(!stats || stats.mtime.getTime() !== s.mtime.getTime()) {
+                    eventer.emit('change', s);
+                }
 				stats = s;
 				if (stats) {
 					var newType = stats.isDirectory() ? 'directory' : 'file';
@@ -92,6 +96,11 @@ function Pointer(obj) {
 					return;
 				}
 				fs.stat(self._path, function (err, _stats) {
+                    if (err) {
+                        eventer.emit('error', err);
+                        callback(err);
+                        return;
+                    }
 					self._stats = _stats;
 					callback(err, _stats);
 				});
@@ -162,17 +171,8 @@ function Pointer(obj) {
 		['change', 'error'].forEach(function (ev) {
 			fsWatch.on(ev, function () {
 				fsWatch.close();
-				self.__stats(true, function (err, _stats) {
-					// file moved or renamed
-					if (err) {
-						eventer.emit('error');
-						return;
-					}
-					// file changed
-					if(!self._stats || self._stats.mtime !== _stats.mtime) {
-						eventer.emit('change', _stats);
-					}
-					self._stats = _stats;
+				self.__stats(true, function () {
+                    watcher = null;
 					self.__startWatch();
 				});
 			});

package.json

@@ -7,7 +7,7 @@
     "files",
     "pointer"
   ],
-  "version": "0.0.8",
+  "version": "0.0.9",
   "repository": {
     "type": "git",
     "url": "git@github.com:DeadAlready/node-file-pointer"
@@ -25,4 +25,4 @@
   "engines": {
     "node": ">=0.8.0"
   }
-}
+}