Improve description filter generation.

* don't generate invalid filter when description contains port name multiple times
* if a bad filter got generated use empty filter instead

Author: karliss

inkcut/device/transports/serialport/plugin.py

@@ -105,10 +105,20 @@ def make_filter(self, port_info: SerialPortInfo):
             # also more likely to have stable device path so there is less need for filter.
             if port_info.description:
                 text = port_info.description
-                text = text.replace(port_info.device_path, '').strip()
-                text = text.strip('-: ')
-                if text:
-                    self.port_filter_name = re.escape(text)
+                text = text.strip(' -:()')
+                parts = text.split(port_info.device_path)
+                best = ""
+                for part in parts:
+                    if len(part) > len(best):
+                        best = part
+
+                best = best.strip(' -:()')
+
+                if best:
+                    self.port_filter_name = re.escape(best)
+                    if not re.search(self.port_filter_name, port_info.description):
+                        log.warn("Failed to create port description filter for '{}'".format(port_info.description))
+                        self.port_filter_name = ""
 
     def port_by_path(self, device_path):
         for port in self.ports:

tests/transport/test_serial_config.py

@@ -85,3 +85,11 @@ def test_make_filter():
     config = SerialConfigBase()
     config.make_filter(info)
     assert config.port_filter_name == "description"
+
+    info = SerialPortInfo(device_path='COM3', description=r" (COM3) description (COM3) ",
+                          usb_vid=123, usb_pid=321)
+    config = SerialConfigBase()
+    config.make_filter(info)
+    assert config.port_matches(info)
+    assert not config.port_matches(SerialPortInfo(device_path='COM3', description=r"zescriptionz",
+                          usb_vid=123, usb_pid=321))