qolsys-controller 0.0.13__py3-none-any.whl → 0.0.15__py3-none-any.whl

qolsys_controller/partition.py

@@ -39,6 +39,7 @@ class QolsysPartition(QolsysObservable):
 
         # Other
         self._command_exit_sounds = True
+        self._command_silent_disarming = False
         self._command_arm_stay_instant = True
 
     @property
@@ -81,6 +82,14 @@ class QolsysPartition(QolsysObservable):
     def command_arm_stay_instant(self) -> bool:
         return self._command_arm_stay_instant
 
+    @property
+    def command_silent_disarming(self) -> bool:
+        return self._command_silent_disarming
+
+    @command_silent_disarming.setter
+    def command_silent_disarming(self, value: bool) -> None:
+        self._command_silent_disarming = value
+
     @system_status.setter
     def system_status(self, new_value: PartitionSystemStatus) -> None:
         if self._system_status != new_value:

qolsys_controller/plugin_remote.py

@@ -34,6 +34,7 @@ class QolsysPluginRemote(QolsysPlugin):
 
         # Plugin
         self.certificate_exchange_server = None
+        self._check_user_code_on_arm = False
         self._check_user_code_on_disarm = True
         self._log_mqtt_messages = False
         self._task_manager = QolsysTaskManager()
@@ -62,6 +63,14 @@ class QolsysPluginRemote(QolsysPlugin):
     def check_user_code_on_disarm(self, check_user_code_on_disarm: bool) -> None:
         self._check_user_code_on_disarm = check_user_code_on_disarm
 
+    @property
+    def check_user_code_on_arm(self) -> bool:
+        return self._check_user_code_on_arm
+
+    @check_user_code_on_arm.setter
+    def check_user_code_on_arm(self, check_user_code_on_arm: bool) -> None:
+        self._check_user_code_on_arm = check_user_code_on_arm
+
     @property
     def auto_discover_pki(self) -> bool:
         return self._auto_discover_pki
@@ -196,7 +205,7 @@ class QolsysPluginRemote(QolsysPlugin):
                     await self.aiomqtt.subscribe("mastermeid", qos=0)
 
                     # Subscribe to all topics
-                    await self.aiomqtt.subscribe("#", qos=0)
+                    #await self.aiomqtt.subscribe("#", qos=0)
 
                 # Start mqtt_listent_task and mqtt_ping_task
                 self._task_manager.cancel(self._mqtt_task_listen_label)
@@ -733,7 +742,7 @@ class QolsysPluginRemote(QolsysPlugin):
         LOGGER.debug("MQTT: Receiving pairing_request command")
         return response
 
-    async def command_ui_delay(self, partition_id: str) -> None:
+    async def command_ui_delay(self, partition_id: str,silent_disarming:bool = False) -> None:
         LOGGER.debug("MQTT: Sending ui_delay command")
 
         # partition state needs to be sent for ui_delay to work
@@ -744,6 +753,7 @@ class QolsysPluginRemote(QolsysPlugin):
             "panel_status": partition.system_status,
             "userID": 0,
             "partitionID": partition_id,  # STR EXPECTED
+            "silentDisarming":silent_disarming,
             "operation_source": 1,
             "macAddress": self.settings.random_mac,
         }
@@ -774,7 +784,7 @@ class QolsysPluginRemote(QolsysPlugin):
         await self.send_command(topic, payload, requestID)
         LOGGER.debug("MQTT: Receiving ui_delay command")
 
-    async def command_disarm(self, partition_id: str, user_code: str = "", exit_sounds: bool = True) -> bool:
+    async def command_disarm(self, partition_id: str, user_code: str = "", silent_disarming: bool = False) -> bool:
         partition = self.state.partition(partition_id)
         if not partition:
             LOGGER.debug("MQTT: disarm command error - Unknow Partition")
@@ -788,7 +798,7 @@ class QolsysPluginRemote(QolsysPlugin):
                 LOGGER.debug("MQTT: disarm command error - user_code error")
                 return False
 
-        async def get_mqtt_disarm_command() -> str:
+        async def get_mqtt_disarm_command(silent_disarming:bool) -> str:
             if partition.alarm_state == PartitionAlarmState.ALARM:
                 return "disarm_from_emergency"
             if partition.system_status in {PartitionSystemStatus.ARM_AWAY_EXIT_DELAY,
@@ -798,12 +808,12 @@ class QolsysPluginRemote(QolsysPlugin):
             if partition.system_status in {PartitionSystemStatus.ARM_AWAY,
                                            PartitionSystemStatus.ARM_STAY,
                                            PartitionSystemStatus.ARM_NIGHT}:
-                await self.command_ui_delay(partition_id)
+                await self.command_ui_delay(partition_id,silent_disarming)
                 return "disarm_the_panel_from_entry_delay"
 
             return "disarm_from_openlearn_sensor"
 
-        mqtt_disarm_command = await get_mqtt_disarm_command()
+        mqtt_disarm_command = await get_mqtt_disarm_command(silent_disarming)
         LOGGER.debug("MQTT: Sending disarm command - check_user_code:%s", self.check_user_code_on_disarm)
 
 
@@ -812,7 +822,6 @@ class QolsysPluginRemote(QolsysPlugin):
             "userID": user_id,
             "partitionID": int(partition_id),  # INT EXPECTED
             "operation_source": 1,
-            "disarm_exit_sounds": exit_sounds,
             "macAddress": self.settings.random_mac,
         }
 
