Optimize regex

jotonedev · Oct 13, 2024 · 6400b7e · 6400b7e
1 parent b1a77e0
commit 6400b7e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/pyown/messages/base.py b/pyown/messages/base.py
@@ -36,7 +36,7 @@ class BaseMessage(abc.ABC):
     suffix: Final[str] = "##"  # Suffix of the message
     separator: Final[str] = "*"  # Separator of the tags
 
-    _regex: Pattern[str] = re.compile(r"^\*(?:([0-9#]*)\*?)+##$")  # Regex pattern used to match the message
+    _regex: Pattern[str] = re.compile(r"^\*(?:([0-9]*)(?:#[0-9]*)*\*?)+##$")  # Regex pattern used to match the message
 
     @abc.abstractmethod
     def __init__(self, *args, **kwargs) -> None:

diff --git a/pyown/messages/dimension.py b/pyown/messages/dimension.py
@@ -22,7 +22,7 @@ class DimensionRequest(BaseMessage):
     _type: MessageType = MessageType.DIMENSION_REQUEST
     _tags: tuple[Who, Where, Dimension]
 
-    _regex: Pattern[str] = re.compile(r"^\*#[0-9#]+\*[0-9#]*\*[0-9]*##$")
+    _regex: Pattern[str] = re.compile(r"^\*#[0-9#]+\*[0-9]*(?:#[0-9]*)*\*[0-9]*##$")
 
     def __init__(self, tags: tuple[Who, Where, Dimension]):
         self._tags = tags
@@ -67,7 +67,7 @@ class DimensionWriting(BaseMessage):
     _type: MessageType = MessageType.DIMENSION_WRITING
     _tags: tuple[Who, Where, Dimension, Value, ...]  # type: ignore[misc]
 
-    _regex: Pattern[str] = re.compile(r"^\*#[0-9#]+\*[0-9#]*\*#[0-9]*(?:\*[0-9#]*)*##$")
+    _regex: Pattern[str] = re.compile(r"^\*#[0-9#]+\*[0-9]*(?:#[0-9]*)*\*#[0-9]*(?:\*[0-9]*(?:#[0-9]*)*)*##$")
 
     def __init__(self, tags: tuple[Who, Where, Dimension, Value, ...]):  # type: ignore[misc]
         self._tags = tags
@@ -118,7 +118,7 @@ class DimensionResponse(DimensionWriting, BaseMessage):
     This is sent by the server to the client
     """
     _type: MessageType = MessageType.DIMENSION_RESPONSE
-    _regex: Pattern[str] = re.compile(r"^\*#[0-9#]+\*[0-9#]*\*[0-9#]*(?:\*[0-9#]*)*##$")
+    _regex: Pattern[str] = re.compile(r"^\*#[0-9#]+\*[0-9]*(?:#[0-9]*)*\*[0-9]*(?:#[0-9]*)*(?:\*[0-9]*(?:#[0-9]*)*)*##$")
 
     @property
     def message(self) -> str:

diff --git a/pyown/messages/normal.py b/pyown/messages/normal.py
@@ -19,7 +19,7 @@ class NormalMessage(BaseMessage):
     _type: MessageType = MessageType.NORMAL
     _tags: tuple[Who, What, Where]
 
-    _regex: Pattern[str] = re.compile(r"^\*[0-9#]+\*[0-9#]*\*[0-9#]*##$")
+    _regex: Pattern[str] = re.compile(r"^\*[0-9#]+\*[0-9]*(?:#[0-9]*)*\*[0-9]*(?:#[0-9]*)*##$")
 
     def __init__(self, tags: tuple[Who, What, Where]):
         self._tags = tags

diff --git a/pyown/messages/status.py b/pyown/messages/status.py
@@ -18,7 +18,7 @@ class StatusRequest(BaseMessage):
     _type: MessageType = MessageType.STATUS_REQUEST
     _tags: tuple[Who, Where]
 
-    _regex: Pattern[str] = re.compile(r"^\*#[0-9#]+\*[0-9#]*##$")
+    _regex: Pattern[str] = re.compile(r"^\*#[0-9#]+\*[0-9]*(?:#[0-9]*)*##$")
 
     def __init__(self, tags: tuple[Who, Where]):
         self._tags = tags