Fixes nugget#201

* Refactored Device.receive_message() to call _is_duplicate() for Direct ACK
* Refactored Device._is_duplicate() to use Message.matches_pattern()

Author: mstovenour

insteonplm/devices/__init__.py

@@ -672,24 +672,26 @@ def receive_message(self, msg):
                 _LOGGER.debug('DA queue: %s',
                               self._sent_msg_wait_for_directACK)
                 _LOGGER.debug('Message ACK with no callback')
-        if (hasattr(msg, 'flags') and
-                hasattr(msg.flags, 'isDirectACK') and
-                msg.flags.isDirectACK):
-            _LOGGER.debug('Got Direct ACK message. Already in queue: %d, '
-                          'Queueing %s:%s',
-                          self._directACK_received_queue.qsize(), id(msg), msg)
-            if self._send_msg_lock.locked():
-                self._directACK_received_queue.put_nowait(msg)
-            else:
-                _LOGGER.debug('But Direct ACK not expected')
+
+
         if not self._is_duplicate(msg):
+            if (hasattr(msg, 'flags') and
+                    hasattr(msg.flags, 'isDirectACK') and
+                    msg.flags.isDirectACK):
+                _LOGGER.debug('Got Direct ACK message. Already in queue: %d, '
+                    'Queueing %s:%s', self._directACK_received_queue.qsize(),
+                    id(msg), msg)
+                if self._send_msg_lock.locked():
+                    self._directACK_received_queue.put_nowait(msg)
+                else:
+                    _LOGGER.debug('But Direct ACK not expected')
+
             callbacks = self._message_callbacks.get_callbacks_from_message(msg)
             for callback in callbacks:
                 _LOGGER.debug('Scheduling msg callback: %s', callback)
                 self._plm.loop.call_soon(callback, msg)
         else:
-            _LOGGER.debug('msg is duplicate')
-            _LOGGER.debug(msg)
+            _LOGGER.debug('msg is duplicate: %s', id(msg))
         self._last_communication_received = datetime.datetime.now()
         _LOGGER.debug('Ending Device.receive_message')
 
@@ -706,36 +708,19 @@ def _is_duplicate(self, msg):
                 if msg_received >= (datetime.datetime.now() -
                                     datetime.timedelta(0, 0, 500000)):
                     recent_messages.append(recent_message)
-        if not recent_messages:
-            self._save_recent_message(msg)
-            return False
 
+        ret_val = False
         for recent_message in recent_messages:
             prev_msg = recent_message.get('msg')
             self._recent_messages.put_nowait(recent_message)
-            prev_cmd1 = prev_msg.cmd1
-            if prev_msg.flags.isAllLinkBroadcast:
-                prev_group = prev_msg.target.bytes[2]
-            elif prev_msg.flags.isAllLinkCleanup:
-                prev_group = prev_msg.cmd2
-
-            if msg.flags.isAllLinkCleanup or msg.flags.isAllLinkBroadcast:
-                cmd1 = msg.cmd1
-                if msg.flags.isAllLinkBroadcast:
-                    group = msg.target.bytes[2]
-                else:
-                    group = msg.cmd2
-                if prev_cmd1 == cmd1 and prev_group == group:
-                    return True
-                self._save_recent_message(msg)
-            else:
-                self._save_recent_message(msg)
-                return False
-
-    def _save_recent_message(self, msg):
-        recent_message = {"msg": msg,
-                          "received": datetime.datetime.now()}
-        self._recent_messages.put_nowait(recent_message)
+            if msg.matches_pattern(prev_msg):
+                ret_val = True
+
+        self._recent_messages.put_nowait(
+            {"msg": msg,
+             "received": datetime.datetime.now()
+            })
+        return ret_val
 
     def _send_msg(self, msg, callback=None, on_timeout=False):
         _LOGGER.debug('Starting %s Device._send_msg: Queuing message',

insteonplm/plm.py

@@ -472,8 +472,8 @@ async def _wait_ack_nak(self, msg):
             with async_timeout.timeout(ACKNAK_TIMEOUT):
                 while not is_ack_nak:
                     acknak = await self._acknak_queue.get()
-                    _LOGGER.debug('Processing _acknak_queue acknak: %s:%s msg'
-                                  ': %s:%s', id(acknak), acknak, id(msg), msg)
+                    _LOGGER.debug('Processing _acknak_queue acknak: %s msg: %s',
+                                  id(acknak), id(msg))
                     is_ack_nak = self._msg_is_ack_nak(msg, acknak)
                     is_sent = self._msg_is_sent(acknak)
         except asyncio.TimeoutError: