simo 2.1.12__py3-none-any.whl → 2.1.13__py3-none-any.whl

simo/generic/models.py

@@ -125,12 +125,8 @@ def bind_controlling_locks_to_alarm_groups(sender, instance, *args, **kwargs):
             base_type=AlarmGroup.base_type,
             config__arming_locks__contains=instance.id
         ):
-            if ag.config.get('arm_on_away') in (None, 'on_away'):
-                for ag in Component.objects.filter(
-                    base_type=AlarmGroup.base_type,
-                    config__arming_locks__contains=instance.id
-                ):
-                    ag.arm()
+            if ag.config.get('arm_on_away') in (None, '', 'on_away'):
+                ag.controller.arm()
                 continue
 
             users_at_home = InstanceUser.objects.filter(
@@ -140,7 +136,7 @@ def bind_controlling_locks_to_alarm_groups(sender, instance, *args, **kwargs):
                 continue
             if ag.config.get('arm_on_away') == 'on_away_and_locked':
                 print(f"Nobody is at home, lock was locked. Arm {ag}!")
-                ag.arm()
+                ag.controller.arm()
                 continue
             locked_states = [
                 True if l['value'] == 'locked' else False
@@ -150,14 +146,14 @@ def bind_controlling_locks_to_alarm_groups(sender, instance, *args, **kwargs):
             ]
             if all(locked_states):
                 print(f"Nobody is at home, all locks are now locked. Arm {ag}!")
-                ag.arm()
+                ag.controller.arm()
 
     elif instance.value == 'unlocked':
         for ag in Component.objects.filter(
             base_type=AlarmGroup.base_type,
             config__arming_locks__contains=instance.id
         ):
-            ag.disarm()
+            ag.controller.disarm()
 
 
 @receiver(post_save, sender=InstanceUser)
@@ -189,10 +185,10 @@ def bind_alarm_groups(sender, instance, created, *args, **kwargs):
             continue
         if ag.config['arm_on_away'] == 'on_away_and_locked':
             print(f"Everybody is away, single lock is locked, arm {ag}!")
-            ag.arm()
+            ag.controller.arm()
             continue
         if ag.config['arm_on_away'] == 'on_away_and_locked_all' \
         and all(locked_states):
             print(f"Everybody is away, all locks are locked, arm {ag}!")
-            ag.arm()
+            ag.controller.arm()
             continue

{simo-2.1.12.dist-info → simo-2.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.1.12
+Version: 2.1.13
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-2.1.12.dist-info → simo-2.1.13.dist-info}/RECORD

@@ -10302,7 +10302,7 @@ simo/generic/base_types.py,sha256=djymox_boXTHX1BTTCLXrCH7ED-uAsV_idhaDOc3OLI,40
 simo/generic/controllers.py,sha256=gojeCP_vSyLTaP4h56LqqLDykny5lEG-nLclieyVrRg,58292
 simo/generic/forms.py,sha256=IAfDtmEk1-CP0JBoetOD_ahLm64nK41GOUXjmbUzNtY,29550
 simo/generic/gateways.py,sha256=cc_q_g2HsI2_rWmr8yZ3spnMPwsgoYS5ApWRimc11wU,18831
-simo/generic/models.py,sha256=jKlNOzpGrjIZt7zL5tKM4AzcD6cAQgqF2AwsIb7anVo,7607
+simo/generic/models.py,sha256=sa8mFL5i5THMhu9QOTNzBq_KvoChlTyckqO9i1UYw3U,7487
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=NfTQGYtVAc864IoogZRxf_0xpDPM0eMCWn0SlKA5P7Y,1751
 simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=mLu54WS9KIl-pHwVCBKpsDFIlOqml--JsOVzAUHg6cU,161
@@ -10502,9 +10502,9 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-2.1.12.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.1.12.dist-info/METADATA,sha256=9gW_akGr2kphJi5Aj9G3FQJfEtSPVIykU8ugLkZrAXE,1848
-simo-2.1.12.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
-simo-2.1.12.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
-simo-2.1.12.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.1.12.dist-info/RECORD,,
+simo-2.1.13.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.1.13.dist-info/METADATA,sha256=6OF1UCBLP9AUuLxWH3mUP6FeMEDmOee9WnDow0o-zdY,1848
+simo-2.1.13.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
+simo-2.1.13.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
+simo-2.1.13.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.1.13.dist-info/RECORD,,