Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 21:06:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove indexing/slicing from squash_attachment_parts

Browse Source
This commit is contained in:
link2xt
2024-11-18 18:22:14 +00:00
committed by l
parent 442e2787c6
commit dc58e11d13
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/mimeparser.rs
View File

@@ -665,11 +665,13 @@ impl MimeMessage {
/// Delta Chat sends attachments, such as images, in two-part messages, with the first message /// Delta Chat sends attachments, such as images, in two-part messages, with the first message
/// containing a description. If such a message is detected, text from the first part can be /// containing a description. If such a message is detected, text from the first part can be
/// moved to the second part, and the first part dropped. /// moved to the second part, and the first part dropped.
#[allow(clippy::indexing_slicing)]
fn squash_attachment_parts(&mut self) { fn squash_attachment_parts(&mut self) {
if let [textpart, filepart] = &self.parts[..] { if self.parts.len() == 2
let need_drop = textpart.typ == Viewtype::Text && self.parts.first().map(|textpart| textpart.typ) == Some(Viewtype::Text)
&& match filepart.typ { && self
.parts
.get(1)
.map_or(false, |filepart| match filepart.typ {
Viewtype::Image Viewtype::Image
| Viewtype::Gif | Viewtype::Gif
| Viewtype::Sticker | Viewtype::Sticker
@@ -680,24 +682,24 @@ impl MimeMessage {
| Viewtype::File | Viewtype::File
| Viewtype::Webxdc => true, | Viewtype::Webxdc => true,
Viewtype::Unknown | Viewtype::Text | Viewtype::VideochatInvitation => false, Viewtype::Unknown | Viewtype::Text | Viewtype::VideochatInvitation => false,
}; })
{
let mut parts = std::mem::take(&mut self.parts);
let Some(mut filepart) = parts.pop() else {
// Should never happen.
return;
};
let Some(textpart) = parts.pop() else {
// Should never happen.
return;
};
if need_drop { filepart.msg.clone_from(&textpart.msg);
let mut filepart = self.parts.swap_remove(1); if let Some(quote) = textpart.param.get(Param::Quote) {
filepart.param.set(Param::Quote, quote);
// insert new one
filepart.msg.clone_from(&self.parts[0].msg);
if let Some(quote) = self.parts[0].param.get(Param::Quote) {
filepart.param.set(Param::Quote, quote);
}
// forget the one we use now
self.parts[0].msg = "".to_string();
// swap new with old
self.parts.push(filepart); // push to the end
let _ = self.parts.swap_remove(0); // drops first element, replacing it with the last one in O(1)
} }
self.parts = vec![filepart];
} }
} }