qolsys-controller 0.0.45__tar.gz → 0.0.48__tar.gz

{qolsys_controller-0.0.45 → qolsys_controller-0.0.48}/PKG-INFO

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

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

{qolsys_controller-0.0.45 → qolsys_controller-0.0.48}/qolsys_controller/database/table.py

@@ -92,6 +92,7 @@ class QolsysTable:
 
             col_str = ", ".join(full_data.keys())
             placeholder_str = ", ".join([f":{key}" for key in full_data])
+
             query = f"INSERT OR IGNORE INTO {self.table} ({col_str}) VALUES ({placeholder_str})"
             self._cursor.execute(query, full_data)
             self._db.commit()
@@ -112,9 +113,14 @@ class QolsysTable:
         # selection_argument:
         # Firmware 4.4.1: selection_argument: '[3,1]'
         # Firmware 4.6.1: selection_argument: ['3','1']
-
         # contentValues:{"partition_id":"0","sensorgroup":"safetymotion","sensorstatus":"Idle"}"
 
+        if selection_argument == "":
+            LOGGER.debug("Update called with empty selection_argument")
+            LOGGER.debug("Table: %s", self.table)
+            LOGGER.debug("Selection: %s", selection)
+            LOGGER.debug("selection_argument: %s", selection_argument)
+            return
 
         # Selection Argument
         # Panel send selection_argument as list in Firmware 4.6.1
@@ -164,6 +170,14 @@ class QolsysTable:
         # Firmware 4.4.1: selection_argument: '[3,1]'
         # Firmware 4.6.1: selection_argument: ['3','1']
 
+
+        if selection_argument == "":
+            LOGGER.debug("Delete called with empty selection_argument")
+            LOGGER.debug("Table: %s", self.table)
+            LOGGER.debug("Selection: %s", selection)
+            LOGGER.debug("selection_argument: %s", selection_argument)
+            return
+
         # Selection Argument
         if(type(selection_argument) is not list):
             #Firmware 4.4.1, seletion_argument is sent as a string

{qolsys_controller-0.0.45 → qolsys_controller-0.0.48}/qolsys_controller/panel.py

@@ -369,9 +369,13 @@ class QolsysPanel(QolsysObservable):
                 match dbOperation:
 
                     case "update":
-                        content_values = data.get("contentValues")
-                        selection = data.get("selection")
-                        selection_argument = data.get("selectionArgs")
+                        content_values = data.get("contentValues","")
+                        selection = data.get("selection","")
+                        selection_argument = data.get("selectionArgs","")
+
+                        if selection_argument == "" or selection == "":
+                            LOGGER.debug("iq2meid invalid update selection or selectionArgs")
+                            LOGGER.debug("data:%s", data)
 
                         match uri:
 
@@ -535,8 +539,12 @@ class QolsysPanel(QolsysObservable):
                                 LOGGER.debug(data)
 
                     case "delete":
-                        selection = data.get("selection")
-                        selection_argument = data.get("selectionArgs")
+                        selection = data.get("selection","")
+                        selection_argument = data.get("selectionArgs","")
+
+                        if selection_argument == "" or selection == "":
+                            LOGGER.debug("iq2meid invalid delete selection or selectionArgs")
+                            LOGGER.debug("data:%s", data)
 
                         match uri:
 
@@ -635,7 +643,7 @@ class QolsysPanel(QolsysObservable):
                                                 partition.alarm_state = PartitionAlarmState(new_value)
 
                             # Inser Partition Content Provider
-                            case self.db.table_partition:
+                            case self.db.table_partition.uri:
                                 self.db.table_partition.insert(data=content_values)
                                 self._state.sync_partitions_data(self.get_partitions_from_db())
 

{qolsys_controller-0.0.45 → qolsys_controller-0.0.48}/qolsys_controller/partition.py

@@ -44,7 +44,7 @@ class QolsysPartition(QolsysObservable):
         self._command_arm_entry_delay = True
 
     @property
-    def id(self) -> int:
+    def id(self) -> str:
         return self._id
 
     @property

{qolsys_controller-0.0.45 → qolsys_controller-0.0.48}/qolsys_controller/settings.py

@@ -68,7 +68,6 @@ class QolsysSettings:
     @property
     def motion_sensor_delay(self) -> bool:
         return self._motion_sensor_delay
-
     @property
     def motion_sensor_delay_sec(self) -> int:
         return self._motion_sensor_delay_sec
@@ -77,6 +76,10 @@ class QolsysSettings:
     def motion_sensor_delay(self, value: bool) -> None:
         self._motion_sensor_delay = value
 
+    @motion_sensor_delay_sec.setter
+    def motion_sensor_delay_sec(self, value: int) -> None:
+        self._motion_sensor_delay_sec = value
+
     @panel_ip.setter
     def panel_ip(self, panel_ip: str) -> None:
         self._panel_ip = panel_ip