qolsys-controller 0.0.9__tar.gz → 0.0.12__tar.gz

{qolsys_controller-0.0.9 → qolsys_controller-0.0.12}/PKG-INFO

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

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

{qolsys_controller-0.0.9 → qolsys_controller-0.0.12}/qolsys_controller/database/db.py

@@ -15,11 +15,15 @@ from .table_iqremotesettings import QolsysTableIqRemoteSettings
 from .table_iqrouter_network_config import QolsysTableIqRouterNetworkConfig
 from .table_iqrouter_user_device import QolsysTableIqRouterUserDevice
 from .table_master_slave import QolsysTableMasterSlave
+from .table_nest_device import QolsysTableNestDevice
+from .table_output_rules import QolsysTableOutputRules
 from .table_partition import QolsysTablePartition
+from .table_pgm_outputs import QolsysTablePgmOutputs
 from .table_powerg_device import QolsysTablePowerGDevice
 from .table_qolsyssettings import QolsysTableQolsysSettings
 from .table_scene import QolsysTableScene
 from .table_sensor import QolsysTableSensor
+from .table_shades import QolsysTableShades
 from .table_smartsocket import QolsysTableSmartSocket
 from .table_state import QolsysTableState
 from .table_tcc import QolsysTableTcc
@@ -75,6 +79,10 @@ class QolsysDB:
         self.table_zwave_history = QolsysTableZwaveHistory(self.db, self.cursor)
         self.table_zwave_node = QolsysTableZwaveNode(self.db, self.cursor)
         self.table_zwave_other = QolsysTableZwaveOther(self.db, self.cursor)
+        self.table_pgm_outputs = QolsysTablePgmOutputs(self.db, self.cursor)
+        self.table_output_rules = QolsysTableOutputRules(self.db, self.cursor)
+        self.table_shades = QolsysTableShades(self.db, self.cursor)
+        self.table_nest_device = QolsysTableNestDevice(self.db, self.cursor)
 
         self._table_array = []
         self._table_array.append(self.table_sensor)
@@ -108,6 +116,10 @@ class QolsysDB:
         self._table_array.append(self.table_zwave_association_goup)
         self._table_array.append(self.table_virtual_device)
         self._table_array.append(self.table_eu_event)
+        self._table_array.append(self.table_pgm_outputs)
+        self._table_array.append(self.table_output_rules)
+        self._table_array.append(self.table_shades)
+        self._table_array.append(self.table_nest_device)
 
         # Other Table not Implemented
         # content://com.qolsys.qolsysprovider.AllSensorsContentProvider/all_sensor
@@ -134,6 +146,7 @@ class QolsysDB:
         # content://com.qolsys.qolsysprovider.AxonRSSIContentProvider/axon_rssi_table
         # content://com.qolsys.qolsysprovider.PowerGDeviceContentProvider/powerg_device
         # content://com.qolsys.qolsysprovider.PowerGRSSIContentProvider/powerg_rssi_table
+        # content://com.qolsys.qolsysprovider.PgmOutputsContentProvider/pgm_outputs
 
     @property
     def db(self) -> sqlite3.Connection:

{qolsys_controller-0.0.9 → qolsys_controller-0.0.12}/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 → qolsys_controller-0.0.12}/qolsys_controller/database/table_master_slave.py

@@ -34,6 +34,7 @@ class QolsysTableMasterSlave(QolsysTable):
             "upgrade_status",
             "name",
             "bssid",
+            "ssid",
             "dhcpInfo",
             "topology",
             "reboot_reason",
