fixed bug for regex generation

Author: mkashwin

02_mqtt-cluster/src/uns_mqtt/mqtt_listener.py

@@ -359,9 +359,9 @@ def get_regex_for_topic_with_wildcard(topic_with_wildcard) -> str:
                 regex_exp += "[^/]*/"
             elif curr_value == "#":
                 if last_value is None:  # Handle if subscribed to #
-                    regex_exp += "(.)*/"
+                    regex_exp += "(.*)*/"
                 else:  # need to wrap the last / in optional too i.e. 'a/#' should map to just 'a' too
-                    regex_exp = regex_exp[:-1] + "(/.)*"
+                    regex_exp = regex_exp[:-1] + "(/.*)*"
             else:
                 regex_exp += curr_value + "/"
             last_value = curr_value

02_mqtt-cluster/test/test_mqtt_listner.py

@@ -200,10 +200,17 @@ def on_connect(client, userdata, flags, result_code, properties=None):
         ("#", "a/b/c", True),
         ("a/#", "a", True),
         ("a/#", "a/b/c", True),
+        ("a/#", "a/bbb", True),
         ("a/#", "ab/a", False),
+        ("a/#/c", "ab/a", False),
+        ("a/#/c", "a/b/c", True),
+        ("aa/#/cc", "aa/abc/cc", True),
         ("a/+", "a/b", True),
+        ("a/+", "a/bbb", True),
         ("a/+/c", "a/b/c", True),
+        ("a/+/c", "a/bbb/c", True),
         ("+", "a", True),
+        ("+", "abc", True),
         ("+", "a/b/c", False),
         (None, "a/b/c", False),
         ("+", "a/b/c", False),