wip #109 fix #118p

Author: previ

api.py

@@ -11,7 +11,7 @@
 from tinydb.operations import delete
 from cachetools import cached, TTLCache
 from coderbot import CoderBot
-from program import ProgramEngine
+from program import ProgramEngine, Program
 from config import Config
 
 bot_config = Config.get()
@@ -156,7 +156,7 @@ def saveProgram(data, overwrite):
     existing_program = prog_engine.load(data["name"])
     if existing_program and not overwrite:
         return "askOverwrite"
-    elif existing_program and existing_program["default"] == True:
+    elif existing_program and existing_program.is_default() == True:
         return "defaultOverwrite"
     program = Program(name=data["name"], code=data["code"], dom_code=data["dom_code"])
     prog_engine.save(program)

cv/image.py

@@ -39,8 +39,7 @@
 MIN_MATCH_COUNT = 10
 
 try:
-    import zbar
-    code_scanner = zbar.ImageScanner()
+    from pyzbar.pyzbar import decode
 except:
     logging.info("zbar not availabe")
 
@@ -259,8 +258,8 @@ def find_qr_code(self):
         text_found = None
         img_size = self._data.shape
         gray = cv2.cvtColor(self._data, cv2.COLOR_BGR2GRAY)
-        image_code = zbar.Image(img_size[1], img_size[0], "Y800", gray.tostring())
-        code_num = code_scanner.scan(image_code)
+        image_code = decode(gray)
+        logging.warning(str(image_code))
         for symbol in image_code:
             text_found = symbol.data
             break

data/programs.json

@@ -1 +1 @@
-{"_default": {"1": {"filename": "./data/program_cnn_test.json", "name": "cnn_test", "default": "False"}, "2": {"filename": "./data/program_test_record_sound.json", "name": "test_record_sound", "default": "False"}, "3": {"filename": "./data/program_event_test.data", "name": "event_test", "default": "False"}, "4": {"filename": "./data/defaults/programs/program_demo_obstacle_avoidance.json", "name": "demo_obstacle_avoidance", "default": "True"}, "5": {"filename": "./data/defaults/programs/program_demo_line_follower.json", "name": "demo_line_follower", "default": "True"}, "6": {"filename": "./data/defaults/programs/program_test_find_code.json", "name": "test_find_code", "default": "True"}, "7": {"filename": "./data/defaults/programs/program_demo_color_seeker.json", "name": "demo_color_seeker", "default": "True"}, "8": {"filename": "./data/defaults/programs/program_demo_sound_clap_control.json", "name": "demo_sound_clap_control", "default": "True"}, "9": {"filename": "./data/defaults/programs/program_test_sound_hear.json", "name": "test_sound_hear", "default": "True"}, "10": {"filename": "./data/defaults/programs/program_test_find_path_ahead.json", "name": "test_find_path_ahead", "default": "True"}, "11": {"filename": "./data/defaults/programs/program_test_find_face.json", "name": "test_find_face", "default": "True"}, "12": {"filename": "./data/defaults/programs/program_test_img_average.json", "name": "test_img_average", "default": "True"}, "13": {"filename": "./data/defaults/programs/program_test_cnn.json", "name": "test_cnn", "default": "True"}, "14": {"filename": "./data/defaults/programs/program_test_sound.json", "name": "test_sound", "default": "True"}, "15": {"filename": "./data/defaults/programs/program_test_find_text.json", "name": "test_find_text", "default": "True"}, "16": {"filename": "./data/defaults/programs/program_demo_ar.json", "name": "demo_ar", "default": "True"}, "17": {"filename": "./data/defaults/programs/program_test_find_color.json", "name": "test_find_color", "default": "True"}, "18": {"filename": "./data/defaults/programs/program_test_sonar.json", "name": "test_sonar", "default": "True"}, "19": {"filename": "./data/defaults/programs/program_test_sound_rec.json", "name": "test_sound_rec", "default": "True"}}}
+{"_default": {"1": {"default": "False", "filename": "./data/program_cnn_test.json", "name": "cnn_test"}, "2": {"default": "False", "filename": "./data/program_test_record_sound.json", "name": "test_record_sound"}, "3": {"default": "False", "filename": "./data/program_event_test.data", "name": "event_test"}, "4": {"default": "True", "filename": "./data/defaults/programs/program_demo_obstacle_avoidance.json", "name": "demo_obstacle_avoidance"}, "5": {"default": "True", "filename": "./data/defaults/programs/program_demo_line_follower.json", "name": "demo_line_follower"}, "6": {"default": "True", "filename": "./data/defaults/programs/program_test_find_code.json", "name": "test_find_code"}, "7": {"default": "True", "filename": "./data/defaults/programs/program_demo_color_seeker.json", "name": "demo_color_seeker"}, "8": {"default": "True", "filename": "./data/defaults/programs/program_demo_sound_clap_control.json", "name": "demo_sound_clap_control"}, "9": {"default": "True", "filename": "./data/defaults/programs/program_test_sound_hear.json", "name": "test_sound_hear"}, "10": {"default": "True", "filename": "./data/defaults/programs/program_test_find_path_ahead.json", "name": "test_find_path_ahead"}, "11": {"default": "True", "filename": "./data/defaults/programs/program_test_find_face.json", "name": "test_find_face"}, "12": {"default": "True", "filename": "./data/defaults/programs/program_test_img_average.json", "name": "test_img_average"}, "13": {"default": "True", "filename": "./data/defaults/programs/program_test_cnn.json", "name": "test_cnn"}, "14": {"default": "True", "filename": "./data/defaults/programs/program_test_sound.json", "name": "test_sound"}, "15": {"default": "True", "filename": "./data/defaults/programs/program_test_find_text.json", "name": "test_find_text"}, "16": {"default": "True", "filename": "./data/defaults/programs/program_demo_ar.json", "name": "demo_ar"}, "17": {"default": "True", "filename": "./data/defaults/programs/program_test_find_color.json", "name": "test_find_color"}, "18": {"default": "True", "filename": "./data/defaults/programs/program_test_sonar.json", "name": "test_sonar"}, "19": {"default": "True", "filename": "./data/defaults/programs/program_test_sound_rec.json", "name": "test_sound_rec"}}}

