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

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

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

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

{qolsys_controller-0.0.11 → qolsys_controller-0.0.13}/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.11 → qolsys_controller-0.0.13}/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.13/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.13/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.13/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.11 → qolsys_controller-0.0.13}/qolsys_controller/database/table_sensor.py

@@ -59,6 +59,7 @@ class QolsysTableSensor(QolsysTable):
             "averagedBm",
             "serial_number",
             "extras",
+            "allowspeaker",
         ]
 
         self._create_table()
@@ -70,9 +71,9 @@ class QolsysTableSensor(QolsysTable):
                              zone_two_way_voice_enabled, zone_reporting_enabled, battery_status,created_date,created_by,
                              updated_date,updated_by,frame_count,frame_type,current_capability,shortID,diag_24hr,
                              allowdisarming,device_capability,sub_type, signal_source, powerg_manufacture_id,parent_node,
-                             latestdBm,averagedBm,serial_number,extras,ac_status)
+                             latestdBm,averagedBm,serial_number,extras,ac_status,allowspeaker)
                               VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,
-                             ?,?,?,?,?,?,?,?,?,?,?)""", (
+                             ?,?,?,?,?,?,?,?,?,?,?,?)""", (
             data.get("_id"),
             data.get("version", ""),
             data.get("opr", ""),
@@ -116,6 +117,7 @@ class QolsysTableSensor(QolsysTable):
             data.get("averagedBm", ""),
             data.get("serial_number", ""),
             data.get("extras", ""),
-            data.get("ac_status", "")))
+            data.get("ac_status", ""),
+            data.get("allowspeaker", "")))
 
         self._db.commit()

qolsys_controller-0.0.13/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)

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

@@ -188,15 +188,15 @@ class QolsysPluginRemote(QolsysPlugin):
                 await self.aiomqtt.subscribe("iq2meid")
 
                 # Subscribte to MQTT commands response
-                await self.aiomqtt.subscribe("response_" + self.settings.random_mac, qos=2)
+                await self.aiomqtt.subscribe("response_" + self.settings.random_mac, qos=0)
 
                 # Only log mastermeid traffic for debug purposes
                 if self.log_mqtt_mesages:
                     # Subscribe to MQTT commands send to panel by other devices
-                    await self.aiomqtt.subscribe("mastermeid", qos=2)
+                    await self.aiomqtt.subscribe("mastermeid", qos=0)
 
                     # Subscribe to all topics
-                    await self.aiomqtt.subscribe("#", qos=2)
+                    await self.aiomqtt.subscribe("#", qos=0)
 
                 # Start mqtt_listent_task and mqtt_ping_task
                 self._task_manager.cancel(self._mqtt_task_listen_label)
@@ -446,7 +446,7 @@ class QolsysPluginRemote(QolsysPlugin):
             LOGGER.error("MQTT Client not configured")
             raise QolsysMqttError
 
-        await self.aiomqtt.publish(topic=topic, payload=json.dumps(json_payload), qos=2)
+        await self.aiomqtt.publish(topic=topic, payload=json.dumps(json_payload), qos=0)
         return await self._mqtt_command_queue.wait_for_response(request_id)
 
     async def command_connect(self) -> dict:
@@ -775,15 +775,13 @@ class QolsysPluginRemote(QolsysPlugin):
         LOGGER.debug("MQTT: Receiving ui_delay command")
 
     async def command_disarm(self, partition_id: str, user_code: str = "", exit_sounds: bool = True) -> bool:
-        LOGGER.debug("MQTT: Sending disarm command - check_user_code:%s", self.check_user_code_on_disarm)
-
         partition = self.state.partition(partition_id)
         if not partition:
             LOGGER.debug("MQTT: disarm command error - Unknow Partition")
             return False
 
         # Do local user code verification
-        user_id = 0
+        user_id = 1
         if self.check_user_code_on_disarm:
             user_id = self.panel.check_user(user_code)
             if user_id == -1:
@@ -802,9 +800,12 @@ class QolsysPluginRemote(QolsysPlugin):
                                            PartitionSystemStatus.ARM_NIGHT}:
                 await self.command_ui_delay(partition_id)
                 return "disarm_the_panel_from_entry_delay"
+
             return "disarm_from_openlearn_sensor"
 
         mqtt_disarm_command = await get_mqtt_disarm_command()
+        LOGGER.debug("MQTT: Sending disarm command - check_user_code:%s", self.check_user_code_on_disarm)
+
 
         disarm_command = {
             "operation_name": mqtt_disarm_command,