add default activity init

Author: previ

activity.py

@@ -0,0 +1,52 @@
+from tinydb import TinyDB, Query
+from tinydb.operations import delete
+
+# Programs and Activities databases
+class Activities():
+    _instance = None
+        
+    @classmethod
+    def get_instance(cls):
+        if cls._instance == None:
+            cls._instance = Activities()
+        return cls._instance
+
+    def __init__(self):
+        self.activities = TinyDB("data/activities.json")
+        self.query = Query()
+
+    def load(self, name):
+        return self.activities.search(self.query.name == name)[0]
+
+    def save(self, activity):
+        if self.activities.search(self.query.name == activity["name"]) == []:
+            self.activities.insert(activity)
+        else:
+            self.activities.update(activity, self.query.name == activity["name"])
+
+    def delete(self, activity):
+        activities.remove(self.query.name == activity["name"])
+
+
+    def list(self):
+        return self.activities.all()
+    
+    def init_default(self):
+        activities_collection = self.activities.search(self.query.stock == True)
+        if len(activities_collection) == 0:
+            activity = {
+                "name": "default",
+                "stock": True,
+                "codeFont": 'ubuntumono',
+                "description": None,
+                "drawerEnabled": True,
+                "exec": {
+                    "camera": True,
+                    "log": True,
+                },
+                "fontSize": 'Medio',
+                "showName": True,
+                "maxBlocks": None,
+            }
+            self.save(activity)
+ 

api.py

@@ -8,15 +8,14 @@
 import json
 import logging
 import connexion
-from tinydb import TinyDB, Query
-from tinydb.operations import delete
+import pigpio
 from cachetools import cached, TTLCache
 from coderbot import CoderBot
 from program import ProgramEngine, Program
 from config import Config
+from activity import Activities
 from coderbotTestUnit import run_test as runCoderbotTestUnit
 from cnn_manager import CNNManager
-import pigpio
 from musicPackages import MusicPackageManager
 
 BUTTON_PIN = 16
@@ -27,8 +26,6 @@
     encoder=bool(bot_config.get("encoder"))
 )
 
-query = Query()
-
 def get_serial():
     """
     Extract serial from cpuinfo file
@@ -110,8 +107,7 @@ def get_info():
 prog = None
 prog_engine = ProgramEngine.get_instance()
 
-# Programs and Activities databases
-activities = TinyDB("data/activities.json")
+activities = Activities.get_instance()
 
 ## Robot control
 
@@ -247,23 +243,17 @@ def listPrograms():
 ## Activities
 
 def saveActivity(data):
-    data = data["activity"]
-    if activities.search(query.name == data["name"]) == []:
-        activities.insert(data)
-        return 200
-    else:
-        activities.update(data, query.name == data["name"])
-        return 200
+    activity = data["activity"]
+    activities.save(activity)
 
 def loadActivity(name):
-    return activities.search(query.name == name)[0], 200
+    return activities.load(name)
 
 def deleteActivity(data):
-    activities.remove(query.name == data["name"])
-
+    activities.delete(data), 200
 
 def listActivities():
-    return activities.all()
+    return activities.list()
 
 def resetDefaultPrograms():
     """

main.py

@@ -32,6 +32,8 @@
 from event import EventManager
 from audioControls import AudioCtrl
 from musicPackages import MusicPackageManager
+from activity import Activities
+
 # Logging configuration
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)
@@ -484,14 +486,8 @@ def run_server():
             EventManager.get_instance("coderbot")
 
             # Programs and Activities databases
-            activities = TinyDB("data/activities.json")
-            activities_collection = activities.search(query.stock == True)
-            if len(activities_collection) == 0:
-              activity = {
-                name: "default"
-                stock: True
-              }
-              activities.insert(activity)
+            activities = Activities.get_instance()
+            activities.init_default()
 
             if app.bot_config.get('load_at_start') and app.bot_config.get('load_at_start'):
                 prog = app.prog_engine.load(app.bot_config.get('load_at_start'))