simo 2.7.16__py3-none-any.whl → 2.7.17__py3-none-any.whl

simo/generic/controllers.py

@@ -1177,14 +1177,11 @@ class MainState(StateSelect):
         return False
 
 
-    def owner_phones_on_sleep(self, all_phones=False):
+    def owner_phones_on_charge(self, all_phones=False):
         sleeping_phones_hour = self.component.config.get('sleeping_phones_hour')
         if sleeping_phones_hour is None:
             return False
 
-        if not self.is_sleep_time():
-            return False
-
         from simo.users.models import InstanceUser
 
         phones_on_charge = []
@@ -1198,7 +1195,7 @@ class MainState(StateSelect):
             phones_on_charge.append(iuser.phone_on_charge)
 
 
-        if all:
+        if all_phones:
             return all(phones_on_charge)
         else:
             return any(phones_on_charge)

simo/generic/forms.py

@@ -491,7 +491,7 @@ class MainStateSelectForm(BaseComponentForm):
                   "No value disables this behavior."
     )
     sleeping_phones_hour = forms.IntegerField(
-        initial=True, required=False, min_value=18, max_value=24,
+        initial=22, required=False, min_value=18, max_value=24,
         help_text='Set mode to "Sleep" if it is later than given hour '
                   'and all home owners phones who are at home are put on charge '
                   '(requires location and fitness permissions on mobile app). <br>'

simo/generic/gateways.py

@@ -421,11 +421,12 @@ class GenericGatewayHandler(
 
         if state.config.get('sleeping_phones_hour') is not None:
             if state.value != 'sleep':
-                if state.owner_phones_on_sleep(True):
+                if state.is_sleep_time() and state.owner_phones_on_charge(True):
                     print(f"New main state of {state.zone.instance} - sleep")
                     state.send('sleep')
             else:
-                if not state.owner_phones_on_sleep(False):
+                if not state.owner_phones_on_charge(True) \
+                and not state.is_sleep_time():
                     try:
                         new_state = state.get_day_evening_night_morning()
                     except:

{simo-2.7.16.dist-info → simo-2.7.17.dist-info}/METADATA

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

{simo-2.7.16.dist-info → simo-2.7.17.dist-info}/RECORD

@@ -10591,9 +10591,9 @@ simo/fleet/templates/fleet/controllers_info/ENS160AirQualitySensor.md,sha256=3LS
 simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=y8W3jR76Hh26O9pPQyg2SophMbYIOtAWD33MPKbB8Mg,856
 simo/generic/base_types.py,sha256=u3SlfpNYaCwkVBwomWgso4ODzL71ay9MhiAW-bxgnDU,341
-simo/generic/controllers.py,sha256=HDhf-bC6WATWzHFFEndap4z213n0LgtBhVG1lfMxzMU,46597
-simo/generic/forms.py,sha256=N9Jv4-e2IroSAeXXrpdpThQnH2sw5ADh08nFtdOK9Ds,26035
-simo/generic/gateways.py,sha256=bq01qX2Q62B47yHmTKdCfQE8tcwmI70jvJko-pIyQag,17534
+simo/generic/controllers.py,sha256=C3bwn7kSpOz0Gs0fL5VQFYi8pL8VV57mo-9PfLTBBQA,46542
+simo/generic/forms.py,sha256=ynf-u9RE-VU0xQgCYovUVEZO3ZJ_pCsem91KSeQdHbs,26033
+simo/generic/gateways.py,sha256=6mu6bSjn-UmeiFLWpskyCGO8MR8KpesruHspEUeOvDo,17609
 simo/generic/models.py,sha256=Adq7ipWK-renxJlNW-SZnAq2oGEOwKx8EdUWaKnfcVQ,7597
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=pyiqzfGxSKBNqfrfEJ_kCU0UbSC28XnvDn6QjKkbqyY,1767
@@ -10603,11 +10603,11 @@ simo/generic/__pycache__/app_widgets.cpython-312.pyc,sha256=ywoKk91YSEZxpyt9haG5
 simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=D9b13pbMlirgHmjDnQhfLIDGSVINoSouHb4SWOeCRrs,1642
 simo/generic/__pycache__/base_types.cpython-312.pyc,sha256=h8Mwu49i-zmwTbL33JaLJfRDGOgkQh2_VqrfzEc4UQ4,616
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=aV5NdIuvXR-ItKpI__MwcyPZHD6Z882TFdgYkPCkr1I,493
-simo/generic/__pycache__/controllers.cpython-312.pyc,sha256=g5fjTUYYNFGR7Sv-hoES7Vfofc7bxMk0Ef6nGNhvgNM,53145
+simo/generic/__pycache__/controllers.cpython-312.pyc,sha256=Ti6xqlOVIA_DYAo4HS72j-2g20xuvAaiEsZl4eIEPfs,53085
 simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=jJjwKVaDYyazrRGNjUFoY74nr_jX_DEnsC9KjyxZCgc,30427
-simo/generic/__pycache__/forms.cpython-312.pyc,sha256=NtOAjTxXh0vaYNdUY9PVJy1Q9Bm_HiFX6oXxW5yQ62Y,34676
+simo/generic/__pycache__/forms.cpython-312.pyc,sha256=naGe-9nY5GFqM_bNpg52acV8s5j9PFILS7l0UTuWbQQ,34681
 simo/generic/__pycache__/forms.cpython-38.pyc,sha256=k8lz3taXdWAg5P9jcnw66mWH51pCc4SOsg32kVEtBCg,19416
-simo/generic/__pycache__/gateways.cpython-312.pyc,sha256=bq-k85HBSfg_EHtDFQmo1BMBDjgPqP0lfw5BEnP1vB4,21672
+simo/generic/__pycache__/gateways.cpython-312.pyc,sha256=o2Ijs-IXKmytSXRkVs-MChscxuGv97_if13tN2piwY4,21787
 simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=GIeMT51oZU2OCFD4eUDFdSRRYE0Qf14AcOr_gdUqG94,12705
 simo/generic/__pycache__/models.cpython-312.pyc,sha256=xriUzjkaM2Y4mT3jo2OPK-XGBroBBSFJfLqK0jMA4MA,10200
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=MZpum7syAFxuulf47K7gtUlJJ7xRD-IBUBAwUM1ZRnw,5825
@@ -10924,9 +10924,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.7.16.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.7.16.dist-info/METADATA,sha256=uuLTNmwN-BR8ZrQ9eBFoXWOf1Roj8fqHPUdwJNlA-5k,2009
-simo-2.7.16.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-simo-2.7.16.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.7.16.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.7.16.dist-info/RECORD,,
+simo-2.7.17.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.7.17.dist-info/METADATA,sha256=J5dFupbSoGVFuKx_tBG3mzNT9Yau8gd0CuAigZ2Oigk,2009
+simo-2.7.17.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+simo-2.7.17.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.7.17.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.7.17.dist-info/RECORD,,