DGNum/rust-irc
6
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

extract tag value escape and unescape functions

Browse source
This commit is contained in:
Andreas Ots 2020-01-30 23:39:47 +02:00
parent 2bb980044b
commit b903c2595e
1 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
irc-proto/src/message.rs
View file

@ -136,16 +136,7 @@ impl Message {
ret.push_str(&tag.0); ret.push_str(&tag.0);
if let Some(ref value) = tag.1 { if let Some(ref value) = tag.1 {
ret.push('='); ret.push('=');
for c in value.chars() { escape_tag_value(&mut ret, &value);
match c {
';' => ret.push_str("\\:"),
' ' => ret.push_str("\\s"),
'\\' => ret.push_str("\\\\"),
'\r' => ret.push_str("\\r"),
'\n' => ret.push_str("\\n"),
c => ret.push(c),
}
}
} }
ret.push(';'); ret.push(';');
} }
@ -194,26 +185,7 @@ impl FromStr for Message {
.map(|s: &str| { .map(|s: &str| {
let mut iter = s.splitn(2, '='); let mut iter = s.splitn(2, '=');
let (fst, snd) = (iter.next(), iter.next()); let (fst, snd) = (iter.next(), iter.next());
let snd = snd.map(|snd| { let snd = snd.map(unescape_tag_value);
let mut unescaped = String::with_capacity(snd.len());
let mut iter = snd.chars();
while let Some(c) = iter.next() {
if c == '\\' {
match iter.next() {
Some(':') => unescaped.push(';'),
Some('s') => unescaped.push(' '),
Some('\\') => unescaped.push('\\'),
Some('r') => unescaped.push('\r'),
Some('n') => unescaped.push('\n'),
Some(c) => unescaped.push(c),
None => break,
}
} else {
unescaped.push(c);
}
}
unescaped
});
Tag(fst.unwrap_or("").to_owned(), snd) Tag(fst.unwrap_or("").to_owned(), snd)
}) })
.collect::<Vec<_>>() .collect::<Vec<_>>()
@ -302,6 +274,40 @@ impl Display for Message {
#[derive(Clone, PartialEq, Debug)] #[derive(Clone, PartialEq, Debug)]
pub struct Tag(pub String, pub Option<String>); pub struct Tag(pub String, pub Option<String>);
fn escape_tag_value(msg: &mut String, value: &str) {
for c in value.chars() {
match c {
';' => msg.push_str("\\:"),
' ' => msg.push_str("\\s"),
'\\' => msg.push_str("\\\\"),
'\r' => msg.push_str("\\r"),
'\n' => msg.push_str("\\n"),
c => msg.push(c),
}
}
}
fn unescape_tag_value(value: &str) -> String {
let mut unescaped = String::with_capacity(value.len());
let mut iter = value.chars();
while let Some(c) = iter.next() {
if c == '\\' {
match iter.next() {
Some(':') => unescaped.push(';'),
Some('s') => unescaped.push(' '),
Some('\\') => unescaped.push('\\'),
Some('r') => unescaped.push('\r'),
Some('n') => unescaped.push('\n'),
Some(c) => unescaped.push(c),
None => break,
}
} else {
unescaped.push(c);
}
}
unescaped
}
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::{Message, Tag}; use super::{Message, Tag};