From 1bb0f05fc051153d63dc20507c1389a2fd4cfa49 Mon Sep 17 00:00:00 2001
From: Greg Burri <greg.burri@gmail.com>
Date: Sat, 26 Apr 2025 15:56:56 +0200
Subject: [PATCH] Enhance logging display in dev panel with structured output
 and improved styling

---
 .gitignore                       |  1 +
 backend/scss/main.scss           | 48 ++++++++++++++++++++++-
 backend/src/log.rs               | 65 +++++++++++++++++++++++++-------
 backend/templates/dev_panel.html | 17 ++++++---
 4 files changed, 110 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3ff887c..a6ea564 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ conf.ron
 node_modules
 pkg
 package-lock.json
+.vscode/settings.json
diff --git a/backend/scss/main.scss b/backend/scss/main.scss
index 2c65450..78f3661 100644
--- a/backend/scss/main.scss
+++ b/backend/scss/main.scss
@@ -188,8 +188,52 @@ body {
         }
 
         #dev-panel {
-            .log-line-odd {
-                background-color: consts.$color-1;
+            .line {
+                padding: 3px;
+
+                &.odd {
+                    background-color: consts.$color-1;
+                }
+            }
+
+            .date-time {
+                font-weight: bold;
+            }
+
+            .level {
+                padding: 2px;
+                border-radius: 4px;
+
+                &.ERROR {
+                    color: white;
+                    background-color: red;
+                }
+
+                &.WARN {
+                    color: black;
+                    background-color: orange;
+                }
+
+                &.INFO {
+                    color: white;
+                    background-color: blue;
+                }
+
+                &.DEBUG {
+                    color: white;
+                    background-color: green;
+                }
+
+                &.TRACE {
+                    color: black;
+                    background-color: yellow;
+                }
+            }
+
+            .thread-name,
+            .thread-id {
+                font-style: italic;
+                font-size: 80%;
             }
         }
 
diff --git a/backend/src/log.rs b/backend/src/log.rs
index 9fe4a90..054be4d 100644
--- a/backend/src/log.rs
+++ b/backend/src/log.rs
@@ -1,6 +1,6 @@
 use std::{
-    fs::{self, File},
-    io::{BufRead, BufReader},
+    fs::{self, DirEntry, File},
+    io::{self, BufRead, BufReader},
     path::{Path, PathBuf},
     sync::Arc,
 };
@@ -34,7 +34,6 @@ pub struct Log {
     directory: PathBuf,
 }
 
-// TODO: Remove all 'unwrap'.
 impl Log {
     pub fn new<P>(directory: P) -> Self
     where
@@ -76,28 +75,38 @@ impl Log {
     }
 
     pub fn file_names(&self) -> std::io::Result<Vec<String>> {
+        fn dir_entry_to_string(entry: Result<DirEntry, io::Error>) -> String {
+            entry.map_or_else(
+                |err| format!("Unable to read entry: {}", err),
+                |entry| {
+                    entry
+                        .path()
+                        .file_name()
+                        .map_or("Unable to read filename".into(), |filename| {
+                            filename
+                                .to_str()
+                                .map_or("Unable to read filename".into(), |filename| {
+                                    filename.to_string()
+                                })
+                        })
+                },
+            )
+        }
+
         Ok(self
             .directory
             .read_dir()?
-            .map(|entry| {
-                entry
-                    .unwrap()
-                    .path()
-                    .file_name()
-                    .unwrap()
-                    .to_str()
-                    .unwrap()
-                    .to_string()
-            })
+            .map(dir_entry_to_string)
             .sorted()
+            .rev()
             .collect())
     }
 
+    /// Reads the content of a log file and return it as a vector of lines.
     pub fn read_content(&self, filename: &str) -> std::io::Result<Vec<String>> {
         let filepath = self.directory.join(filename);
         if filepath.is_file() {
             let file = File::open(filepath)?;
-            // tracing::event!(Level::ERROR, "file: {:?}", file);
             Ok(BufReader::new(file)
                 .lines()
                 .map(|l| l.unwrap_or_default())
@@ -106,4 +115,32 @@ impl Log {
             Ok(vec![])
         }
     }
+
+    pub fn split_line(line: &str) -> Line {
+        let mut line_splitted = line.split(' ').filter(|s| !s.is_empty());
+
+        Line {
+            date_time: line_splitted.next().unwrap_or_default(),
+            level: line_splitted.next().unwrap_or_default(),
+            thread_name: if TRACING_DISPLAY_THREAD {
+                line_splitted.next().unwrap_or_default()
+            } else {
+                ""
+            },
+            thread_id: if TRACING_DISPLAY_THREAD {
+                line_splitted.next().unwrap_or_default()
+            } else {
+                ""
+            },
+            message: line_splitted.join(" "), // TODO: use `remainder()` when in stable Rust.
+        }
+    }
+}
+
+pub struct Line<'a> {
+    pub date_time: &'a str,
+    pub level: &'a str,
+    pub thread_name: &'a str,
+    pub thread_id: &'a str,
+    pub message: String,
 }
diff --git a/backend/templates/dev_panel.html b/backend/templates/dev_panel.html
index 18a5ccf..26489bb 100644
--- a/backend/templates/dev_panel.html
+++ b/backend/templates/dev_panel.html
@@ -16,13 +16,20 @@
             {% match log.read_content(current_log_file) %}
             {% when Ok(lines) %}
                 {% for l in lines %}
-                    <div class="
-                    {% if loop.index0 % 2 == 0 %}
-                        log-line-even
+                    <div class="line
+                    {%~ if loop.index0 % 2 == 0 %}
+                        even
                     {% else %}
-                        log-line-odd
+                        odd
                     {% endif %}
-                    " >{{ l }}</div>
+                    " >
+                    {% let l_info = Log::split_line(l) %}
+                    <span class="date-time">{{ l_info.date_time }}</span>
+                    <span class="level {{~ l_info.level }}">{{ l_info.level }}</span>
+                    <span class="thread-name">{{ l_info.thread_name }}</span>
+                    <span class="thread-id">{{ l_info.thread_id }}</span>
+                    <span class="message">{{ l_info.message | linebreaksbr }}</span>
+                </div>
                 {% endfor %}
             {% when Err(err) %}
                 Error reading log: {{ err }}