pyialarm - npm Package Compare versions

Comparing version 1.9.0 to 2.0.0

PKG-INFO

 Metadata-Version: 2.1
 Name: pyialarm
-Version: 1.9.0
+Version: 2.0.0
 Summary: A simple library to interface with iAlarm systems, built for use with Home-Assistant
 Home-page: https://github.com/RyuzakiKK/pyialarm
+Download-URL: https://github.com/RyuzakiKK/pyialarm
 Author: Ludovico de Nittis
 Author-email: [e-mail]
 License: Apache 2.0
-Download-URL: https://github.com/RyuzakiKK/pyialarm
 Keywords: ialarm,antifurtocasa365,alarm
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
@@ -16,4 +15,1 @@ Classifier: Intended Audience :: Developers
 License-File: LICENSE
-
-UNKNOWN
-

pyialarm.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: pyialarm
-Version: 1.9.0
+Version: 2.0.0
 Summary: A simple library to interface with iAlarm systems, built for use with Home-Assistant
 Home-page: https://github.com/RyuzakiKK/pyialarm
+Download-URL: https://github.com/RyuzakiKK/pyialarm
 Author: Ludovico de Nittis
 Author-email: [e-mail]
 License: Apache 2.0
-Download-URL: https://github.com/RyuzakiKK/pyialarm
 Keywords: ialarm,antifurtocasa365,alarm
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
@@ -16,4 +15,1 @@ Classifier: Intended Audience :: Developers
 License-File: LICENSE
-
-UNKNOWN
-

pyialarm/pyialarm.py

@@ -10,2 +10,7 @@ import logging
 
+# TODO Workaround for https://github.com/quandyfactory/dicttoxml/issues/91
+# Remove when dicttoxml 1.7.5 is released
+import collections
+collections.Iterable = collections.abc.Iterable
+
 log = logging.getLogger(__name__)
@@ -114,2 +119,9 @@ # dicttoxml is very verbose at INFO level
     def get_status(self, include_memory_feature=False) -> int:
+        """
+        :param include_memory_feature:
+            .. deprecated:: 1.9.5
+                Memory feature is always enabled, this parameter has no effect
+        :return: The current alarm status
+        :raises ConnectionError:
+        """
         command = OrderedDict()
@@ -127,6 +139,6 @@ command['DevStatus'] = None
 
-        if not include_memory_feature:
+        if status != self.ARMED_AWAY and status != self.ARMED_STAY:
+            # If the status is not "armed", there is no point in checking for "triggered"
             return status
 
-        zone_alarm = False
         command = OrderedDict()
@@ -144,7 +156,4 @@ command['Total'] = None
             if zone & self.ZONE_ALARM:
-                zone_alarm = True
+                status = self.TRIGGERED
 
-        if (status == self.ARMED_AWAY or status == self.ARMED_STAY) and zone_alarm:
-            return self.TRIGGERED
-
         return status
@@ -267,1 +276,13 @@
         return buf
+
+if __name__ == "__main__":
+    ialarm = IAlarm("192.168.40.200")
+
+    import time
+    for ii in range(30):
+        try:
+            print(ialarm.get_status())
+        except ConnectionError:
+            print("no connection")
+        time.sleep(15)
+        print("-----------")

setup.py

 from setuptools import setup
 
-__version__ = '1.9.0'
+__version__ = '2.0.0'
 
@@ -5,0 +5,0 @@ setup(

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Improved metrics

Total package byte prevSize

23595

2.78%

Lines of code

263

7.79%