add lock on TinyDB (#170)

Author: previ

coderbot/activity.py

@@ -1,5 +1,5 @@
 from tinydb import TinyDB, Query
-
+from threading import Lock
 # Programs and Activities databases
 class Activities():
     _instance = None
@@ -13,34 +13,39 @@ def get_instance(cls):
     def __init__(self):
         self.activities = TinyDB("data/activities.json")
         self.query = Query()
+        self.lock = Lock()
 
     def load(self, name, default):
-        if name and default is None:
-            activities = self.activities.search(self.query.name == name)
-            if len(activities) > 0:
-                return activities[0]
-        elif default is not None:
-            if len(self.activities.search(self.query.default == True)) > 0:
-                return self.activities.search(self.query.default == True)[0]
+        with self.lock: 
+            if name and default is None:
+                activities = self.activities.search(self.query.name == name)
+                if len(activities) > 0:
+                    return activities[0]
+            elif default is not None:
+                if len(self.activities.search(self.query.default == True)) > 0:
+                    return self.activities.search(self.query.default == True)[0]
+                return None
             return None
-        return None
 
     def save(self, name, activity):
-        # if saved activity is "default", reset existing default activity to "non-default"
-        if activity.get("default", False) is True:
-            self.activities.update({'default': False})
-        if self.activities.search(self.query.name == name) == []:
-            self.activities.insert(activity)
-        else:
-            self.activities.update(activity, self.query.name == activity["name"])
+        with self.lock: 
+            # if saved activity is "default", reset existing default activity to "non-default"
+            if activity.get("default", False) is True:
+                self.activities.update({'default': False})
+            if self.activities.search(self.query.name == name) == []:
+                self.activities.insert(activity)
+            else:
+                self.activities.update(activity, self.query.name == activity["name"])
 
     def delete(self, name):
-        activities = self.activities.search(self.query.name == name)
-        if len(activities) > 0:
-            activity = activities[0]
-            if activity.get("default", False) is True:
-                self.activities.update({'default': True}, self.query.stock == True)
-            self.activities.remove(self.query.name == activity["name"])
+        with self.lock: 
+            activities = self.activities.search(self.query.name == name)
+            if len(activities) > 0:
+                activity = activities[0]
+                if activity.get("default", False) is True:
+                    self.activities.update({'default': True}, self.query.stock == True)
+                self.activities.remove(self.query.name == activity["name"])
 
     def list(self):
-        return self.activities.all()
+        with self.lock: 
+            return self.activities.all()

coderbot/program.py

@@ -25,6 +25,7 @@
 
 import math
 from tinydb import TinyDB, Query
+from threading import Lock
 
 import coderbot
 import camera
@@ -80,6 +81,7 @@ def __init__(self):
         self._programs = TinyDB(PROGRAMS_DB)
         # initialise DB from default programs
         query = Query()
+        self.lock = Lock()
         for dirname, dirnames, filenames, in os.walk(PROGRAMS_PATH_DEFAULTS):
             dirnames
             for filename in filenames:
@@ -102,28 +104,31 @@ def prog_list(self):
         return self._programs.all()
 
     def save(self, program):
-        query = Query()
-        self._program = program
-        program_db_entry = self._program.as_dict()
-        if self._programs.search(query.name == program.name) != []:
-            self._programs.update(program_db_entry, query.name == program.name)
-        else:
-            self._programs.insert(program_db_entry)
+        with self.lock: 
+            query = Query()
+            self._program = program
+            program_db_entry = self._program.as_dict()
+            if self._programs.search(query.name == program.name) != []:
+                self._programs.update(program_db_entry, query.name == program.name)
+            else:
+                self._programs.insert(program_db_entry)
 
     def load(self, name):
-        query = Query()
-        program_db_entries = self._programs.search(query.name == name)
-        if len(program_db_entries) > 0:
-            prog_db_entry = program_db_entries[0]
-            logging.debug(prog_db_entry)
-            self._program = Program.from_dict(prog_db_entry)
-            return self._program
-        return None
+        with self.lock: 
+            query = Query()
+            program_db_entries = self._programs.search(query.name == name)
+            if len(program_db_entries) > 0:
+                prog_db_entry = program_db_entries[0]
+                logging.debug(prog_db_entry)
+                self._program = Program.from_dict(prog_db_entry)
+                return self._program
+            return None
 
     def delete(self, name):
-        query = Query()
-        program_db_entries = self._programs.search(query.name == name)
-        self._programs.remove(query.name == name)
+        with self.lock: 
+            query = Query()
+            program_db_entries = self._programs.search(query.name == name)
+            self._programs.remove(query.name == name)
 
     def create(self, name, code):
         self._program = Program(name, code)