michael/panorama
1
0
Fork 0
Code Issues 11 Pull requests Projects 1 Releases Wiki Activity

Organize parser a bit more

Browse source
This commit is contained in:
Michael Zhang 2021-02-23 21:34:47 -06:00
parent f27f5419fe
commit 7e83a23911
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B
1 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
imap/src/parser/mod.rs
View file

@ -117,7 +117,7 @@ fn build_msg_att_static(pair: Pair<Rule>) -> AttributeValue {
match pair.as_rule() { match pair.as_rule() {
Rule::msg_att_static_internaldate => { Rule::msg_att_static_internaldate => {
AttributeValue::InternalDate(extract_string(unwrap1(pair))) AttributeValue::InternalDate(build_string(unwrap1(pair)))
} }
Rule::msg_att_static_rfc822_size => AttributeValue::Rfc822Size(build_number(unwrap1(pair))), Rule::msg_att_static_rfc822_size => AttributeValue::Rfc822Size(build_number(unwrap1(pair))),
Rule::msg_att_static_envelope => AttributeValue::Envelope(build_envelope(unwrap1(pair))), Rule::msg_att_static_envelope => AttributeValue::Envelope(build_envelope(unwrap1(pair))),
@ -285,25 +285,33 @@ fn build_mailbox_list(pair: Pair<Rule>) -> (Vec<String>, Option<String>, String)
let mut pair = pairs.next().unwrap(); let mut pair = pairs.next().unwrap();
// let mut flags = Vec::new(); // let mut flags = Vec::new();
if let Rule::mailbox_list_flags = pair.as_rule() { let flags = if let Rule::mailbox_list_flags = pair.as_rule() {
let pairs = pair.into_inner(); let pairs_ = pair.into_inner();
for pair in pairs { let mut flags = Vec::new();
for pair in pairs_ {
debug!("pair: {:?}", pair); debug!("pair: {:?}", pair);
let flags = build_mbx_list_flags(pair); flags.extend(build_mbx_list_flags(pair));
debug!("flags: {:?}", flags); debug!("flags: {:?}", flags);
} }
} pair = pairs.next().unwrap();
flags
} else {
Vec::new()
};
// debug!("pair: {:#?}", pair); assert!(matches!(pair.as_rule(), Rule::mailbox_list_string));
todo!() let s = build_nstring(pair);
pair = pairs.next().unwrap();
assert!(matches!(pair.as_rule(), Rule::mailbox));
let mailbox = build_string(pair);
(flags, s, mailbox)
} }
fn build_mbx_list_flags(pair: Pair<Rule>) -> Vec<String> { fn build_mbx_list_flags(pair: Pair<Rule>) -> Vec<String> {
if !matches!(pair.as_rule(), Rule::mbx_list_flags) { assert!(matches!(pair.as_rule(), Rule::mbx_list_flags));
unreachable!("{:#?}", pair); pair.into_inner().map(|pair| pair.as_str().to_owned()).collect()
}
todo!()
} }
fn unwrap1(pair: Pair<Rule>) -> Pair<Rule> { fn unwrap1(pair: Pair<Rule>) -> Pair<Rule> {
@ -322,7 +330,14 @@ where
pair.as_str().parse::<T>().unwrap() pair.as_str().parse::<T>().unwrap()
} }
fn extract_string(pair: Pair<Rule>) -> String { fn build_nstring(pair: Pair<Rule>) -> Option<String> {
if matches!(pair.as_rule(), Rule::nil) {
return None;
}
Some(build_string(pair))
}
fn build_string(pair: Pair<Rule>) -> String {
// TODO: actually get rid of the quotes and escaped chars // TODO: actually get rid of the quotes and escaped chars
pair.as_str().to_owned() pair.as_str().to_owned()
} }