Ignore project.pymakr file in upload/download, multiple bugfixes in upload and download features

Author: RalphHogenbirk

lib/board/project-status.js

@@ -16,6 +16,7 @@ export default class ProjectStatus {
   constructor(shell,settings,local_folder){
     this.shell = shell
     this.logger = new Logger('ProjectStatus')
+    this.utils = new Utils(settings)
     this.local_folder = local_folder
     this.settings = settings
     this.allowed_file_types = this.settings.get_allowed_file_types()
@@ -27,7 +28,6 @@ export default class ProjectStatus {
 
   read(cb){
     var _this = this
-    console.log("Reading project status file")
     this.shell.readFile('project.pymakr',function(err,content_buffs,content_str){
       if(err){
         cb(err)
@@ -100,9 +100,11 @@ export default class ProjectStatus {
     }
     var file_hashes = {}
 
+    files = this.utils.ignore_filter(files)
+
     for(var i=0;i<files.length;i++){
       var filename = path + files[i]
-      if(filename.length > 0 && filename.substring(0,1) != "." && files[i].substring(0,1) != "." && files[i].length > 0){
+      if(filename.length > 0 && filename.substring(0,1) != "."){
         var file_path = this.local_folder + filename
         var stats = fs.lstatSync(file_path)
         if(stats.isDirectory()){
@@ -112,10 +114,8 @@ export default class ProjectStatus {
             file_hashes[filename] = [filename,"d",hash]
             var hashes_in_folder = this.__get_local_files_hashed(files_from_folder,filename+"/")
             file_hashes = Object.assign(file_hashes,hashes_in_folder)
-          }else{
-            console.log("No files in folder "+file_path)
           }
-        }else if(this.settings.sync_all_file_types || this.allowed_file_types.indexOf(filename.split('.').pop()) > -1){
+        }else{
           this.total_file_size += stats.size
           this.total_number_of_files += 1
           var contents = fs.readFileSync(file_path)
@@ -124,7 +124,6 @@ export default class ProjectStatus {
         }
       }
     }
-    console.log(file_hashes)
     return file_hashes
   }
 
@@ -135,28 +134,20 @@ export default class ProjectStatus {
     var board_hashes = Object.assign({}, this.board_file_hashes)
     var local_hashes = Object.assign({}, this.local_file_hashes)
 
-    console.log(board_hashes)
-    console.log(local_hashes)
-
     // all local files
     for(var name in local_hashes){
       var local_hash = this.local_file_hashes[name]
       var board_hash = board_hashes[name]
-      console.log(board_hash)
-      console.log(local_hash)
 
       if(board_hash){
-        // check is hash is the same
-        console.log(local_hash[2],board_hash[2])
+        // check if hash is the same
         if (local_hash[2] != board_hash[2]){
 
           if(local_hash[1] == "f"){
             changed_files.push(local_hash)
           }else{
             changed_folders.push(local_hash)
           }
-        }else{
-          console.log("Same..")
         }
         delete board_hashes[name]
 

lib/board/pyboard.js

@@ -159,12 +159,13 @@ export default class Pyboard {
     this.send(CTRL_D,cb,5000)
   }
 
-  safe_boot(cb){
+  safe_boot(cb,timeout){
     var _this = this
     this.logger.info("Safe boot")
     this.send_wait_for(CTRL_F,'Type "help()" for more information.\r\n>>>',function(err){
+      this.logger.info("Safe boot done...")
       cb(err)
-    },4000)
+    },timeout)
 
   }
 
@@ -174,10 +175,11 @@ export default class Pyboard {
     },5000)
   }
 
-  stop_running_programs_double(cb){
+  stop_running_programs_double(cb,timeout){
+
     this.send_wait_for(CTRL_C+CTRL_C,">>>",function(err){
       if(cb) cb(err)
-    },5000)
+    },timeout)
   }
 
 
@@ -483,15 +485,17 @@ export default class Pyboard {
 
 
     var _this = this
+    clearTimeout(this.waiting_for_timer)
     if(timeout){
       this.waiting_for_timer = setTimeout(function(){
         if (_this.waiting_for_cb) {
-          _this.waiting_for_cb(new Error("timeout"),_this.receive_buffer)
+          var tmp_cb = _this.waiting_for_cb
           _this.waiting_for_cb = null
           _this.wait_for_block = false
           _this.waiting_for = null
           _this.receive_buffer = ""
           _this.receive_buffer_raw = Buffer(0)
+          tmp_cb(new Error("timeout"),_this.receive_buffer)
         }
       },timeout)
     }

lib/board/shell.js

@@ -22,7 +22,7 @@ export default class Shell {
     this.api = new ApiWrapper()
     this.logger = new Logger('Shell')
     this.workers = new ShellWorkers(this,pyboard,settings)
-    this.utils = new Utils()
+    this.utils = new Utils(settings)
     var lib_folder = this.api.getPackageSrcPath()
 
     this.logger.silly("Try to enter raw mode")
@@ -199,6 +199,24 @@ export default class Shell {
     })
   }
 
+
+  get_version(cb){
+    var _this = this
+    var command = "import os; os.uname().release\r\n"
+
+    this.eval(command,function(err,content){
+      var version = content.replace(command,'').replace(/>>>/g,'').replace(/'/g,"").replace(/\r\n/g,"").trim()
+      var version_int = _this.utils.calculate_int_version(version)
+      if(version_int == 0 || isNaN(version_int)){
+        err = new Error("Error retrieving version number")
+      }else{
+        err = undefined
+      }
+      cb(err,version_int,version)
+    })
+  }
+
+
   compare_hash(filename,contents,cb){
     cb(true)
     return

lib/board/sync.js

@@ -12,6 +12,8 @@ var path = require('path');
 
 export default class Sync {
 
+
+
   constructor(pyboard,settings,terminal) {
     this.logger = new Logger('Sync')
     this.api = new ApiWrapper()
@@ -24,7 +26,8 @@ export default class Sync {
     this.number_of_changed_files = 0
     this.method_action = "Downloading"
     this.method_name = "Download"
-    this.utils = new Utils()
+
+    this.utils = new Utils(settings)
     this.config = Config.constants()
     this.allowed_file_types = this.settings.get_allowed_file_types()
     this.project_path = this.api.getProjectPath()
@@ -170,7 +173,7 @@ export default class Sync {
 
     this.terminal.write(this.method_action+" project ("+this.folder_name+")...\r\n")
 
-    this.__safe_boot(function(err){
+    _this.__safe_boot(function(err){
 
       if(err){
         _this.logger.error("Safeboot failed")
@@ -180,9 +183,9 @@ export default class Sync {
       }
 
       _this.logger.silly("Start shell")
-
       _this.start_shell(function(err){
         _this.in_raw_mode = true
+
         _this.project_status = new ProjectStatus(_this.shell,_this.settings,_this.py_folder)
         _this.logger.silly("Entered raw mode")
 
@@ -192,8 +195,6 @@ export default class Sync {
           _this.exit()
 
         }else{
-
-
           if(_this.method=='receive'){
             _this.__receive(cb,err)
           }else{
@@ -224,14 +225,13 @@ export default class Sync {
       _this.files = _this._getFilesRecursive("")
       var new_files = []
       var existing_files = []
+      file_list = _this.utils.ignore_filter(file_list)
       for(var i=0;i<file_list.length;i++){
         var file = file_list[i]
-        if(_this.settings.sync_all_file_types || _this.allowed_file_types.indexOf(file.split('.').pop()) > -1){
-          if(_this.files.indexOf(file) > -1){
-            existing_files.push(file)
-          }else{
-            new_files.push(file)
-          }
+        if(_this.files.indexOf(file) > -1){
+          existing_files.push(file)
+        }else{
+          new_files.push(file)
         }
       }
       file_list = existing_files.concat(new_files)
@@ -276,7 +276,6 @@ export default class Sync {
           _this.progress("Downloading "+file_list.length+" "+_this.utils.plural("file",file_list.length)+"...")
           _this.progress_file_count = 0
           _this.number_of_changed_files = file_list.length
-          console.log(file_list)
           _this.receive_files(0,file_list,function(){
             _this.logger.info("All items received")
             _this.progress("All items overritten")
@@ -335,22 +334,11 @@ export default class Sync {
         cb()
         return false
       }
-      _this.get_version(function(err,version,version_str){
-        if(err){
-          _this.logger.info("Error requesting version")
-          _this.progress("Failed getting version number, not safe booting")
-          cb()
-        }else if(version >= _this.config.safeboot_version){
-          _this.logger.info("Safe booting...")
-          _this.progress("Safe booting device... (see settings for more info)")
-          _this.pyboard.safe_boot(cb)
-        }else{
-          _this.logger.info("Version doesn't support safe booting")
-          _this.progress("Safe boot not available for this version ("+version_str+")")
-          cb()
-        }
-      })
-    })
+
+        _this.logger.info("Safe booting...")
+        _this.progress("Safe booting device... (see settings for more info)")
+        _this.pyboard.safe_boot(cb,4000)
+    },500)
   }
 
   receive_files(i,list,cb){
@@ -365,19 +353,27 @@ export default class Sync {
 
       if(err){
         _this.progress("Failed to download "+filename)
+        _this.logger.error(err)
         _this.receive_files(i+1,list,cb)
 
       }else{
         var f = _this.py_folder + filename
         _this.ensureDirectoryExistence(f)
-        var stream = fs.createWriteStream(f)
-        stream.once('open', function(fd) {
-          for(var j=0;j<content_buffer.length;j++){
-              stream.write(content_buffer[j])
-          }
-          stream.end()
+        try{
+          var stream = fs.createWriteStream(f)
+          stream.once('open', function(fd) {
+            for(var j=0;j<content_buffer.length;j++){
+                stream.write(content_buffer[j])
+            }
+            stream.end()
+            _this.receive_files(i+1,list,cb)
+          })
+        }catch(e){
+          _this.logger.error("Failed to open and write "+f)
+          _this.logger.error(e)
+          _this.progress("Failed to write to local file "+filename)
           _this.receive_files(i+1,list,cb)
-        })
+        }
       }
     })
   }

lib/helpers/utils.js

@@ -10,6 +10,14 @@ import Config from '../config.js'
 
 export default class Utils {
 
+  constructor(settings){
+    this.settings = settings
+
+    // TODO: grab from a .pyignore file or setting
+    this.ignore_list = ["project.pymakr"]
+    this.allowed_file_types = this.settings.get_allowed_file_types()
+  }
+
   // runs a worker recursively untill a task is Done
   // worker should take 2 params: value and a continuation callback
     // continuation callback takes 2 params: error and the processed value
@@ -58,6 +66,22 @@ export default class Utils {
     }
   }
 
+  ignore_filter(file_list){
+    var _this = this
+    var new_list = []
+    for(var i=0;i<file_list.length;i++){
+      var file = file_list[i]
+      if(file && file != "" && file.length > 0 && file.substring(0,1) != "."){
+        if(file.indexOf(".") == -1 || this.settings.sync_all_file_types || this.allowed_file_types.indexOf(file.split('.').pop()) > -1){
+          if(this.ignore_list.indexOf(file) == -1){
+            new_list.push(file)
+          }
+        }
+      }
+    }
+    return new_list
+  }
+
 
   calculate_int_version(version){
     var known_types = ['a', 'b', 'rc', 'r']