robin/logsmash
1
0
Fork 0
mirror of https://codeberg.org/icewind/logsmash.git synced 2026-06-03 10:04:12 +02:00
Code Issues Projects Releases 3 Packages Wiki Activity Actions

trim whitespace from extracted placeholders

Browse source
This commit is contained in:
Robin Appelman 2024-09-14 17:46:15 +02:00
commit b24297dfd5
4 changed files with 115 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

12
logging-extractor/src/messagebuilder.rs
View file

@ -22,8 +22,7 @@ impl MessageBuilder {
for placeholder in self.placeholder_regex.find_iter(content) {
if placeholder.start() > start {
Self::push_literal_inner(&mut self.parts, &content[start..placeholder.start()]);
self.parts
.push(MessagePart::PlaceHolder(placeholder.as_str().into()));
Self::push_placeholder_inner(&mut self.parts, placeholder.as_str());
}
start = placeholder.end();
}
@ -44,8 +43,13 @@ impl MessageBuilder {
}
pub fn push_placeholder(&mut self, placeholder: &str) {
self.parts
.push(MessagePart::PlaceHolder(placeholder.into()));
Self::push_placeholder_inner(&mut self.parts, placeholder);
}
fn push_placeholder_inner(parts: &mut Vec<MessagePart>, placeholder: &str) {
let placeholder = placeholder.replace(['\n', '\r', '\t'], "");
parts
.push(MessagePart::PlaceHolder(placeholder));
}
pub fn push_node(&mut self, node: Node, code: &str) {