Import upstream v0.16.22, stripped
Upstream commit: 474dd0229cb20cf513036619781ed97bd8073c3f Enterprise-only files removed or emptied: 63 Enterprise-only snippets removed: 117 in 50 files Dangling module declarations removed: 5 Cargo edits turning enterprise off: 14 Verification: clean Enterprise feature gates left for rebuilt features: 19 in 18 files Produced by tools/fork/strip.py. The full report is in docs/fork/strip-reports/ on main.
This commit is contained in:
@@ -0,0 +1,120 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2020 Stalwart Labs LLC <[email protected]>
|
||||
*
|
||||
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
|
||||
*/
|
||||
|
||||
use compact_str::ToCompactString;
|
||||
use mail_parser::decoders::charsets::map::charset_decoder;
|
||||
|
||||
use crate::{
|
||||
Command,
|
||||
protocol::thread::{self, Algorithm},
|
||||
receiver::{Request, bad},
|
||||
};
|
||||
|
||||
use super::search::parse_filters;
|
||||
|
||||
impl Request<Command> {
|
||||
#[allow(clippy::while_let_on_iterator)]
|
||||
pub fn parse_thread(self) -> trc::Result<thread::Arguments> {
|
||||
if self.tokens.is_empty() {
|
||||
return Err(self.into_error("Missing thread criteria."));
|
||||
}
|
||||
|
||||
let mut tokens = self.tokens.into_iter().peekable();
|
||||
let algorithm = Algorithm::parse(
|
||||
&tokens
|
||||
.next()
|
||||
.ok_or_else(|| bad(self.tag.to_compact_string(), "Missing threading algorithm."))?
|
||||
.unwrap_bytes(),
|
||||
)
|
||||
.map_err(|v| bad(self.tag.to_compact_string(), v))?;
|
||||
|
||||
let decoder = charset_decoder(
|
||||
&tokens
|
||||
.next()
|
||||
.ok_or_else(|| bad(self.tag.to_compact_string(), "Missing charset."))?
|
||||
.unwrap_bytes(),
|
||||
);
|
||||
|
||||
let filter = parse_filters(&mut tokens, decoder)
|
||||
.map_err(|v| bad(self.tag.to_compact_string(), v))?;
|
||||
match filter.len() {
|
||||
0 => Err(bad(
|
||||
self.tag.to_compact_string(),
|
||||
"No filters found in command.",
|
||||
)),
|
||||
_ => Ok(thread::Arguments {
|
||||
algorithm,
|
||||
filter,
|
||||
tag: self.tag,
|
||||
}),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Algorithm {
|
||||
pub fn parse(value: &[u8]) -> super::Result<Self> {
|
||||
hashify::tiny_map_ignore_case!(value,
|
||||
"ORDEREDSUBJECT" => Self::OrderedSubject,
|
||||
"REFERENCES" => Self::References,
|
||||
)
|
||||
.ok_or_else(|| {
|
||||
format!(
|
||||
"Invalid threading algorithm {:?}",
|
||||
String::from_utf8_lossy(value)
|
||||
)
|
||||
.into()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
|
||||
use crate::{
|
||||
protocol::{
|
||||
search::Filter,
|
||||
thread::{self, Algorithm},
|
||||
},
|
||||
receiver::Receiver,
|
||||
};
|
||||
|
||||
#[test]
|
||||
fn parse_thread() {
|
||||
let mut receiver = Receiver::new();
|
||||
|
||||
for (command, arguments) in [
|
||||
(
|
||||
b"A283 THREAD ORDEREDSUBJECT UTF-8 SINCE 5-MAR-2000\r\n".to_vec(),
|
||||
thread::Arguments {
|
||||
algorithm: Algorithm::OrderedSubject,
|
||||
filter: vec![Filter::Since(952214400)],
|
||||
tag: "A283".into(),
|
||||
},
|
||||
),
|
||||
(
|
||||
b"A284 THREAD REFERENCES US-ASCII TEXT \"gewp\"\r\n".to_vec(),
|
||||
thread::Arguments {
|
||||
algorithm: Algorithm::References,
|
||||
filter: vec![Filter::Text("gewp".into())],
|
||||
tag: "A284".into(),
|
||||
},
|
||||
),
|
||||
] {
|
||||
let command_str = String::from_utf8_lossy(&command).into_owned();
|
||||
|
||||
assert_eq!(
|
||||
receiver
|
||||
.parse(&mut command.iter())
|
||||
.unwrap()
|
||||
.parse_thread()
|
||||
.expect(&command_str),
|
||||
arguments,
|
||||
"{}",
|
||||
command_str
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user