Merge pull request #1 from purplecabbage/CB-5492

Cb 5492
apache · Nov 26, 2013 · 5977d74 · 5977d74
2 parents a54c930 + 2d7f08d
commit 5977d74
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/src/metadata/windows8_parser.js b/src/metadata/windows8_parser.js
@@ -242,25 +242,26 @@ module.exports.prototype = {
         // save file
         fs.writeFileSync(this.jsproj_path, jsproj_xml.write({indent:4}), 'utf-8');
     },
-    // Returns an array of all the files in the given directory with reletive paths
+    // Returns an array of all the files in the given directory with relative paths
     // - name     : the name of the top level directory (i.e all files will start with this in their path)
-    // - path     : the directory whos contents will be listed under 'name' directory
+    // - dir     : the directory whos contents will be listed under 'name' directory
     folder_contents:function(name, dir) {
         var results = [];
         var folder_dir = fs.readdirSync(dir);
         for(item in folder_dir) {
             var stat = fs.statSync(path.join(dir, folder_dir[item]));
-            // means its a folder?
-            if(stat.size == 0) {
+
+            if(stat.isDirectory()) {
                 var sub_dir = this.folder_contents(path.join(name, folder_dir[item]), path.join(dir, folder_dir[item]));
                 //Add all subfolder item paths
                 for(sub_item in sub_dir) {
                     results.push(sub_dir[sub_item]);
                 }
             }
-            else {
+            else if(stat.isFile()) {
                 results.push(path.join(name, folder_dir[item]));
             }
+            // else { it is a FIFO, or a Socket, Symbolic Link or something ... } 
         }
         return results;
     },

diff --git a/src/metadata/wp7_parser.js b/src/metadata/wp7_parser.js
@@ -213,25 +213,26 @@ module.exports.prototype = {
         // save file
         fs.writeFileSync(this.csproj_path, csproj_xml.write({indent:4}), 'utf-8');
     },
-    // Returns an array of all the files in the given directory with reletive paths
+    // Returns an array of all the files in the given directory with relative paths
     // - name     : the name of the top level directory (i.e all files will start with this in their path)
-    // - path     : the directory whos contents will be listed under 'name' directory
+    // - dir      : the directory whos contents will be listed under 'name' directory
     folder_contents:function(name, dir) {
         var results = [];
         var folder_dir = fs.readdirSync(dir);
         for(item in folder_dir) {
             var stat = fs.statSync(path.join(dir, folder_dir[item]));
-            // means its a folder?
-            if(stat.size == 0) {
+
+            if(stat.isDirectory()) {
                 var sub_dir = this.folder_contents(path.join(name, folder_dir[item]), path.join(dir, folder_dir[item]));
                 //Add all subfolder item paths
                 for(sub_item in sub_dir) {
                     results.push(sub_dir[sub_item]);
                 }
             }
-            else {
+            else if(stat.isFile()) {
                 results.push(path.join(name, folder_dir[item]));
             }
+            // else { it is a FIFO, or a Socket or something ... } 
         }
         return results;
     },

diff --git a/src/metadata/wp8_parser.js b/src/metadata/wp8_parser.js
@@ -219,25 +219,26 @@ module.exports.prototype = {
         // save file
         fs.writeFileSync(this.csproj_path, csproj_xml.write({indent:4}), 'utf-8');
     },
-    // Returns an array of all the files in the given directory with reletive paths
+    // Returns an array of all the files in the given directory with relative paths
     // - name     : the name of the top level directory (i.e all files will start with this in their path)
-    // - path     : the directory whos contents will be listed under 'name' directory
+    // - dir     : the directory whos contents will be listed under 'name' directory
     folder_contents:function(name, dir) {
         var results = [];
         var folder_dir = fs.readdirSync(dir);
         for(item in folder_dir) {
             var stat = fs.statSync(path.join(dir, folder_dir[item]));
-            // means its a folder?
-            if(stat.size == 0) {
+
+            if(stat.isDirectory()) {
                 var sub_dir = this.folder_contents(path.join(name, folder_dir[item]), path.join(dir, folder_dir[item]));
                 //Add all subfolder item paths
                 for(sub_item in sub_dir) {
                     results.push(sub_dir[sub_item]);
                 }
             }
-            else {
+            else if(stat.isFile()) {
                 results.push(path.join(name, folder_dir[item]));
             }
+            // else { it is a FIFO, or a Socket or something ... } 
         }
         return results;
     },