Simplify and clarify scheduler code.

Author: jburhenn

myDevices/cloud/client.py

@@ -524,11 +524,11 @@ def ProcessScheduleCommand(self, message):
                 for action in message['payload']['actions']:
                     self.mqttClient.transform_command(action)
             if message['suffix'] == 'add':
-                result = self.schedulerEngine.add_scheduled_item(message['payload'], True)
+                result = self.schedulerEngine.add_scheduled_event(message['payload'], True)
             elif message['suffix'] == 'edit':
-                result = self.schedulerEngine.update_scheduled_item(message['payload'])
+                result = self.schedulerEngine.update_scheduled_event(message['payload'])
             elif message['suffix'] == 'delete':
-                result = self.schedulerEngine.remove_scheduled_item(message['payload'])
+                result = self.schedulerEngine.remove_scheduled_event(message['payload'])
             else:
                 error = 'Unknown schedule command: {}'.format(message['suffix'])
             debug('ProcessScheduleCommand result: {}'.format(result))

myDevices/cloud/dbmanager.py

@@ -112,6 +112,6 @@ def test():
     cursor = connection.cursor()
 except Exception as ex:
     error('DbManager failed to initialize: ' + str(ex))
-# DbManager.CreateTable('scheduled_items', "id TEXT PRIMARY KEY, data TEXT", ['id', 'data'])
+# DbManager.CreateTable('scheduled_events', "id TEXT PRIMARY KEY, data TEXT", ['id', 'data'])
 DbManager.CreateTable('disabled_sensors', "id TEXT PRIMARY KEY", ['id'])
 DbManager.CreateTable('historical_averages', "id INTEGER PRIMARY KEY, data TEXT, count INTEGER, start TIMESTAMP, end TIMESTAMP, interval TEXT, send TEXT, count_sensor TEXT", ['id', 'data', 'count', 'start', 'end', 'interval', 'send', 'count_sensor'])