Merge pull request #77 from zfi/demo

Defensive code for propeller-load launch failure in MacOS

Author: zfi

BlocklyServer.py

@@ -1,5 +1,6 @@
 import base64
 import os
+import sys
 import tempfile
 import logging
 
@@ -26,8 +27,13 @@ def __init__(self, version, queue):
 
         self.version = version
         self.queue = queue
+        self.appdir = os.path.dirname(sys.argv[0])
+        self.logger.debug("Application started from: %s", self.appdir)
+
         queue.put((10, 'INFO', 'Server started'))
 
+    propellerLoad = PropellerLoad()
+
     @cherrypy.expose()
     @cherrypy.tools.json_out()
     @cherrypy.tools.allow(methods=['GET'])
@@ -57,13 +63,13 @@ def ports(self):
             for port in ports:
                 self.logger.debug('Port %s discovered.', port)
                 if ' bt ' not in port.lower() and 'bluetooth' not in port.lower():
-                    self.logger.debug('Port %2 appended to list.', port)
                     filtered_ports.append(port)
+                    self.logger.debug("Port %2 appended to list.", port)
             return filtered_ports
         else:
             # No useable ports detected. Need to determine how the browser
             # handles an empty list of available ports.
-            self.logger.debug('No ports detected. Replying with /dev/null')
+            self.logger.debug("No ports detected. Replying with /dev/null")
             return '/dev/null'
 
 
@@ -72,20 +78,27 @@ def ports(self):
     @cherrypy.tools.allow(methods=['POST'])
     def load(self, action, binary, extension, comport=None):
         if action is None:
-            logger = logging.getLogger('blockly.server')
-            logger.error('Load action is undefined.')
+            self.logger.error('Load action is undefined.')
+            return {
+                'message': 'Load action is undefined',
+                'success': False
+            }
 
         cherrypy.response.headers['Access-Control-Allow-Origin'] = '*'
 
         self.logger.debug('Writing program payload to temp file.')
+
         binary_file = tempfile.NamedTemporaryFile(suffix=extension, delete=False)
         binary_file.write(base64.b64decode(binary))
         binary_file.close()
+
         self.logger.debug('%s saved.', binary_file.name)
 
         self.logger.debug('Loading program to device.')
+
         (success, out, err) = self.propellerLoad.load(action, binary_file, comport)
         self.queue.put((10, 'INFO', 'Application loaded (%s)' % action))
+
         self.logger.info('Application load complete.')
 
         os.remove(binary_file.name)
@@ -102,8 +115,6 @@ def serial_socket(self):
         self.queue.put((10, 'INFO', 'Serial socket set up'))
         handler = cherrypy.request.ws_handler
 
-    propellerLoad = PropellerLoad()
-
 
 def main(port, version, queue):
     module_logger.info("Server starting")

PropellerLoad.py

@@ -7,16 +7,24 @@
 
 __author__ = 'Michel'
 
+module_logger = logging.getLogger('blockly.loader')
 
-class PropellerLoad:
 
+class PropellerLoad:
     loading = False
     ports = []
 
     def __init__(self):
         self.logger = logging.getLogger('blockly.loader')
         self.logger.info('Creating loader logger.')
 
+        # Find the path to the application launch directory
+        self.appdir = os.path.dirname(sys.argv[0])
+        self.logger.debug("Application running from: %s", self.appdir)
+
+#        if not self.appdir:
+#            self.appdir = os.getcwd()
+
         self.propeller_load_executables = {
             "Windows":  "/propeller-tools/windows/propeller-load.exe",
             "Linux":    "/propeller-tools/linux/propeller-load",
@@ -34,9 +42,6 @@ def __init__(self):
             print("Unsupported", platform.system() + " is currently unsupported")
             exit(1)
 
-        self.appdir = os.getcwd()
-        # self.appdir = os.path.dirname(sys.argv[0])
-
     def get_ports(self):
         self.logger.info('Getting ports')
 
@@ -63,9 +68,12 @@ def get_ports(self):
             return ports
 
     def load(self, action, file_to_load, com_port):
-        self.logger.info("Loading code to device")
         self.loading = True
 
+        # Patch until we figure out why the __init__ is not getting called
+        if not self.appdir or self.appdir == '':
+            self.appdir = os.path.dirname(sys.argv[0])
+
         executable = self.appdir + self.propeller_load_executables[platform.system()]
         self.logger.debug('Loader executable path is: %s)', executable)
 
@@ -94,14 +102,17 @@ def load(self, action, file_to_load, com_port):
 
             out, err = process.communicate()
             self.logger.info("Load result is: %s", process.returncode)
+            self.logger.debug("Load error string: %s", err)
+            self.logger.debug("Load output string: %s", out)
 
             if process.returncode == 0:
                 success = True
             else:
                 success = False
 
             self.loading = False
-            return (success, out or '', err or '')
+            return success, out or '', err or ''
+
         except OSError as ex:
             self.logger.error("%s", ex.message)