Merge branch 'fix/line_matcher' into 'master'

peterdragun · peterdragun · commit e9aa6eb2bbce · 2025-04-25T14:48:36.000+08:00
fix: Update line matcher regex to handle all timestamp formats

Closes IDFGH-14866 and IDFGH-14852

See merge request espressif/esp-idf-monitor!87
diff --git a/esp_idf_monitor/base/line_matcher.py b/esp_idf_monitor/base/line_matcher.py
@@ -23,7 +23,12 @@ class LineMatcher(object):
     def __init__(self, print_filter):
         # type: (str) -> None
         self._dict = dict()
-        self._re = re.compile(r'^(?:\033\[[01];?[0-9]+m?)?([EWIDV]) \([0-9]+\) ([^:]+): ')
+        self._re = re.compile(
+            r'^(?:\033\[[01];?\d+m?)?'  # ANSI color
+            r'([EWIDV]) '  # log level
+            r'(?:\([^)]+\) )?'  # optional timestamp
+            r'([^:]+): '  # tag
+        )
         items = print_filter.split()
         if len(items) == 0:
             self._dict['*'] = self.LEVEL_V  # default is to print everything
diff --git a/test/host_test/inputs/in1.txt b/test/host_test/inputs/in1.txt
@@ -83,4 +83,8 @@ V (371) hello_world: verbose2[0m
 [0;32mI (381) hello_world: info2[0m
 noeol 0x40080000[0;33m0x40080000: _iram_start at /home/dragon/esp/esp-idf/components/freertos/xtensa_vectors.S:1685
 [0m
+[0;32mI (1718795571035) hello_world: info3 with unix epoch timestamp[0m
+[0;32mI (10:12:51.035) hello_world: info4 with HH:MM:SS.MS[0m
+[0;32mI (24-06-19 10:12:51.035) hello_world: info5 with YY-MM-DD HH:MM:SS.MS[0m
+[0;32mI hello_world: info6 without timestamp[0m
 [0m
diff --git a/test/host_test/inputs/in1f1.txt b/test/host_test/inputs/in1f1.txt
@@ -83,4 +83,8 @@ V (371) hello_world: verbose2[0m
 [0;32mI (381) hello_world: info2[0m
 noeol 0x40080000[0;33m0x40080000: _iram_start at /home/dragon/esp/esp-idf/components/freertos/xtensa_vectors.S:1685
 [0m
+[0;32mI (1718795571035) hello_world: info3 with unix epoch timestamp[0m
+[0;32mI (10:12:51.035) hello_world: info4 with HH:MM:SS.MS[0m
+[0;32mI (24-06-19 10:12:51.035) hello_world: info5 with YY-MM-DD HH:MM:SS.MS[0m
+[0;32mI hello_world: info6 without timestamp[0m
 [0m
diff --git a/test/host_test/inputs/in1f2.txt b/test/host_test/inputs/in1f2.txt
@@ -8,3 +8,7 @@ D (361) hello_world: debug2[0m
 V (371) hello_world: verbose2[0m
 [0;31mE (371) hello_world: error2[0m
 [0;32mI (381) hello_world: info2[0m
+[0;32mI (1718795571035) hello_world: info3 with unix epoch timestamp[0m
+[0;32mI (10:12:51.035) hello_world: info4 with HH:MM:SS.MS[0m
+[0;32mI (24-06-19 10:12:51.035) hello_world: info5 with YY-MM-DD HH:MM:SS.MS[0m
+[0;32mI hello_world: info6 without timestamp[0m

-Original file line number
+Diff line change
 [0;32mI (381) hello_world: info2[0m
 noeol 0x40080000[0;33m0x40080000: _iram_start at /home/dragon/esp/esp-idf/components/freertos/xtensa_vectors.S:1685
 [0m
 +[0;32mI (1718795571035) hello_world: info3 with unix epoch timestamp[0m
 +[0;32mI (10:12:51.035) hello_world: info4 with HH:MM:SS.MS[0m
 +[0;32mI (24-06-19 10:12:51.035) hello_world: info5 with YY-MM-DD HH:MM:SS.MS[0m
 +[0;32mI hello_world: info6 without timestamp[0m
 [0m