Use the new JSON format for scheduled events.

Author: jburhenn

myDevices/cloud/scheduler.py

@@ -162,24 +162,24 @@ def create_job(self, schedule_item):
         debug('Create job: {}'.format(schedule_item))
         try:
             with self.mutex:
-                event = schedule_item['event']
-                if event['type'] == 'date':
-                    schedule_item['job'] = schedule.once().at(event['start_date'])
-                if event['type'] == 'interval':
-                    if event['unit'] == 'hour':
-                        schedule_item['job'] = schedule.every(event['interval'], event['start_date']).hours
-                    if event['unit'] == 'minute':
-                        schedule_item['job'] = schedule.every(event['interval'], event['start_date']).minutes
-                    if event['unit'] == 'day':
-                        schedule_item['job'] = schedule.every(event['interval'], event['start_date']).days.at(event['start_date'])
-                    if event['unit'] == 'week':
-                        schedule_item['job'] = schedule.every(event['interval'], event['start_date']).weeks.at(event['start_date'])
-                    if event['unit'] == 'month':
-                        schedule_item['job'] = schedule.every(event['interval'], event['start_date']).months.at(event['start_date'])
-                    if event['unit'] == 'year':
-                        schedule_item['job'] = schedule.every(event['interval'], event['start_date']).years.at(event['start_date'])
-                if 'last_run' in event:
-                    schedule_item['job'].set_last_run(event['last_run'])
+                config = schedule_item['event']['config']
+                if config['type'] == 'date':
+                    schedule_item['job'] = schedule.once().at(config['start_date'])
+                if config['type'] == 'interval':
+                    if config['unit'] == 'hour':
+                        schedule_item['job'] = schedule.every(config['interval'], config['start_date']).hours
+                    if config['unit'] == 'minute':
+                        schedule_item['job'] = schedule.every(config['interval'], config['start_date']).minutes
+                    if config['unit'] == 'day':
+                        schedule_item['job'] = schedule.every(config['interval'], config['start_date']).days.at(config['start_date'])
+                    if config['unit'] == 'week':
+                        schedule_item['job'] = schedule.every(config['interval'], config['start_date']).weeks.at(config['start_date'])
+                    if config['unit'] == 'month':
+                        schedule_item['job'] = schedule.every(config['interval'], config['start_date']).months.at(config['start_date'])
+                    if config['unit'] == 'year':
+                        schedule_item['job'] = schedule.every(config['interval'], config['start_date']).years.at(config['start_date'])
+                if 'last_run' in config:
+                    schedule_item['job'].set_last_run(config['last_run'])
                 schedule_item['job'].do(self.run_scheduled_item, schedule_item)
         except:
             exception('Failed setting up scheduler')
@@ -196,15 +196,16 @@ def run_scheduled_item(self, schedule_item):
             return
         result = True
         event = schedule_item['event']
-        event['last_run'] = datetime.strftime(datetime.utcnow(), '%Y-%m-%d %H:%M')
+        config = event['config']
+        config['last_run'] = datetime.strftime(datetime.utcnow(), '%Y-%m-%d %H:%M')
         with self.mutex:
             self.update_database_record(event['id'], event)
         for action in event['actions']:
             info('Executing scheduled action: {}'.format(action))
             result = self.client.RunAction(action)
             if result == False:
                 error('Failed to execute action: {}'.format(action))
-        if event['type'] == 'date' and result == True:
+        if config['type'] == 'date' and result == True:
             with self.mutex:
                 schedule.cancel_job(schedule_item['job'])
 

myDevices/schedule/__init__.py

@@ -287,7 +287,10 @@ def at(self, time_str):
 
     def make_date(self, datetime_str):
         """Make datetime from string."""
-        date = datetime.strptime(datetime_str, '%Y-%m-%d %H:%M')
+        try:
+            date = datetime.strptime(datetime_str, '%Y-%m-%dT%H:%M:%S.%fZ')
+        except ValueError:
+            date = datetime.strptime(datetime_str, '%Y-%m-%d %H:%M')
         assert 0 <= date.hour <= 23
         assert 0 <= date.minute <= 59
         assert 1 <= date.day <= 31
@@ -401,7 +404,11 @@ def _schedule_next_run(self):
         #todo: no 'minutes' implementation
         if self.unit in ('hours'):
             if self.start_date != None:
-                self.next_run = datetime.strptime(self.start_date, "%Y-%m-%d %H:%M")
+                try:
+                    date = datetime.strptime(self.start_date, '%Y-%m-%dT%H:%M:%S.%fZ')
+                except ValueError:
+                    date = datetime.strptime(self.start_date, '%Y-%m-%d %H:%M')
+                self.next_run = date
                 #'2016-11-30 17:52'
                 now = datetime.utcnow()
                 if self.next_run < now: