From e0a2a0928d167ba5738fb07459d67e9d128f3cdb Mon Sep 17 00:00:00 2001
From: Stephan Hadinger <stephan.hadinger@gmail.com>
Date: Sun, 9 Oct 2022 14:59:15 +0200
Subject: [PATCH] Zigbee plugin allow matches to 'starts wth'

---
 .../xdrv_23_zigbee_5_1_attributes.ino         | 39 +++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_1_attributes.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_1_attributes.ino
index 78f02b561..75f2537c2 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_1_attributes.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_1_attributes.ino
@@ -342,18 +342,43 @@ public:
     manufacturer = (const char*)_manuf;
   }
 
+  // check if a matches b, return true if so
+  //
+  // Special behavior:
+  // - return true if `a` is empty or null
+  // - return false if `b` is null
+  // - matches start of `a` if `a` ends with `'*'`
+  // - exact match otherwise
+  static bool matchStar(const char *_a, const char *_b) {
+    if (_a == nullptr || *_a == '\0') { return true; }
+    if (_b == nullptr) { return false; }
+
+    const char *a = _a;
+    const char *b = _b;
+    while (1) {
+      if (a[0] == '*' && a[1] == '\0') {  // pattern ends with '*'
+        return true;    // matches worked until now, accept match
+      }
+      if (*a != *b) {
+        return false;
+      }
+      if (*a == '\0') {
+        return true;
+      }
+      a++;
+      b++;
+    }
+  }
+
   bool match(const char *match_model, const char *match_manuf) const {
     bool match = true;
-    if (model.length() > 0) {
-      if (!model.equals(match_model)) {
-        match = false;
-      }
+    if (!matchStar(model.c_str(), match_model)) {
+      match = false;
     }
-    if (manufacturer.length() > 0) {
-      if (!manufacturer.equals(match_manuf)) {
+    if (!matchStar(manufacturer.c_str(), match_manuf)) {
         match = false;
-      }
     }
+    // AddLog(LOG_LEVEL_DEBUG, ">match device(%s, %s) compared to (%s, %s) = %i", match_model, match_manuf, model.c_str(), manufacturer.c_str(), match);
     return match;
   }