Updated fileMode handling in tree_entry.js

faceleg · faceleg · commit c4bffab74748 · 2013-04-03T23:45:30.000+13:00
diff --git a/lib/tree_entry.js b/lib/tree_entry.js
@@ -1,6 +1,15 @@
 var git = require('../'),
   success = require('./utilities').success;
 
+var fileModeIsFile = function(fileMode, instance) {
+  return fileMode === instance.fileModes.GIT_FILEMODE_BLOB ||
+          fileMode === instance.fileModes.GIT_FILEMODE_BLOB_EXECUTABLE;
+};
+
+var fileModeIsDirectory = function(fileMode, instance) {
+  return fileMode === instance.fileModes.GIT_FILEMODE_TREE;
+};
+
 /**
  * Convenience tree entry constructor.
  *
@@ -29,12 +38,12 @@ var TreeEntry = function(rawRepo, rawTreeEntry) {
  * @enum {Integer}
  */
 TreeEntry.prototype.fileModes = {
-  /** 0000000 */ GIT_FILEMODE_NEW: git.raw.TreeEntry.GIT_FILEMODE_NEW,
-  /** 0040000 */ GIT_FILEMODE_TREE: git.raw.TreeEntry.GIT_FILEMODE_TREE,
-  /** 0100644 */ GIT_FILEMODE_BLOB: git.raw.TreeEntry.GIT_FILEMODE_BLOB,
-  /** 0100755 */ GIT_FILEMODE_BLOB_EXECUTABLE: git.raw.TreeEntry.GIT_FILEMODE_BLOB_EXECUTABLE,
-  /** 0120000 */ GIT_FILEMODE_LINK: git.raw.TreeEntry.GIT_FILEMODE_LINK,
-  /** 0160000 */ GIT_FILEMODE_COMMIT: git.raw.TreeEntry.GIT_FILEMODE_COMMIT
+  /** 0000000 */ GIT_FILEMODE_NEW: git.raw.TreeEntry.fileModes.GIT_FILEMODE_NEW,
+  /** 0040000 */ GIT_FILEMODE_TREE: git.raw.TreeEntry.fileModes.GIT_FILEMODE_TREE,
+  /** 0100644 */ GIT_FILEMODE_BLOB: git.raw.TreeEntry.fileModes.GIT_FILEMODE_BLOB,
+  /** 0100755 */ GIT_FILEMODE_BLOB_EXECUTABLE: git.raw.TreeEntry.fileModes.GIT_FILEMODE_BLOB_EXECUTABLE,
+  /** 0120000 */ GIT_FILEMODE_LINK: git.raw.TreeEntry.fileModes.GIT_FILEMODE_LINK,
+  /** 0160000 */ GIT_FILEMODE_COMMIT: git.raw.TreeEntry.fileModes.GIT_FILEMODE_COMMIT
 };
 
 /**
@@ -91,13 +100,13 @@ TreeEntry.prototype.isFile = function(callback) {
    */
   var self = this;
   if (typeof self._cache.fileMode !== 'undefined') {
-    callback(null, self._cache.fileMode === self.GIT_FILEMODE_BLOB);
+    callback(null, fileModeIsFile(self._cache.fileMode, self));
     return;
   }
   self.rawEntry.fileMode(function(error, fileMode) {
     if (success(error, callback)) {
       self._cache.fileMode = fileMode;
-      callback(null, self._cache.fileMode === self.GIT_FILEMODE_BLOB);
+      callback(null, fileModeIsFile(self._cache.fileMode, self));
     }
   });
 };
@@ -110,13 +119,13 @@ TreeEntry.prototype.isFile = function(callback) {
 TreeEntry.prototype.isDirectory = function(callback) {
   var self = this;
   if (typeof self._cache.fileMode !== 'undefined') {
-    callback(null, self._cache.fileMode === self.GIT_FILEMODE_TREE);
+    callback(null, fileModeIsDirectory(self._cache.fileMode, self));
     return;
   }
   self.rawEntry.fileMode(function(error, fileMode) {
     if (success(error, callback)) {
       self._cache.fileMode = fileMode;
-      callback(null, self._cache.fileMode === self.GIT_FILEMODE_TREE);
+      callback(null, fileModeIsDirectory(self._cache.fileMode, self));
     }
   });
 };