main.py

@@ -72,11 +72,11 @@ def serve_vue_app(filename):
     """
     return send_from_directory('dist', filename)
 
-@app.route('/docs/<path:filename')
+@app.route('/docs/<path:filename>')
 def serve_docs_app(filename):
     """
     Serve (a build of) the documentation
-    'cb_docs' is the output of `npx vuepress build pages/` 
+    'cb_docs' is the output of `npx vuepress build pages/`
     from the 'docs' repository
     """
     return send_from_directory('cb_docs', filename)

program.py

@@ -89,12 +89,12 @@ def save(self, program):
         query = Query()
         self._program = program
         program_db_entry = program.as_dict()
-        program_db_entry["filename"] = os.path.join(PROGRAM_PATH, PROGRAM_PREFIX, program.name, PROGRAM_SUFFIX)
+        program_db_entry["filename"] = os.path.join(PROGRAM_PATH, PROGRAM_PREFIX + program.name + PROGRAM_SUFFIX)
         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)
-        f = open(program_db_entry["filename"], 'w')
+        f = open(program_db_entry["filename"], 'w+')
         json.dump(program.as_dict(), f)
         f.close()
 
@@ -111,8 +111,8 @@ def delete(self, name):
         query = Query()
         program_db_entries = self._programs.search(query.name == name)
         if program_db_entries != []:
+            os.remove(program_db_entries[0]["filename"])
             self._programs.remove(query.name == name)
-            os.remove(program_db_entry["filename"])
 
     def create(self, name, code):
         self._program = Program(name, code)
@@ -174,6 +174,9 @@ def check_end(self):
     def is_running(self):
         return self._running
 
+    def is_default(self):
+        return self._default
+
     def run(self):
         try:
             program = self

requirements_stub.txt

@@ -30,6 +30,7 @@ protobuf==3.6.1
 Pypubsub==4.0.0
 pytz==2018.4
 pyyaml>=4.2b1
+pyzbar==0.1.7
 requests==2.20.0
 six==1.11.0
 smbus2==0.2.0