@@ -44,8 +45,8 @@ class QolsysTableMasterSlave(QolsysTable):
     def insert(self, data: dict) -> None:
         self._cursor.execute(f"""INSERT INTO {self.table} (_id,version,opr,partition_id,zone_id,ip_address,mac_address,
                              device_type,created_by,created_date,updated_by,last_updated_date,status,device_name,
-                             last_updated_iq_remote_checksum,software_version,upgrade_status,name,bssid,dhcpInfo,topology)
-                              VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)""", (
+                             last_updated_iq_remote_checksum,software_version,upgrade_status,name,bssid,ssid,dhcpInfo,topology)
+                              VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)""", (
             data.get("_id"),
             data.get("version", ""),
             data.get("opr", ""),
@@ -65,6 +66,7 @@ class QolsysTableMasterSlave(QolsysTable):
             data.get("upgrade_status", ""),
             data.get("name", ""),
             data.get("bssid", ""),
+            data.get("ssid", ""),
             data.get("dhcpInfo", ""),
             data.get("topology", "")))
 

qolsys_controller-0.0.12/qolsys_controller/database/table_nest_device.py

@@ -0,0 +1,27 @@
+import logging  # noqa: INP001
+import sqlite3
+
+from .table import QolsysTable
+
+LOGGER = logging.getLogger(__name__)
+
+
+class QolsysTableNestDevice(QolsysTable):
+
+    def __init__(self, db: sqlite3.Connection, cursor: sqlite3.Cursor) -> None:
+        super().__init__(db, cursor)
+        self._uri = "content://com.qolsys.qolsysprovider.NestDeviceContentProvider/nest_device"
+        self._table = "nest_device"
+        self._abort_on_error = False
+
+        self._columns = [
+            "_id",
+        ]
+
+        self._create_table()
+
+    def insert(self, data: dict) -> None:
+        if data is not None:
+            LOGGER.error("Please Report")
+            LOGGER.error("Loading Table Format: %s", self.uri)
+            LOGGER.error(data)

qolsys_controller-0.0.12/qolsys_controller/database/table_output_rules.py

@@ -0,0 +1,27 @@
+import logging  # noqa: INP001
+import sqlite3
+
+from .table import QolsysTable
+
+LOGGER = logging.getLogger(__name__)
+
+
+class QolsysTableOutputRules(QolsysTable):
+
+    def __init__(self, db: sqlite3.Connection, cursor: sqlite3.Cursor) -> None:
+        super().__init__(db, cursor)
+        self._uri = "content://com.qolsys.qolsysprovider.OutputRulesContentProvider/output_rules"
+        self._table = "output_rules"
+        self._abort_on_error = False
+
+        self._columns = [
+            "_id",
+        ]
+
+        self._create_table()
+
+    def insert(self, data: dict) -> None:
+        if data is not None:
+            LOGGER.error("Please Report")
+            LOGGER.error("Loading Table Format: %s", self.uri)
+            LOGGER.error(data)

qolsys_controller-0.0.12/qolsys_controller/database/table_pgm_outputs.py

@@ -0,0 +1,27 @@
+import logging  # noqa: INP001
+import sqlite3
+
+from .table import QolsysTable
+
+LOGGER = logging.getLogger(__name__)
+
+
+class QolsysTablePgmOutputs(QolsysTable):
+
+    def __init__(self, db: sqlite3.Connection, cursor: sqlite3.Cursor) -> None:
+        super().__init__(db, cursor)
+        self._uri = "content://com.qolsys.qolsysprovider.PgmOutputsContentProvider/pgm_outputs"
+        self._table = "pgm_outputs"
+        self._abort_on_error = False
+
+        self._columns = [
+            "_id",
+        ]
+
+        self._create_table()
+
+    def insert(self, data: dict) -> None:
+        if data is not None:
+            LOGGER.error("Please Report")
+            LOGGER.error("Loading Table Format: %s", self.uri)
+            LOGGER.error(data)

qolsys_controller-0.0.12/qolsys_controller/database/table_shades.py

@@ -0,0 +1,27 @@
+import logging  # noqa: INP001
+import sqlite3
+
+from .table import QolsysTable
+
+LOGGER = logging.getLogger(__name__)
+
+
+class QolsysTableShades(QolsysTable):
+
+    def __init__(self, db: sqlite3.Connection, cursor: sqlite3.Cursor) -> None:
+        super().__init__(db, cursor)
+        self._uri = "content://com.qolsys.qolsysprovider.ShadesContentProvider/shades"
+        self._table = "shades"
+        self._abort_on_error = False
+
+        self._columns = [
+            "_id",
+        ]
+
+        self._create_table()
+
+    def insert(self, data: dict) -> None:
+        if data is not None:
+            LOGGER.error("Please Report")
+            LOGGER.error("Loading Table Format: %s", self.uri)
+            LOGGER.error(data)