C3L-NOC/spaceapi Changeset - 8d221d669ea8 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 8d221d669ea8

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Dennis Fink - 9 years ago 2016-03-18 00:55:47
dennis.fink@c3l.lu

Fix people_now_present

2 files changed with 6 insertions and 6 deletions:

setup.py

spaceapi/utils.py

0 comments (0 inline, 0 general)

setup.py

➞

Show inline comments

@@ @@ -6,13 +6,13 @@ packages = find_packages() @@
 packages.append('spaceapi.templates')
 packages.append('spaceapi.static')
 packages.append('spaceapi.schema')
 setup(
     name='c3l_spaceapi',
-    version='0.0.4',
+    version='0.0.5',
     url=None,
     license='GPLv3+',
     author='Dennis Fink',
     author_email='dennis.fink@c3l.lu',
     description='spaceapi endpoint for c3l.lu',
     packages=packages,

spaceapi/utils.py

➞

Show inline comments

@@ @@ -52,15 +52,15 @@ class ActiveStatus(Singleton, dict): @@
             last_state['sensors'] = self['sensors']
             json.dump(last_state, f, sort_keys=True)
     def add_user_present(self, username):
         if self['state']['open']:
             if 'people_now_present' not in self['sensors']:
                 self['sensors']['people_now_present'] = {'value': 0}
+                self['sensors']['people_now_present'] = [{'value': 0}]
             people_now_present = self['sensors']['people_now_present']
+            people_now_present = self['sensors']['people_now_present'][0]
             if 'names' in people_now_present and username not in people_now_present['names']:
                 people_now_present['value'] += 1
                 if username in current_app.config['PEOPLE_NOW_PRESENT_ALLOWED']:
                     people_now_present['names'].append(username)
@@ @@ -68,31 +68,31 @@ class ActiveStatus(Singleton, dict): @@
             elif 'names' not in people_now_present:
                 people_now_present['value'] += 1
                 if username in current_app.config['PEOPLE_NOW_PRESENT_ALLOWED']:
                     people_now_present['names'] = [username]
             self['sensors']['people_now_present'] = people_now_present
+            self['sensors']['people_now_present'][0] = people_now_present
         else:
             pass
     def remove_user_present(self, username):
         if self['state']['open'] and 'people_now_present' in self['sensors']:
             people_now_present = self['sensors']['people_now_present']
+            people_now_present = self['sensors']['people_now_present'][0]
             if people_now_present['value'] > 0:
                 people_now_present['value'] -= 1
             if 'names' in people_now_present:
                 if people_now_present['value'] == 0:
                     del people_now_present['names']
                 elif username in people_now_present['names']:
                     people_now_present['names'].remove(username)
                     if not people_now_present['names']:
                         del people_now_present['names']
             self['sensors']['people_now_present'] = people_now_present
+            self['sensors']['people_now_present'][0] = people_now_present
         else:
             pass
     def set_new_state(self, value=None, trigger_person=None, message=None):
         if value is not None:

0 comments (0 inline, 0 general)