qolsys-controller 0.0.24__tar.gz → 0.0.26__tar.gz

qolsys_controller-0.0.26/.github/workflows/pre-commit.yml

@@ -0,0 +1,14 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
+    - uses: pre-commit/action@v3.0.1

{qolsys_controller-0.0.24 → qolsys_controller-0.0.26}/.github/workflows/publish.yml

@@ -1,6 +1,7 @@
     name: Publish Python package to PyPI
 
     on:
+      workflow_dispatch:
       release:
         types: [published]
 

{qolsys_controller-0.0.24 → qolsys_controller-0.0.26}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [project]
 name = "qolsys-controller"
-version = "0.0.24"
+version = "0.0.26"
 authors = [
   { name="Eric Hylands", email="" },
 ]
@@ -33,3 +33,5 @@ line-length = 88
 select = ['ALL']
 ignore = ["E501","S608","S311","S104","D100","D101", "D102","D107","ERA001", "FBT001","FBT002", "N802","N806","PERF401"]
 
+[tool.ruff.lint.mccabe]
+max-complexity = 25

{qolsys_controller-0.0.24 → qolsys_controller-0.0.26}/qolsys_controller/database/table_dimmerlight.py

@@ -12,7 +12,7 @@ class QolsysTableDimmerLight(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.DimmerLightsContentProvider/dimmerlight"
         self._table = "dimmerlight"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
         self._columns = [

{qolsys_controller-0.0.24 → qolsys_controller-0.0.26}/qolsys_controller/database/table_doorlock.py

@@ -12,7 +12,7 @@ class QolsysTableDoorLock(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.DoorLocksContentProvider/doorlock"
         self._table = "doorlock"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
         self._columns = [

{qolsys_controller-0.0.24 → qolsys_controller-0.0.26}/qolsys_controller/database/table_qolsyssettings.py

@@ -12,7 +12,7 @@ class QolsysTableQolsysSettings(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.QolsysSettingsProvider/qolsyssettings"
         self._table = "qolsyssettings"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
 

{qolsys_controller-0.0.24 → qolsys_controller-0.0.26}/qolsys_controller/database/table_sensor.py

@@ -40,6 +40,8 @@ class QolsysTableSensor(QolsysTable):
             "zone_supervised",
             "zone_two_way_voice_enabled",
             "zone_reporting_enabled",
+            "zone_feature1",
+            "zone_feature2",
             "battery_status",
             "created_date",
             "created_by",

{qolsys_controller-0.0.24 → qolsys_controller-0.0.26}/qolsys_controller/database/table_weather.py

@@ -12,7 +12,7 @@ class QolsysTableWeather(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.ForecastWeatherContentProvider/weather"
         self._table = "weather"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
         self._columns = [

{qolsys_controller-0.0.24 → qolsys_controller-0.0.26}/qolsys_controller/database/table_zwave_node.py

@@ -12,7 +12,7 @@ class QolsysTableZwaveNode(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.ZwaveContentProvider/zwave_node"
         self._table = "zwave_node"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
         self._columns = [

{qolsys_controller-0.0.24 → qolsys_controller-0.0.26}/qolsys_controller/plugin_remote.py

@@ -193,7 +193,7 @@ class QolsysPluginRemote(QolsysPlugin):
 
                 await self.aiomqtt.__aenter__()
 
-                LOGGER.debug("MQTT: Client Connected")
+                LOGGER.info("MQTT: Client Connected")
 
                 # Subscribe to panel internal databse updates
                 await self.aiomqtt.subscribe("iq2meid")
@@ -864,10 +864,11 @@ class QolsysPluginRemote(QolsysPlugin):
         return True
 
     async def command_zwave_doorlock_set(self, node_id: int, locked:bool) -> None:
-        # Command 68
         LOGGER.debug("MQTT: Sending zwave_doorlock_set command: EXPERIMENTAL")
         LOGGER.debug("MQTT: Sending zwave_doorlock_set command - Node(%s) - Locked(%s)",node_id,locked)
 
+        command = 68
+
         # 0 unlocked
         # 255 lockeck
         lock_mode = 0
@@ -884,7 +885,7 @@ class QolsysPluginRemote(QolsysPlugin):
             },
             {
                 "dataType": "byteArray",
-                "dataValue": [68,lock_mode],
+                "dataValue": [command,lock_mode],
             },
             {
                 "dataType": "int",