Merge branch 'feat-memory-protocol' into feat-conn-string-builders

Author: u-chaCP

common/pattern_parser.py

@@ -68,14 +68,14 @@ def _next(self) -> typing.Optional[Token]:
             is_variable = False
             pos: int = self._position
 
-            if self._pattern[pos: pos + 2] == "/%":
+            if self._pattern[pos] == "$":
                 is_variable = True
-                pos += 2
+                pos += 1
 
-            while pos + 1 < length:
-                if self._pattern[pos: pos + 2] == "/%":
+            while pos < length:
+                if self._pattern[pos] == "$":
                     if is_variable:
-                        pos += 2
+                        pos += 1
                     break
                 pos += 1
 

common/tokens/token_factory.py

@@ -4,17 +4,17 @@
 
 class TokenFactory:
     tokens = {
-        "/%appname/%": AppNameToken,
-        "/%session/%": SessionToken,
-        "/%hostname/%": HostNameToken,
-        "/%title/%": TitleToken,
-        "/%timestamp/%": TimestampToken,
-        "/%level/%": LevelToken,
-        "/%color/%": ColorToken,
-        "/%logentrytype/%": LogEntryTypeToken,
-        "/%viewerid/%": ViewerIdToken,
-        "/%thread/%": ThreadIdToken,
-        "/%process/%": ProcessIdToken,
+        "$appname$": AppNameToken,
+        "$session$": SessionToken,
+        "$hostname$": HostNameToken,
+        "$title$": TitleToken,
+        "$timestamp$": TimestampToken,
+        "$level$": LevelToken,
+        "$color$": ColorToken,
+        "$logentrytype$": LogEntryTypeToken,
+        "$viewerid$": ViewerIdToken,
+        "$thread$": ThreadIdToken,
+        "$process$": ProcessIdToken,
     }
 
     @staticmethod
@@ -37,30 +37,29 @@ def get_token(cls, value: str) -> Token:
         if length <= 2:
             return cls._create_literal(value)
 
-        if value[:2] != "/%" or value[-2:] != "/%":
+        if value[0] != "$" or value[-1] != "$":
             return cls._create_literal(value)
 
         original = value
         options = ""
 
-        # extract the token options: /%token{options}/%
-        if value[-3] == "}":
+        # extract the token options: $token{options}$
+        if value[-2] == "}":
             idx = value.find("{")
 
             if idx > -1:
                 idx += 1
-                options = value[idx: -3]
-                value = value[:idx - 1] + value[-2:]
-                length = len(value)
+                options = value[idx: -2]
+                value = value[:idx - 1] + value[-1]
 
         width = ""
         idx = value.find(",")
 
-        # extract the token width: /%token, width/%
+        # extract the token width: $token, width$
         if idx > -1:
             idx += 1
-            width = value[idx: -2]
-            value = value[: idx - 1] + value[length - 2:]
+            width = value[idx: -1]
+            value = value[: idx - 1] + value[-1]
 
         value = value.lower()
         impl = cls.tokens.get(value)

protocols/text_protocol.py

@@ -8,7 +8,7 @@
 class TextProtocol(FileProtocol):
     _HEADER: bytes = bytes((0xEF, 0xBB, 0xBF))
     _DEFAULT_INDENT: bool = False
-    _DEFAULT_PATTERN: str = "[/%timestamp/%] /%level/%: /%title/%"
+    _DEFAULT_PATTERN: str = "[$timestamp$] $level$: $title$"
 
     def __init__(self) -> None:
         super().__init__()