meli
/
meli
8
Fork 13
Code Issues 11 Pull Requests 10 Actions Packages Projects 1 Releases 18 Wiki Activity

Remove store references in imap connection 

The idea here is to move the store in the IMAP backend in the future. As
a first step, we're wrapping around the state part.
imap-connection-changes
Andrei Zisu 2021-01-31 22:21:29 +01:00 committed by Manos Pitsidianakis
parent 22fd89affc
commit 775a2b043a
Signed by: Manos Pitsidianakis
GPG Key ID: 7729C7707F7E09D0
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
melib/src/backends/imap/connection.rs
View File

@ -20,7 +20,7 @@
*/
use super::protocol_parser::{ImapLineSplit, ImapResponse, RequiredResponses, SelectResponse};
use crate::backends::{MailboxHash, RefreshEvent};
use crate::backends::{AccountHash, BackendEventConsumer, MailboxHash, RefreshEvent};
use crate::connections::{lookup_ipv4, timeout, Connection};
use crate::email::parser::BytesExt;
use crate::error::*;
@ -33,7 +33,7 @@ use std::convert::TryFrom;
use std::future::Future;
use std::iter::FromIterator;
use std::pin::Pin;
use std::sync::Arc;
use std::sync::{Arc, Mutex};
use std::time::{Duration, Instant, SystemTime};
use data_encoding::BASE64;
@ -112,6 +112,12 @@ pub struct ImapConnection {
pub server_conf: ImapServerConf,
pub sync_policy: SyncPolicy,
pub uid_store: Arc<UIDStore>,
pub account_hash: AccountHash,
pub account_name: Arc<String>,
pub capabilities: Arc<Mutex<Capabilities>>,
pub is_online: Arc<Mutex<(SystemTime, Result<()>)>>,
pub event_consumer: BackendEventConsumer,
}
impl ImapStream {
@ -565,20 +571,24 @@ impl ImapConnection {
SyncPolicy::None
},
uid_store,
account_hash: AccountHash(0),
account_name: Arc::new("".to_string()),
capabilities: Default::default(),
is_online: Arc::new(Mutex::new((
SystemTime::now(),
Err(Error::new("Account is uninitialised.")),
))),
event_consumer: BackendEventConsumer::new(Arc::new(|_, _| {})),
}
}
pub fn connect<'a>(&'a mut self) -> Pin<Box<dyn Future<Output = Result<()>> + Send + 'a>> {
Box::pin(async move {
if let (time, ref mut status @ Ok(())) = *self.uid_store.is_online.lock().unwrap() {
if let (time, ref mut status @ Ok(())) = *self.is_online.lock().unwrap() {
if SystemTime::now().duration_since(time).unwrap_or_default()
>= IMAP_PROTOCOL_TIMEOUT
{
let err = Error::new(format!(
"Connection timed out after {} seconds",
IMAP_PROTOCOL_TIMEOUT.as_secs()
))
.set_kind(ErrorKind::Timeout);
let err = Error::new("Connection timed out").set_kind(ErrorKind::Timeout);
*status = Err(err.clone());
self.stream = Err(err);
}
@ -603,9 +613,9 @@ impl ImapConnection {
}
let new_stream = ImapStream::new_connection(&self.server_conf, &self.uid_store).await;
if let Err(err) = new_stream.as_ref() {
self.uid_store.is_online.lock().unwrap().1 = Err(err.clone());
self.is_online.lock().unwrap().1 = Err(err.clone());
} else {
*self.uid_store.is_online.lock().unwrap() = (SystemTime::now(), Ok(()));
*self.is_online.lock().unwrap() = (SystemTime::now(), Ok(()));
}
let (capabilities, stream) = new_stream?;
self.stream = Ok(stream);
@ -677,7 +687,7 @@ impl ImapConnection {
}
ImapProtocol::ManageSieve => {}
}
*self.uid_store.capabilities.lock().unwrap() = capabilities;
*self.capabilities.lock().unwrap() = capabilities;
Ok(())
})
}
@ -691,7 +701,7 @@ impl ImapConnection {
let mut response = Vec::new();
ret.clear();
self.stream.as_mut()?.read_response(&mut response).await?;
*self.uid_store.is_online.lock().unwrap() = (SystemTime::now(), Ok(()));
*self.is_online.lock().unwrap() = (SystemTime::now(), Ok(()));
match self.server_conf.protocol {
ImapProtocol::IMAP { .. } => {
@ -720,8 +730,8 @@ impl ImapConnection {
response_code,
String::from_utf8_lossy(&response)
);
(self.uid_store.event_consumer)(
self.uid_store.account_hash,
(self.event_consumer)(
self.account_hash,
crate::backends::BackendEvent::Notice {
description: response_code.to_string(),
content: None,
@ -737,8 +747,8 @@ impl ImapConnection {
response_code,
String::from_utf8_lossy(&response)
);
(self.uid_store.event_consumer)(
self.uid_store.account_hash,
(self.event_consumer)(
self.account_hash,
crate::backends::BackendEvent::Notice {
description: response_code.to_string(),
content: None,
@ -800,7 +810,7 @@ impl ImapConnection {
}
Err(err)
} else {
*self.uid_store.is_online.lock().unwrap() = (SystemTime::now(), Ok(()));
*self.is_online.lock().unwrap() = (SystemTime::now(), Ok(()));
Ok(())
}
}
@ -853,7 +863,6 @@ impl ImapConnection {
MailboxSelection::Examine(_) | MailboxSelection::Select(_) => {
let mut response = Vec::with_capacity(8 * 1024);
if self
.uid_store
.capabilities
.lock()
.unwrap()
@ -868,13 +877,8 @@ impl ImapConnection {
* functionality (via a SELECT command with a nonexistent mailbox name or
* reselecting the same mailbox with EXAMINE command)[..]
*/
let mut nonexistent = "blurdybloop".to_string();
{
let mailboxes = self.uid_store.mailboxes.lock().await;
while mailboxes.values().any(|m| m.imap_path() == nonexistent) {
nonexistent.push('p');
}
}
let nonexistent = "blurdybloop".to_string();
self.send_command(format!("SELECT \"{}\"", nonexistent).as_bytes())
.await?;
self.read_response(&mut response, RequiredResponses::NO_REQUIRED)
@ -887,8 +891,8 @@ impl ImapConnection {
}
pub fn add_refresh_event(&mut self, ev: RefreshEvent) {
(self.uid_store.event_consumer)(
self.uid_store.account_hash,
(self.event_consumer)(
self.account_hash,
crate::backends::BackendEvent::Refresh(ev),
);
}