qolsys-controller 0.0.9__py3-none-any.whl → 0.0.11__py3-none-any.whl

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.9.dist-info → qolsys_controller-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.9
+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.9.dist-info → qolsys_controller-0.0.11.dist-info}/RECORD

@@ -24,7 +24,7 @@ qolsys_controller/zwave_lock.py,sha256=j80McYDNHFjSuaTxG6PJpYWjnQKlrAHlN3rSUUNlz
 qolsys_controller/zwave_outlet.py,sha256=lxGB-jth11dHPUkT7jC411GdLCGDdct4mAGu05SndCA,185
 qolsys_controller/zwave_thermostat.py,sha256=sAraf4XEK40YCQlj9WcP39O-4JvWuNIyYf7AEGtVdqU,12766
 qolsys_controller/database/db.py,sha256=A3LaLzHklNMHNbZKJ9WuVQmuT8QA-UEZOrZuoIPCYn8,13538
-qolsys_controller/database/table.py,sha256=7SrGwBA6HUTlFm4dttUN9eXYvoTlJQHBnipyL4ARDhE,4315
+qolsys_controller/database/table.py,sha256=uxzBfMVxaGXnfib8qjltq_Souzao9cMiwDkQIHkp7PU,4702
 qolsys_controller/database/table_alarmedsensor.py,sha256=giF3k37VtN--zijFOAW2Bcd61oJFK575XqQBJnQ6bz8,1394
 qolsys_controller/database/table_automation.py,sha256=wgMX7ycXxKLi0bviUsEvtgetm8BHux7fQq6XmX0kMc8,2898
 qolsys_controller/database/table_country_locale.py,sha256=CFy9UYAuIn7xDPjqVOQPm7sa6sLQpEu17lCr0fovnw8,2136
@@ -56,7 +56,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.9.dist-info/METADATA,sha256=9vHtOG_a73TykfmdsafPKk4PWgfcyxg4eAFxaoM1Ds4,4174
-qolsys_controller-0.0.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qolsys_controller-0.0.9.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
-qolsys_controller-0.0.9.dist-info/RECORD,,
+qolsys_controller-0.0.11.dist-info/METADATA,sha256=urPoV9cUyWQFKD3x2INjsnhvYHy7h5xmKgIS2iQ5zNI,4175
+qolsys_controller-0.0.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qolsys_controller-0.0.11.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
+qolsys_controller-0.0.11.dist-info/RECORD,,