Merge branch 'fix/auto-color-timestamp' into 'master'

fix: Auto color for alternative timestamp formats Closes IDFGH-14376 See merge request espressif/esp-idf-monitor!78
espressif · Jan 14, 2025 · 444fb2b · 444fb2b
2 parents cea7d79 + 25d3b95
commit 444fb2b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/esp_idf_monitor/base/output_helpers.py b/esp_idf_monitor/base/output_helpers.py
@@ -17,7 +17,7 @@
 ANSI_YELLOW_B = ANSI_YELLOW.encode()
 ANSI_NORMAL_B = ANSI_NORMAL.encode()
 
-AUTO_COLOR_REGEX = re.compile(rb'^(I|W|E) \(\d+\)')
+AUTO_COLOR_REGEX = re.compile(rb'^(I|W|E) \([\d:\. -]+\)')
 
 COMMON_PREFIX = '---'
 

diff --git a/test/host_test/inputs/color.txt b/test/host_test/inputs/color.txt
@@ -3,8 +3,12 @@ D (120) debug: Debug message
 I (578) main_task: Started on CPU0
 W (470) spi_flash: Detected size(4096k)
 E (623) foo: This is an example error
+I (00:00:00.100) bar: This is an example with system time
+I (20-02-02 00:00:00.100) baz: This is an example with system datetime
 Hello world!
 Already colored
 [0;32mI (578) main_task: Started on CPU0[0m
 [0;33mW (470) spi_flash: Detected size(4096k)[0m
 [1;31mE (623) foo: This is an example error[0m
+[0;32mI (00:00:00.100) bar: This is an example with system time[0m
+[0;32mI (20-02-02 00:00:00.100) baz: This is an example with system datetime[0m
diff --git a/test/host_test/inputs/color_out.txt b/test/host_test/inputs/color_out.txt
@@ -3,8 +3,12 @@ D (120) debug: Debug message
 [0;32mI (578) main_task: Started on CPU0[0m
 [0;33mW (470) spi_flash: Detected size(4096k)[0m
 [1;31mE (623) foo: This is an example error[0m
+[0;32mI (00:00:00.100) bar: This is an example with system time[0m
+[0;32mI (20-02-02 00:00:00.100) baz: This is an example with system datetime[0m
 Hello world!
 Already colored
 [0;32mI (578) main_task: Started on CPU0[0m
 [0;33mW (470) spi_flash: Detected size(4096k)[0m
 [1;31mE (623) foo: This is an example error[0m
+[0;32mI (00:00:00.100) bar: This is an example with system time[0m
+[0;32mI (20-02-02 00:00:00.100) baz: This is an example with system datetime[0m