Merge pull request #17 from mrpollo/api_load_path_context

Api load path context

Author: geeksville

droneapi/lib/__init__.py

@@ -2,6 +2,8 @@
 import threading
 from pymavlink import mavutil
 
+local_path = ''
+
 def web_connect(authinfo):
     """
     Connect to the central dronehub server

droneapi/module/api.py

@@ -1,3 +1,4 @@
+import os
 import time
 import threading
 import traceback
@@ -342,6 +343,8 @@ def __init__(self, mpstate):
         self.web = None
         self.web_interface = 0
         self.web_serverid = None
+
+        self.local_path = os.path.dirname(os.getcwd())
         print("DroneAPI loaded")
 
     def __on_change(self, *args):
@@ -434,7 +437,8 @@ def send_to_server(self, m):
                 pass
 
     def thread_remove(self, t):
-        del self.threads[t.thread_num]
+        if t.thread_num in self.threads.keys():
+            del self.threads[t.thread_num]
 
     def thread_add(self, t):
         self.threads[t.thread_num] = t
@@ -445,7 +449,8 @@ def cmd_list(self):
             print str(t)
 
     def cmd_kill(self, n):
-        self.threads[n].kill()
+        if self.threads[n].isAlive():
+            self.threads[n].kill()
 
     def get_connection(self):
         return self.api
@@ -529,10 +534,22 @@ def cmd_api(self, args):
                 # Just kill the youngest
                 self.cmd_kill(max(self.threads.keys))
         elif args[0] == "start":
-            if len(args) != 2:
-                print("usage: api load <filename>")
+            if len(args) < 2:
+                print("usage: api start <filename> <local_path:optional>")
                 return
-            g = { "local_connect" : self.get_connection }
+
+            g = {
+                "local_connect" : self.get_connection,
+                "local_path": self.local_path
+            }
+
+            # define local_path in target file
+            # this helps to add context to apps
+            # that need to load external resources
+            # w/o relative paths
+            if len(args) == 3:
+                g["local_path"] = args[2]
+
             APIThread(self, lambda: execfile(args[1], g), args[1])
         else:
             print("Invalid api subcommand")