qolsys-controller 0.0.8__tar.gz → 0.0.11__tar.gz

{qolsys_controller-0.0.8 → qolsys_controller-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.8
+Version: 0.0.11
 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.8 → qolsys_controller-0.0.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qolsys-controller"
-version = "0.0.8"
+version = "0.0.11"
 authors = [
   { name="Eric Hylands", email="" },
 ]

{qolsys_controller-0.0.8 → qolsys_controller-0.0.11}/qolsys_controller/database/table.py

@@ -68,7 +68,12 @@ class QolsysTable:
 
     def update(self, selection: str, selection_argument: str, content_value: str) -> None:
         # selection: 'zone_id=?, parition_id=?'
+
+        # Firmware 4.4.1 is sending contentValues as string
         # selection_argument: '[3,1]'
+        # Firmware 4.6.1: 
+        # selection_argument: ['cc:4b:73:86:5c:89']
+
         #  "contentValues":{"partition_id":"0","sensorgroup":"safetymotion","sensorstatus":"Idle"}"
 
         # Panel is sending query parameter for db update in text string
@@ -80,8 +85,11 @@ class QolsysTable:
         db_value = ",".join([f"{key}='{value}'" for key, value in content_value.items()])
 
         # Selection Argument
-        selection_argument = selection_argument.strip("[]")
-        selection_argument = [item.strip() for item in selection_argument.split(",")]
+        # Panel send selection_argument as list in Firmware 4.6.1
+        if(type(selection_argument) is not list):
+            #Firmware 4.4.1, seletion_argument is sent as a string
+            selection_argument = selection_argument.strip("[]")
+            selection_argument = [item.strip() for item in selection_argument.split(",")]
 
         try:
             query = f"UPDATE {self.table} SET {db_value} WHERE {selection}"
@@ -108,12 +116,12 @@ class QolsysTable:
         # selection: 'zone_id=?, parition_id=?'
         # selection_argument: '[3,1]'
 
-        selection_argument = selection_argument.strip("[]")
-        selection_argument = [item.strip() for item in selection_argument.split(",")]
-
-        # Replace '?' in selection string with selection_argument
-        # for i in selection_argument:
-        #    selection = selection.replace("?",f"'{i}'",1)
+        # Selection Argument
+        # Panel send selection_argument as list in Firmware 4.6.1
+        if(type(selection_argument) is not list):
+            #Firmware 4.4.1, seletion_argument is sent as a string
+            selection_argument = selection_argument.strip("[]")
+            selection_argument = [item.strip() for item in selection_argument.split(",")]
 
         try:
             query = f"DELETE FROM {self.table} WHERE {selection}"

{qolsys_controller-0.0.8 → qolsys_controller-0.0.11}/qolsys_controller/plugin_remote.py

@@ -208,7 +208,6 @@ class QolsysPluginRemote(QolsysPlugin):
                 self.panel.imei = response_connect.get("master_imei", "")
                 self.panel.product_type = response_connect.get("primary_product_type", "")
 
-                await self.command_pairing_request()
                 await self.command_pingevent()
                 await self.command_timesync()
                 await self.command_pair_status_request()
@@ -491,11 +490,12 @@ class QolsysPluginRemote(QolsysPlugin):
 
         payload = {
             "eventName": eventName,
+            "pairing_request": True,
             "ipAddress": ipAddress,
             "macAddress": macAddress,
             "remoteClientID": remoteClientID,
             "softwareVersion": softwareVersion,
-            "producType": producType,
+            "productType": producType,
             "bssid": bssid,
             "dhcpInfo": json.dumps(dhcpInfo),
             "lastUpdateChecksum": lastUpdateChecksum,
@@ -690,9 +690,9 @@ class QolsysPluginRemote(QolsysPlugin):
         pairing_request = True
         ipAddress = self.settings.plugin_ip
         macAddress = self.settings.random_mac
-        remoteClientID = "QolsysController"
+        remoteClientID = self.settings.mqtt_remote_client_id
         softwareVersion = "4.4.1"
-        producType = "tab07_rk68"
+        productType = "tab07_rk68"
         bssid = ""
         lastUpdateChecksum = "2132501716"
         dealerIconsCheckSum = ""
@@ -718,7 +718,7 @@ class QolsysPluginRemote(QolsysPlugin):
             "macAddress": macAddress,
             "remoteClientID": remoteClientID,
             "softwareVersion": softwareVersion,
-            "producType": producType,
+            "producType": productType,
             "bssid": bssid,
             "dhcpInfo": json.dumps(dhcpInfo),
             "lastUpdateChecksum": lastUpdateChecksum,