@@ -903,7 +912,7 @@ class QolsysPluginRemote(QolsysPlugin):
             LOGGER.debug("MQTT: arm command error - Unknow Partition")
             return False
 
-        if self.panel.SECURE_ARMING == "true":
+        if self.panel.SECURE_ARMING == "true" and self.check_user_code_on_arm:
             # Do local user code verification to arm if secure arming is enabled
             user_id = self.panel.check_user(user_code)
             if user_id == -1:

{qolsys_controller-0.0.13.dist-info → qolsys_controller-0.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.13
+Version: 0.0.15
 Summary: A Python module that emulates a virtual IQ Remote device, enabling full local control of a Qolsys IQ Panel
 Project-URL: Homepage, https://github.com/EHylands/QolsysController
 Project-URL: Issues, https://github.com/EHylands/QolsysController/issues

{qolsys_controller-0.0.13.dist-info → qolsys_controller-0.0.15.dist-info}/RECORD

@@ -6,11 +6,11 @@ qolsys_controller/mdns.py,sha256=3_d-_K5Fyxc-2s0Fo1advTSpD72P369Hou1Ko0z__Ag,606
 qolsys_controller/mqtt_command_queue.py,sha256=FjSbjK3_3SXV5eQPfQ-k8HOI5Tbu2aWzAxe4uXymK64,937
 qolsys_controller/observable.py,sha256=X7uMnBHGpklPTa-RHKldXA0Rq38Cs1yOIuxl8ODeKV4,1049
 qolsys_controller/panel.py,sha256=2EZtnA9c_yVSL3Vtszq9SLae9ykSuKrzIxssa6LoAvk,39370
-qolsys_controller/partition.py,sha256=-Fos327y3MlSWwJCbDeQM51-K8uMHANxIJ8kN9-S5CA,8045
+qolsys_controller/partition.py,sha256=k5aEAvF0r94DlZlDlcQnW7-lPWgIqJPA42fl3R2KoS4,8347
 qolsys_controller/pki.py,sha256=_e0tiNF8Hypb37cHr7x8yqUZDaqbzRzP45AitTtmzk4,8663
 qolsys_controller/plugin.py,sha256=Qh0irFbuw9R2QF3jOFTJw70ceVxK1ld5_sW7VnpOrA8,819
 qolsys_controller/plugin_c4.py,sha256=71o5Y7Y13GO0vWCPIsCtpqXxrplryyqt8ua5L8F4StQ,382
-qolsys_controller/plugin_remote.py,sha256=gpcx5nSZBeZj69L8sn4mnhxTI2IZgyAwuapN9AbHmms,37890
+qolsys_controller/plugin_remote.py,sha256=vwt2kAMAdeDw81XVENnmUTRME85SdwWFPZp9_WfdWcI,38338
 qolsys_controller/settings.py,sha256=2c8QLaEylpH2Wuol8EypYBIJhfniZXewb_54w8na2ts,5314
 qolsys_controller/state.py,sha256=eWn4KiWN75K83CVW224zekDUeIpgjh9tDfnpaOJWV3I,14360
 qolsys_controller/task_manager.py,sha256=IBFi1l9aId950wvRpvP6d4PHZhr3v1hnnt8NVulM3BI,1139
@@ -60,7 +60,7 @@ qolsys_controller/database/table_zwave_association_group.py,sha256=S_tWpfzzD44rJ
 qolsys_controller/database/table_zwave_history.py,sha256=4RiCzA_XFdXXVA9X48Z4eoxA_4DFKwdjkP2N6IHHOqQ,1897
 qolsys_controller/database/table_zwave_node.py,sha256=csESJCkcg8qAPn3KSL4jO9b1oymZ5wrQiXcmWR9vSc0,7302
 qolsys_controller/database/table_zwave_other.py,sha256=HJzLd4MUfNynE9jHiCzN7j1PFDncwQHeDkP5_8_s0YE,747
-qolsys_controller-0.0.13.dist-info/METADATA,sha256=zAAREL1cMt_vXe0XCE-9Jtl12N4mGboIoCWXNfH_UZ0,4175
-qolsys_controller-0.0.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qolsys_controller-0.0.13.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
-qolsys_controller-0.0.13.dist-info/RECORD,,
+qolsys_controller-0.0.15.dist-info/METADATA,sha256=olgz7QVjsTN1SIjRXRD9LE6DVca4Pe6Yr9sYfDATcWM,4175
+qolsys_controller-0.0.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qolsys_controller-0.0.15.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
+qolsys_controller-0.0.15.dist-info/RECORD,,