fsinfo operation will fail in case there are no files on the esp module

AndiDittrich · Jan 24, 2016 · e607f1d · e607f1d
1 parent 53fb974
commit e607f1d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,6 @@
+### 1.3.2 ###
+* Bugfix: `fsinfo` operation will fail in case there are no files on the esp module - thanks to [soldair on GitHub](https://github.com/AndiDittrich/NodeMCU-Tool/pull/1)
+
 ### 1.3.1 ###
 * Bugfix: Tool throws a fatal error in case `.nodemcutool` file is not available
 

diff --git a/lib/NodeMcuConnector.js b/lib/NodeMcuConnector.js
@@ -317,27 +317,32 @@ NodeMcuConnector.prototype.fsinfo = function(cb){
                 return;
             }
 
-            if (response.length == 0){
-                cb(null, meta, {});
-            }else{
-                var entries = response.trim().split(';');
+            // file-list to return
+            var files = [];
 
-                var files = [];
+            // files available (list not empty) ?
+            if (response.length > 0){
+                // split the file-list by ";"
+                var entries = response.trim().split(';');
 
+                // process each entry
                 entries.forEach(function(entry){
+                    // entry format: <name>:<size>
                     var matches = /^(.*):(\d+)$/gi.exec(entry);
 
+                    // valid format ?
                     if (matches){
+                        // append file entry to list
                         files.push({
                             name: matches[1],
                             size: parseInt(matches[2])
                         });
                     }
                 });
-
-                // run callback
-                cb(null, meta, files);
             }
+
+            // run callback
+            cb(null, meta, files);
         });
     }.bind(this));
 };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodemcu-tool",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Command line tool to upload and manage files on your NodeMCU / ESP8266 Module.",
   "keywords": [
     "cli",
@@ -32,7 +32,7 @@
   "author": "Andi Dittrich (http://andidittrich.de)",
   "license": "MIT",
   "dependencies": {
-    "cli-progress": "^1.0.1",
+    "cli-progress": "^1.1.1",
     "colors": "^1.1.2",
     "commander": "^2.9.0",
     "prompt": "^0.2.14",