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

imap: use try_next() to avoid the need to transpose Option and Result

Browse Source
This commit is contained in:
link2xt
2023-04-03 23:10:17 +00:00
parent f46f3e939e
commit 3bced80b23
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/imap.rs
View File

@@ -14,7 +14,7 @@ use std::{
use anyhow::{bail, format_err, Context as _, Result}; use anyhow::{bail, format_err, Context as _, Result};
use async_channel::Receiver; use async_channel::Receiver;
use async_imap::types::{Fetch, Flag, Name, NameAttribute, UnsolicitedResponse}; use async_imap::types::{Fetch, Flag, Name, NameAttribute, UnsolicitedResponse};
use futures::StreamExt; use futures::{StreamExt, TryStreamExt};
use num_traits::FromPrimitive; use num_traits::FromPrimitive;
use crate::chat::{self, ChatId, ChatIdBlocked}; use crate::chat::{self, ChatId, ChatIdBlocked};
@@ -516,8 +516,7 @@ impl Imap {
.uid_fetch("1:*", RFC724MID_UID) .uid_fetch("1:*", RFC724MID_UID)
.await .await
.with_context(|| format!("can't resync folder {folder}"))?; .with_context(|| format!("can't resync folder {folder}"))?;
while let Some(fetch) = list.next().await { while let Some(fetch) = list.try_next().await? {
let fetch = fetch?;
let headers = match get_fetch_headers(&fetch) { let headers = match get_fetch_headers(&fetch) {
Ok(headers) => headers, Ok(headers) => headers,
Err(err) => { Err(err) => {
@@ -660,7 +659,7 @@ impl Imap {
.context("Error fetching UID")?; .context("Error fetching UID")?;
let mut new_last_seen_uid = None; let mut new_last_seen_uid = None;
while let Some(fetch) = list.next().await.transpose()? { while let Some(fetch) = list.try_next().await? {
if fetch.message == mailbox.exists && fetch.uid.is_some() { if fetch.message == mailbox.exists && fetch.uid.is_some() {
new_last_seen_uid = fetch.uid; new_last_seen_uid = fetch.uid;
} }
@@ -1198,8 +1197,11 @@ impl Imap {
.await .await
.context("failed to fetch flags")?; .context("failed to fetch flags")?;
while let Some(fetch) = list.next().await { while let Some(fetch) = list
let fetch = fetch.context("failed to get FETCH result")?; .try_next()
.await
.context("failed to get FETCH result")?
{
let uid = if let Some(uid) = fetch.uid { let uid = if let Some(uid) = fetch.uid {
uid uid
} else { } else {
@@ -1258,8 +1260,7 @@ impl Imap {
.await .await
.context("IMAP Could not fetch")?; .context("IMAP Could not fetch")?;
while let Some(fetch) = list.next().await { while let Some(msg) = list.try_next().await? {
let msg = fetch?;
match get_fetch_headers(&msg) { match get_fetch_headers(&msg) {
Ok(headers) => { Ok(headers) => {
if let Some(from) = mimeparser::get_from(&headers) { if let Some(from) = mimeparser::get_from(&headers) {
@@ -1294,8 +1295,7 @@ impl Imap {
.context("IMAP could not fetch")?; .context("IMAP could not fetch")?;
let mut msgs = BTreeMap::new(); let mut msgs = BTreeMap::new();
while let Some(fetch) = list.next().await { while let Some(msg) = list.try_next().await? {
let msg = fetch?;
if let Some(msg_uid) = msg.uid { if let Some(msg_uid) = msg.uid {
// If the mailbox is not empty, results always include // If the mailbox is not empty, results always include
// at least one UID, even if last_seen_uid+1 is past // at least one UID, even if last_seen_uid+1 is past
@@ -1332,8 +1332,7 @@ impl Imap {
.context("IMAP Could not fetch")?; .context("IMAP Could not fetch")?;
let mut msgs = BTreeMap::new(); let mut msgs = BTreeMap::new();
while let Some(fetch) = list.next().await { while let Some(msg) = list.try_next().await? {
let msg = fetch?;
if let Some(msg_uid) = msg.uid { if let Some(msg_uid) = msg.uid {
msgs.insert((msg.internal_date(), msg_uid), msg); msgs.insert((msg.internal_date(), msg_uid), msg);
} }
@@ -1680,8 +1679,7 @@ impl Imap {
let mut delimiter_is_default = true; let mut delimiter_is_default = true;
let mut folder_configs = BTreeMap::new(); let mut folder_configs = BTreeMap::new();
while let Some(folder) = folders.next().await { while let Some(folder) = folders.try_next().await? {
let folder = folder?;
info!(context, "Scanning folder: {:?}", folder); info!(context, "Scanning folder: {:?}", folder);
// Update the delimiter iff there is a different one, but only once. // Update the delimiter iff there is a different one, but only once.