wip

Author: Guzz-T

luxtronik/__init__.py

@@ -63,18 +63,13 @@ def __init__(self, host, port=LUXTRONIK_DEFAULT_PORT, safe=True):
         self._port = port
         self._safe = safe
         self._socket = None
-        self.read()
+        self._connect()
 
     def __del__(self):
-        if self._socket is not None:
-            if not is_socket_closed(self._socket):
-                self._socket.close()
-            self._socket = None
-            LOGGER.info(
-                "Disconnected from Luxtronik heatpump %s:%s", self._host, self._port
-            )
+        self._disconnect()
 
     def _connect(self):
+        """Connect the socket if not already done."""
         is_none = self._socket is None
         if is_none:
             self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -84,8 +79,16 @@ def _connect(self):
                 "Connected to Luxtronik heat pump %s:%s", self._host, self._port
             )
 
-    @staticmethod
-    def _lock_and_connect(func):
+    def _disconnect(self):
+        if self._socket is not None:
+            if not is_socket_closed(self._socket):
+                self._socket.close()
+            self._socket = None
+            LOGGER.info(
+                "Disconnected from Luxtronik heatpump %s:%s", self._host, self._port
+            )
+
+    def _with_lock_and_connect(self, func, *args, **kwargs):
         """
         Decorator around various read/write functions to connect first.
 
@@ -94,39 +97,31 @@ def _lock_and_connect(func):
         performed at any point in time. This helps to avoid issues with the
         Luxtronik controller, which seems unstable otherwise.
         """
-
-        def inner(self, *args, **kwargs):
-            with self._lock:
-                self._connect()
-                return func(self, *args, **kwargs)
-
-        return inner
+        with self._lock:
+            self._connect()
+            ret_val = func(self, *args, **kwargs)
+            # self._disconnect()
+            return ret_val
 
     def read(self):
         """
         Read data from heat pump.
         All available data will be read from the heat pump.
         """
-        with self.lock:
-            self._connect()
-            return self._read()
+        return self._with_lock_and_connect(self._read)
 
-    @_lock_and_connect
     def read_parameters(self):
         """Read parameters from heat pump."""
-        return self._read_parameters()
+        return self._with_lock_and_connect(self._read_parameters)
 
-    @_lock_and_connect
     def read_calculations(self):
         """Read calculations from heat pump."""
-        return self._read_calculations()
+        return self._with_lock_and_connect(self._read_calculations)
 
-    @_lock_and_connect
     def read_visibilities(self):
         """Read visibilities from heat pump."""
-        return self._read_visibilities()
+        return self._with_lock_and_connect(self._read_visibilities)
 
-    @_lock_and_connect
     def write(self, parameters):
         """
         Write parameter to heat pump.
@@ -136,7 +131,7 @@ def write(self, parameters):
                           to the heatpump before reading all available data
                           from the heat pump.
         """
-        return self._write(parameters)
+        return self._with_lock_and_connect(self._write, parameters)
 
     def _read(self):
         parameters = self._read_parameters()