randre03
/
meli
forked from meli/meli
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

melib: Fixup warnings in imap_async, maildir

async
Manos Pitsidianakis 2020-06-29 18:41:47 +03:00
parent 6553d8ec44
commit 03522c0298
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
12 changed files with 300 additions and 739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
Cargo.lock generated
View File

@ -27,6 +27,27 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
[[package]]
name = "async-stream"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22068c0c19514942eefcfd4daf8976ef1aad84e61539f95cd200c35202f80af5"
dependencies = [
"async-stream-impl",
"futures-core",
]
[[package]]
name = "async-stream-impl"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25f9db3b38af870bf7e5cc649167533b493928e50744e2c30ae350230b414670"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]] [[package]]
name = "async-task" name = "async-task"
version = "3.0.0" version = "3.0.0"
@ -84,6 +105,19 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
name = "blocking"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d17efb70ce4421e351d61aafd90c16a20fb5bfe339fcdc32a86816280e62ce0"
dependencies = [
"futures-channel",
"futures-util",
"once_cell",
"parking",
"waker-fn",
]
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.4.0" version = "3.4.0"
@ -102,6 +136,12 @@ version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
[[package]]
name = "cache-padded"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24508e28c677875c380c20f4d28124fab6f8ed4ef929a1397d7b1a31e92f1005"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.54" version = "1.0.54"
@ -136,6 +176,15 @@ dependencies = [
"unicode-width", "unicode-width",
] ]
[[package]]
name = "concurrent-queue"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f83c06aff61f2d899eb87c379df3cbf7876f14471dcab474e0b6dc90ab96c080"
dependencies = [
"cache-padded",
]
[[package]] [[package]]
name = "constant_time_eq" name = "constant_time_eq"
version = "0.1.5" version = "0.1.5"
@ -347,6 +396,12 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
[[package]]
name = "fastrand"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b90eb1dec02087df472ab9f0db65f27edaa654a746830042688bcc2eaf68090f"
[[package]] [[package]]
name = "filetime" name = "filetime"
version = "0.2.10" version = "0.2.10"
@ -846,6 +901,7 @@ dependencies = [
"nix", "nix",
"notify", "notify",
"notify-rust", "notify-rust",
"num_cpus",
"pcre2", "pcre2",
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -873,6 +929,7 @@ dependencies = [
name = "melib" name = "melib"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"async-stream",
"bincode", "bincode",
"bitflags", "bitflags",
"crossbeam", "crossbeam",
@ -892,6 +949,7 @@ dependencies = [
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"smallvec", "smallvec",
"smol",
"unicode-segmentation", "unicode-segmentation",
"uuid", "uuid",
"xdg", "xdg",
@ -1173,6 +1231,12 @@ dependencies = [
"vcpkg", "vcpkg",
] ]
[[package]]
name = "parking"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4029bc3504a62d92e42f30b9095fdef73b8a0b2a06aa41ce2935143b05a1a06"
[[package]] [[package]]
name = "pcre2" name = "pcre2"
version = "0.2.3" version = "0.2.3"
@ -1507,6 +1571,12 @@ dependencies = [
"winapi 0.3.8", "winapi 0.3.8",
] ]
[[package]]
name = "scoped-tls"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
[[package]] [[package]]
name = "scopeguard" name = "scopeguard"
version = "1.1.0" version = "1.1.0"
@ -1638,6 +1708,27 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "smol"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "620cbb3c6e34da57d3a248cda0cd01cd5848164dc062e764e65d06fe3ea7aed5"
dependencies = [
"async-task",
"blocking",
"concurrent-queue",
"fastrand",
"futures-io",
"futures-util",
"libc",
"once_cell",
"scoped-tls",
"slab",
"socket2",
"wepoll-sys-stjepang",
"winapi 0.3.8",
]
[[package]] [[package]]
name = "socket2" name = "socket2"
version = "0.3.12" version = "0.3.12"
@ -1916,6 +2007,12 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
[[package]]
name = "waker-fn"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9571542c2ce85ce642e6b58b3364da2fb53526360dfb7c211add4f5c23105ff7"
[[package]] [[package]]
name = "walkdir" name = "walkdir"
version = "2.3.1" version = "2.3.1"
@ -2021,6 +2118,15 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "wepoll-sys-stjepang"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fd319e971980166b53e17b1026812ad66c6b54063be879eb182342b55284694"
dependencies = [
"cc",
]
[[package]] [[package]]
name = "winapi" name = "winapi"
version = "0.2.8" version = "0.2.8"

1
Cargo.toml
View File

@ -53,6 +53,7 @@ structopt = { version = "0.3.14", default-features = false }
svg_crate = { version = "0.8.0", optional = true, package = "svg" } svg_crate = { version = "0.8.0", optional = true, package = "svg" }
futures = "0.3.5" futures = "0.3.5"
async-task = "3.0.0" async-task = "3.0.0"
num_cpus = "1.12.0"
[build-dependencies] [build-dependencies]
syn = { version = "1.0.31", features = [] } syn = { version = "1.0.31", features = [] }

572
melib/src/backends/imap_async.rs
View File

@ -34,9 +34,9 @@ mod watch;
pub use watch::*; pub use watch::*;
mod cache; mod cache;
pub mod managesieve; pub mod managesieve;
//mod untagged; mod untagged;
use crate::async_workers::{Async, AsyncBuilder, AsyncStatus, WorkContext}; use crate::async_workers::{Async, WorkContext};
use crate::backends::BackendOp; use crate::backends::BackendOp;
use crate::backends::RefreshEvent; use crate::backends::RefreshEvent;
use crate::backends::RefreshEventKind::{self, *}; use crate::backends::RefreshEventKind::{self, *};
@ -46,7 +46,7 @@ use crate::conf::AccountSettings;
use crate::email::*; use crate::email::*;
use crate::error::{MeliError, Result, ResultIntoMeliError}; use crate::error::{MeliError, Result, ResultIntoMeliError};
use futures::lock::Mutex as FutureMutex; use futures::lock::Mutex as FutureMutex;
use futures::Stream; use futures::stream::Stream;
use std::collections::{hash_map::DefaultHasher, BTreeMap}; use std::collections::{hash_map::DefaultHasher, BTreeMap};
use std::collections::{BTreeSet, HashMap, HashSet}; use std::collections::{BTreeSet, HashMap, HashSet};
use std::future::Future; use std::future::Future;
@ -174,9 +174,6 @@ pub struct ImapType {
can_create_flags: Arc<Mutex<bool>>, can_create_flags: Arc<Mutex<bool>>,
} }
use futures::pin_mut;
use futures::stream::StreamExt;
impl MailBackend for ImapType { impl MailBackend for ImapType {
fn get_async( fn get_async(
&mut self, &mut self,
@ -315,392 +312,22 @@ impl MailBackend for ImapType {
*/ */
} }
fn get(&mut self, mailbox: &Mailbox) -> Async<Result<Vec<Envelope>>> { fn get(&mut self, _mailbox: &Mailbox) -> Async<Result<Vec<Envelope>>> {
unimplemented!() unimplemented!()
/*
let mut w = AsyncBuilder::new();
let handle = {
let tx = w.tx();
let uid_store = self.uid_store.clone();
let can_create_flags = self.can_create_flags.clone();
let mailbox_hash = mailbox.hash();
let (permissions, mailbox_path, mailbox_exists, no_select, unseen) = {
let f = &self.uid_store.mailboxes.read().unwrap()[&mailbox_hash];
(
f.permissions.clone(),
f.imap_path().to_string(),
f.exists.clone(),
f.no_select,
f.unseen.clone(),
)
};
let connection = self.connection.clone();
let closure = move |_work_context| {
if no_select {
tx.send(AsyncStatus::Payload(Ok(Vec::new()))).unwrap();
tx.send(AsyncStatus::Finished).unwrap();
return;
}
let _tx = tx.clone();
if let Err(err) = (move || {
let tx = _tx;
let mut our_unseen: BTreeSet<EnvelopeHash> = Default::default();
let mut valid_hash_set: HashSet<EnvelopeHash> = HashSet::default();
let cached_hash_set: HashSet<EnvelopeHash> =
(|| -> Result<HashSet<EnvelopeHash>> {
if !uid_store.cache_headers {
return Ok(HashSet::default());
}
let uidvalidities = uid_store.uidvalidity.lock().unwrap();
let v = if let Some(v) = uidvalidities.get(&mailbox_hash) {
v
} else {
return Ok(HashSet::default());
};
let cached_envs: (cache::MaxUID, Vec<(UID, Envelope)>);
cache::save_envelopes(uid_store.account_hash, mailbox_hash, *v, &[])
.chain_err_summary(|| {
"Could not save envelopes in cache in get()"
})?;
cached_envs =
cache::get_envelopes(uid_store.account_hash, mailbox_hash, *v)
.chain_err_summary(|| {
"Could not get envelopes in cache in get()"
})?;
let (_max_uid, envelopes) = debug!(cached_envs);
let ret = envelopes.iter().map(|(_, env)| env.hash()).collect();
if !envelopes.is_empty() {
let mut payload = vec![];
for (uid, env) in envelopes {
if !env.is_seen() {
our_unseen.insert(env.hash());
}
uid_store
.hash_index
.lock()
.unwrap()
.insert(env.hash(), (uid, mailbox_hash));
uid_store
.uid_index
.lock()
.unwrap()
.insert((mailbox_hash, uid), env.hash());
payload.push(env);
}
debug!("sending cached payload for {}", mailbox_hash);
unseen.lock().unwrap().insert_set(our_unseen.clone());
tx.send(AsyncStatus::Payload(Ok(payload))).unwrap();
}
Ok(ret)
})()
.unwrap_or_default();
let mut conn = connection.lock()?;
debug!("locked for get {}", mailbox_path);
let mut response = String::with_capacity(8 * 1024);
conn.create_uid_msn_cache(mailbox_hash, 1);
/* first SELECT the mailbox to get READ/WRITE permissions (because EXAMINE only
* returns READ-ONLY for both cases) */
conn.select_mailbox(mailbox_hash, &mut response)
.chain_err_summary(|| {
format!("Could not select mailbox {}", mailbox_path)
})?;
let mut examine_response = protocol_parser::select_response(&response)
.chain_err_summary(|| {
format!(
"Could not parse select response for mailbox {}",
mailbox_path
)
})?;
*can_create_flags.lock().unwrap() = examine_response.can_create_flags;
debug!(
"mailbox: {} examine_response: {:?}",
mailbox_path, examine_response
);
{
let mut uidvalidities = uid_store.uidvalidity.lock().unwrap();
let v = uidvalidities
.entry(mailbox_hash)
.or_insert(examine_response.uidvalidity);
if uid_store.cache_headers {
let _ = cache::save_envelopes(
uid_store.account_hash,
mailbox_hash,
examine_response.uidvalidity,
&[],
);
}
*v = examine_response.uidvalidity;
let mut permissions = permissions.lock().unwrap();
permissions.create_messages = !examine_response.read_only;
permissions.remove_messages = !examine_response.read_only;
permissions.set_flags = !examine_response.read_only;
permissions.rename_messages = !examine_response.read_only;
permissions.delete_messages = !examine_response.read_only;
permissions.delete_messages = !examine_response.read_only;
mailbox_exists
.lock()
.unwrap()
.set_not_yet_seen(examine_response.exists);
}
if examine_response.exists == 0 {
if uid_store.cache_headers {
for &env_hash in &cached_hash_set {
conn.add_refresh_event(RefreshEvent {
account_hash: uid_store.account_hash,
mailbox_hash,
kind: RefreshEventKind::Remove(env_hash),
});
}
let _ = cache::save_envelopes(
uid_store.account_hash,
mailbox_hash,
examine_response.uidvalidity,
&[],
);
}
tx.send(AsyncStatus::Payload(Ok(Vec::new()))).unwrap();
tx.send(AsyncStatus::Finished).unwrap();
return Ok(());
}
/* reselecting the same mailbox with EXAMINE prevents expunging it */
conn.examine_mailbox(mailbox_hash, &mut response)?;
if examine_response.uidnext == 0 {
/* UIDNEXT shouldn't be 0, since exists != 0 at this point */
conn.send_command(
format!("STATUS \"{}\" (UIDNEXT)", mailbox_path).as_bytes(),
)?;
conn.read_response(&mut response, RequiredResponses::STATUS)?;
let (_, status) = protocol_parser::status_response(response.as_bytes())?;
if let Some(uidnext) = status.uidnext {
if uidnext == 0 {
return Err(MeliError::new(
"IMAP server error: zero UIDNEXt with nonzero exists.",
));
}
examine_response.uidnext = uidnext;
} else {
return Err(MeliError::new("IMAP server did not reply with UIDNEXT"));
}
}
let mut max_uid_left: usize = examine_response.uidnext - 1;
let mut tag_lck = uid_store.tag_index.write().unwrap();
while max_uid_left > 0 {
let mut envelopes = vec![];
debug!("{} max_uid_left= {}", mailbox_hash, max_uid_left);
if max_uid_left == 1 {
debug!("UID FETCH 1 (UID FLAGS ENVELOPE BODYSTRUCTURE)");
conn.send_command(b"UID FETCH 1 (UID FLAGS ENVELOPE BODYSTRUCTURE)")?;
} else {
conn.send_command(
debug!(format!(
"UID FETCH {}:{} (UID FLAGS ENVELOPE BODYSTRUCTURE)",
std::cmp::max(
std::cmp::max(max_uid_left.saturating_sub(500), 1),
1
),
max_uid_left
))
.as_bytes(),
)?
};
conn.read_response(&mut response, RequiredResponses::FETCH_REQUIRED)
.chain_err_summary(|| {
format!(
"Could not parse fetch response for mailbox {}",
mailbox_path
)
})?;
debug!(
"fetch response is {} bytes and {} lines",
response.len(),
response.lines().collect::<Vec<&str>>().len()
);
let (_, v, _) = protocol_parser::uid_fetch_responses(&response)?;
debug!("responses len is {}", v.len());
for UidFetchResponse {
uid,
message_sequence_number,
flags,
envelope,
..
} in v
{
let mut env = envelope.unwrap();
let mut h = DefaultHasher::new();
h.write_usize(uid);
h.write(mailbox_path.as_bytes());
env.set_hash(h.finish());
debug!(
"env hash {} {} UID = {} MSN = {}",
env.hash(),
env.subject(),
uid,
message_sequence_number
);
valid_hash_set.insert(env.hash());
if let Some((flags, keywords)) = flags {
if !flags.intersects(Flag::SEEN) {
our_unseen.insert(env.hash());
}
env.set_flags(flags);
for f in keywords {
let hash = tag_hash!(f);
if !tag_lck.contains_key(&hash) {
tag_lck.insert(hash, f);
}
env.labels_mut().push(hash);
}
}
uid_store
.msn_index
.lock()
.unwrap()
.entry(mailbox_hash)
.or_default()
.insert(message_sequence_number - 1, uid);
uid_store
.hash_index
.lock()
.unwrap()
.insert(env.hash(), (uid, mailbox_hash));
uid_store
.uid_index
.lock()
.unwrap()
.insert((mailbox_hash, uid), env.hash());
envelopes.push((uid, env));
}
max_uid_left =
std::cmp::max(std::cmp::max(max_uid_left.saturating_sub(500), 1), 1);
debug!("sending payload for {}", mailbox_hash);
if uid_store.cache_headers {
cache::save_envelopes(
uid_store.account_hash,
mailbox_hash,
examine_response.uidvalidity,
&envelopes
.iter()
.map(|(uid, env)| (*uid, env))
.collect::<SmallVec<[(UID, &Envelope); 1024]>>(),
)
.chain_err_summary(|| {
format!(
"Could not save envelopes in cache for mailbox {}",
mailbox_path
)
})?;
}
for &env_hash in cached_hash_set.difference(&valid_hash_set) {
conn.add_refresh_event(RefreshEvent {
account_hash: uid_store.account_hash,
mailbox_hash,
kind: RefreshEventKind::Remove(env_hash),
});
}
let progress = envelopes.len();
unseen
.lock()
.unwrap()
.insert_set(our_unseen.iter().cloned().collect());
mailbox_exists.lock().unwrap().insert_existing_set(
envelopes.iter().map(|(_, env)| env.hash()).collect::<_>(),
);
tx.send(AsyncStatus::Payload(Ok(envelopes
.into_iter()
.map(|(_, env)| env)
.collect::<Vec<Envelope>>())))
.unwrap();
tx.send(AsyncStatus::ProgressReport(progress)).unwrap();
if max_uid_left == 1 {
break;
}
}
drop(conn);
Ok(())
})() {
debug!("sending error payload for {}: {:?}", mailbox_hash, &err);
tx.send(AsyncStatus::Payload(Err(err))).unwrap();
}
tx.send(AsyncStatus::Finished).unwrap();
};
Box::new(closure)
};
w.build(handle)
*/
} }
fn refresh( fn refresh(
&mut self, &mut self,
mailbox_hash: MailboxHash, _mailbox_hash: MailboxHash,
sender: RefreshEventConsumer, _sender: RefreshEventConsumer,
) -> Result<Async<()>> { ) -> Result<Async<()>> {
unimplemented!() unimplemented!()
/*
let inbox = self
.uid_store
.mailboxes
.read()
.unwrap()
.get(&mailbox_hash)
.map(std::clone::Clone::clone)
.unwrap();
let main_conn = self.connection.clone();
*self.uid_store.sender.write().unwrap() = Some(sender);
let uid_store = self.uid_store.clone();
let account_name = self.account_name.clone();
let w = AsyncBuilder::new();
let closure = move |work_context: WorkContext| {
let thread = std::thread::current();
let mut conn = match try_lock(&main_conn, Some(std::time::Duration::new(2, 0))) {
Ok(conn) => conn,
Err(err) => {
uid_store
.sender
.read()
.unwrap()
.as_ref()
.unwrap()
.send(RefreshEvent {
account_hash: uid_store.account_hash,
mailbox_hash,
kind: RefreshEventKind::Failure(err.clone()),
});
return;
}
};
work_context
.set_name
.send((
thread.id(),
format!("refreshing {} imap connection", account_name.as_str(),),
))
.unwrap();
work_context
.set_status
.send((thread.id(), "refresh".to_string()))
.unwrap();
//watch::examine_updates(&inbox, &mut conn, &uid_store, &work_context)
// .ok()
// .take();
};
Ok(w.build(Box::new(closure)))
*/
} }
fn watch( fn watch(
&self, &self,
sender: RefreshEventConsumer, _sender: RefreshEventConsumer,
work_context: WorkContext, _work_context: WorkContext,
) -> Result<std::thread::ThreadId> { ) -> Result<std::thread::ThreadId> {
Ok(std::thread::current().id()) Ok(std::thread::current().id())
//Err(MeliError::new("Unimplemented.")) //Err(MeliError::new("Unimplemented."))
@ -742,51 +369,6 @@ impl MailBackend for ImapType {
fn mailboxes(&self) -> Result<HashMap<MailboxHash, Mailbox>> { fn mailboxes(&self) -> Result<HashMap<MailboxHash, Mailbox>> {
unimplemented!() unimplemented!()
/*
{
let mailboxes = self.uid_store.mailboxes.read().unwrap();
if !mailboxes.is_empty() {
return Ok(mailboxes
.iter()
.map(|(h, f)| (*h, Box::new(Clone::clone(f)) as Mailbox))
.collect());
}
}
let new_mailboxes = ImapType::imap_mailboxes(&self.connection)?;
let mut mailboxes = self.uid_store.mailboxes.write()?;
*mailboxes = new_mailboxes;
let mut invalid_configs = vec![];
for m in mailboxes.values() {
if m.is_subscribed() != (self.is_subscribed)(m.path()) {
invalid_configs.push((m.path(), m.is_subscribed()));
}
}
if !invalid_configs.is_empty() {
let mut err_string = format!("{}: ", self.account_name);
for (m, server_value) in invalid_configs.iter() {
err_string.extend(format!(
"Mailbox `{}` is {}subscribed on server but {}subscribed in your configuration. These settings have to match.\n",
if *server_value { "" } else { "not " },
if *server_value { "not " } else { "" },
m
).chars());
}
return Err(MeliError::new(err_string));
}
mailboxes.retain(|_, f| (self.is_subscribed)(f.path()));
let keys = mailboxes.keys().cloned().collect::<HashSet<MailboxHash>>();
let mut uid_lock = self.uid_store.uidvalidity.lock().unwrap();
for f in mailboxes.values_mut() {
uid_lock.entry(f.hash()).or_default();
f.children.retain(|c| keys.contains(c));
}
drop(uid_lock);
Ok(mailboxes
.iter()
.filter(|(_, f)| f.is_subscribed)
.map(|(h, f)| (*h, Box::new(Clone::clone(f)) as Mailbox))
.collect())
*/
} }
fn operation(&self, hash: EnvelopeHash) -> Result<Box<dyn BackendOp>> { fn operation(&self, hash: EnvelopeHash) -> Result<Box<dyn BackendOp>> {
@ -810,7 +392,7 @@ impl MailBackend for ImapType {
))) )))
} }
fn save(&self, bytes: &[u8], mailbox_hash: MailboxHash, flags: Option<Flag>) -> Result<()> { fn save(&self, _bytes: &[u8], _mailbox_hash: MailboxHash, _flags: Option<Flag>) -> Result<()> {
unimplemented!() unimplemented!()
/* /*
let path = { let path = {
@ -867,7 +449,7 @@ impl MailBackend for ImapType {
fn create_mailbox( fn create_mailbox(
&mut self, &mut self,
mut path: String, _path: String,
) -> Result<(MailboxHash, HashMap<MailboxHash, Mailbox>)> { ) -> Result<(MailboxHash, HashMap<MailboxHash, Mailbox>)> {
unimplemented!() unimplemented!()
/* /*
@ -924,7 +506,7 @@ impl MailBackend for ImapType {
fn delete_mailbox( fn delete_mailbox(
&mut self, &mut self,
mailbox_hash: MailboxHash, _mailbox_hash: MailboxHash,
) -> Result<HashMap<MailboxHash, Mailbox>> { ) -> Result<HashMap<MailboxHash, Mailbox>> {
unimplemented!() unimplemented!()
/* /*
@ -967,7 +549,11 @@ impl MailBackend for ImapType {
*/ */
} }
fn set_mailbox_subscription(&mut self, mailbox_hash: MailboxHash, new_val: bool) -> Result<()> { fn set_mailbox_subscription(
&mut self,
_mailbox_hash: MailboxHash,
_new_val: bool,
) -> Result<()> {
unimplemented!() unimplemented!()
/* /*
let mut mailboxes = self.uid_store.mailboxes.write().unwrap(); let mut mailboxes = self.uid_store.mailboxes.write().unwrap();
@ -1000,11 +586,7 @@ impl MailBackend for ImapType {
*/ */
} }
fn rename_mailbox( fn rename_mailbox(&mut self, _mailbox_hash: MailboxHash, _new_path: String) -> Result<Mailbox> {
&mut self,
mailbox_hash: MailboxHash,
mut new_path: String,
) -> Result<Mailbox> {
unimplemented!() unimplemented!()
/* /*
let mut mailboxes = self.uid_store.mailboxes.write().unwrap(); let mut mailboxes = self.uid_store.mailboxes.write().unwrap();
@ -1045,7 +627,7 @@ impl MailBackend for ImapType {
fn set_mailbox_permissions( fn set_mailbox_permissions(
&mut self, &mut self,
mailbox_hash: MailboxHash, _mailbox_hash: MailboxHash,
_val: crate::backends::MailboxPermissions, _val: crate::backends::MailboxPermissions,
) -> Result<()> { ) -> Result<()> {
unimplemented!() unimplemented!()
@ -1062,8 +644,8 @@ impl MailBackend for ImapType {
fn search( fn search(
&self, &self,
query: crate::search::Query, _query: crate::search::Query,
mailbox_hash: Option<MailboxHash>, _mailbox_hash: Option<MailboxHash>,
) -> Result<SmallVec<[EnvelopeHash; 512]>> { ) -> Result<SmallVec<[EnvelopeHash; 512]>> {
unimplemented!() unimplemented!()
/* /*
@ -1455,116 +1037,6 @@ fn get_cached_envs(
Ok((ret, payload)) Ok((ret, payload))
} }
async fn get_initial_max_uid(
connection: &Arc<FutureMutex<ImapConnection>>,
mailbox_hash: MailboxHash,
cached_hash_set: &HashSet<EnvelopeHash>,
can_create_flags: &Arc<Mutex<bool>>,
our_unseen: &mut BTreeSet<EnvelopeHash>,
valid_hash_set: &mut HashSet<EnvelopeHash>,
uid_store: &UIDStore,
) -> Result<usize> {
let (permissions, mailbox_path, mailbox_exists, no_select, unseen) = {
let f = &uid_store.mailboxes.read().unwrap()[&mailbox_hash];
(
f.permissions.clone(),
f.imap_path().to_string(),
f.exists.clone(),
f.no_select,
f.unseen.clone(),
)
};
let mut conn = connection.lock().await;
debug!("locked for get {}", mailbox_path);
let mut response = String::with_capacity(8 * 1024);
conn.create_uid_msn_cache(mailbox_hash, 1).await?;
/* first SELECT the mailbox to get READ/WRITE permissions (because EXAMINE only
* returns READ-ONLY for both cases) */
conn.select_mailbox(mailbox_hash, &mut response, true)
.await
.chain_err_summary(|| format!("Could not select mailbox {}", mailbox_path))?;
let mut examine_response =
protocol_parser::select_response(&response).chain_err_summary(|| {
format!(
"Could not parse select response for mailbox {}",
mailbox_path
)
})?;
*can_create_flags.lock().unwrap() = examine_response.can_create_flags;
debug!(
"mailbox: {} examine_response: {:?}",
mailbox_path, examine_response
);
{
let mut uidvalidities = uid_store.uidvalidity.lock().unwrap();
let v = uidvalidities
.entry(mailbox_hash)
.or_insert(examine_response.uidvalidity);
if uid_store.cache_headers {
let _ = cache::save_envelopes(
uid_store.account_hash,
mailbox_hash,
examine_response.uidvalidity,
&[],
);
}
*v = examine_response.uidvalidity;
let mut permissions = permissions.lock().unwrap();
permissions.create_messages = !examine_response.read_only;
permissions.remove_messages = !examine_response.read_only;
permissions.set_flags = !examine_response.read_only;
permissions.rename_messages = !examine_response.read_only;
permissions.delete_messages = !examine_response.read_only;
permissions.delete_messages = !examine_response.read_only;
mailbox_exists
.lock()
.unwrap()
.set_not_yet_seen(examine_response.exists);
}
if examine_response.exists == 0 {
if uid_store.cache_headers {
for &env_hash in cached_hash_set {
conn.add_refresh_event(RefreshEvent {
account_hash: uid_store.account_hash,
mailbox_hash,
kind: RefreshEventKind::Remove(env_hash),
});
}
let _ = cache::save_envelopes(
uid_store.account_hash,
mailbox_hash,
examine_response.uidvalidity,
&[],
);
}
return Ok(0);
}
/* reselecting the same mailbox with EXAMINE prevents expunging it */
conn.examine_mailbox(mailbox_hash, &mut response, false)
.await?;
if examine_response.uidnext == 0 {
/* UIDNEXT shouldn't be 0, since exists != 0 at this point */
conn.send_command(format!("STATUS \"{}\" (UIDNEXT)", mailbox_path).as_bytes())
.await?;
conn.read_response(&mut response, RequiredResponses::STATUS)
.await?;
let (_, status) = protocol_parser::status_response(response.as_bytes())?;
if let Some(uidnext) = status.uidnext {
if uidnext == 0 {
return Err(MeliError::new(
"IMAP server error: zero UIDNEXt with nonzero exists.",
));
}
examine_response.uidnext = uidnext;
} else {
return Err(MeliError::new("IMAP server did not reply with UIDNEXT"));
}
}
Ok(examine_response.uidnext - 1)
}
async fn get_hlpr( async fn get_hlpr(
connection: &Arc<FutureMutex<ImapConnection>>, connection: &Arc<FutureMutex<ImapConnection>>,
mailbox_hash: MailboxHash, mailbox_hash: MailboxHash,
@ -1585,6 +1057,10 @@ async fn get_hlpr(
f.unseen.clone(), f.unseen.clone(),
) )
}; };
if no_select {
*max_uid = Some(0);
return Ok(Vec::new());
}
let mut conn = connection.lock().await; let mut conn = connection.lock().await;
debug!("locked for get {}", mailbox_path); debug!("locked for get {}", mailbox_path);
let mut response = String::with_capacity(8 * 1024); let mut response = String::with_capacity(8 * 1024);

96
melib/src/backends/imap_async/connection.rs
View File

@ -29,8 +29,10 @@ use futures::io::{AsyncReadExt, AsyncWriteExt};
use native_tls::TlsConnector; use native_tls::TlsConnector;
pub use smol::Async as AsyncWrapper; pub use smol::Async as AsyncWrapper;
use std::collections::HashSet; use std::collections::HashSet;
use std::future::Future;
use std::iter::FromIterator; use std::iter::FromIterator;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::pin::Pin;
use std::sync::Arc; use std::sync::Arc;
use std::time::Instant; use std::time::Instant;
@ -82,7 +84,6 @@ impl ImapStream {
pub async fn new_connection( pub async fn new_connection(
server_conf: &ImapServerConf, server_conf: &ImapServerConf,
) -> Result<(Capabilities, ImapStream)> { ) -> Result<(Capabilities, ImapStream)> {
use std::io::prelude::*;
use std::net::TcpStream; use std::net::TcpStream;
let path = &server_conf.server_hostname; let path = &server_conf.server_hostname;
debug!("ImapStream::new_connection"); debug!("ImapStream::new_connection");
@ -468,56 +469,57 @@ impl ImapConnection {
Ok(()) Ok(())
} }
pub async fn read_response( pub fn read_response<'a>(
&mut self, &'a mut self,
ret: &mut String, ret: &'a mut String,
required_responses: RequiredResponses, required_responses: RequiredResponses,
) -> Result<()> { ) -> Pin<Box<dyn Future<Output = Result<()>> + Send + 'a>> {
let mut response = String::new(); Box::pin(async move {
ret.clear(); let mut response = String::new();
self.stream.as_mut()?.read_response(&mut response).await?; ret.clear();
self.stream.as_mut()?.read_response(&mut response).await?;
match self.server_conf.protocol { match self.server_conf.protocol {
ImapProtocol::IMAP => { ImapProtocol::IMAP => {
let r: ImapResponse = ImapResponse::from(&response); let r: ImapResponse = ImapResponse::from(&response);
match r { match r {
ImapResponse::Bye(ref response_code) => { ImapResponse::Bye(ref response_code) => {
self.stream = Err(MeliError::new(format!( self.stream = Err(MeliError::new(format!(
"Offline: received BYE: {:?}", "Offline: received BYE: {:?}",
response_code response_code
))); )));
ret.push_str(&response); ret.push_str(&response);
} }
ImapResponse::No(ref response_code) => { ImapResponse::No(ref response_code) => {
debug!("Received NO response: {:?} {:?}", response_code, response); debug!("Received NO response: {:?} {:?}", response_code, response);
ret.push_str(&response); ret.push_str(&response);
} }
ImapResponse::Bad(ref response_code) => { ImapResponse::Bad(ref response_code) => {
debug!("Received BAD response: {:?} {:?}", response_code, response); debug!("Received BAD response: {:?} {:?}", response_code, response);
ret.push_str(&response); ret.push_str(&response);
} }
_ => { _ => {
/*debug!( /*debug!(
"check every line for required_responses: {:#?}", "check every line for required_responses: {:#?}",
&required_responses &required_responses
);*/ );*/
for l in response.split_rn() { for l in response.split_rn() {
/*debug!("check line: {}", &l);*/ /*debug!("check line: {}", &l);*/
//if required_responses.check(l) || !self.process_untagged(l)? { if required_responses.check(l) || !self.process_untagged(l).await? {
// ret.push_str(l); ret.push_str(l);
//} }
ret.push_str(l); ret.push_str(l);
}
} }
//ret.push_str(&response);
} }
r.into()
}
ImapProtocol::ManageSieve => {
ret.push_str(&response);
Ok(())
} }
r.into()
} }
ImapProtocol::ManageSieve => { })
ret.push_str(&response);
Ok(())
}
}
} }
pub async fn read_lines(&mut self, ret: &mut String, termination_string: String) -> Result<()> { pub async fn read_lines(&mut self, ret: &mut String, termination_string: String) -> Result<()> {
@ -607,7 +609,7 @@ impl ImapConnection {
pub async fn unselect(&mut self) -> Result<()> { pub async fn unselect(&mut self) -> Result<()> {
match self.current_mailbox.take() { match self.current_mailbox.take() {
MailboxSelection::Examine(mailbox_hash) | MailboxSelection::Examine(mailbox_hash) |
MailboxSelection::Select(mailbox_hash) => { MailboxSelection::Select(mailbox_hash) =>{
let mut response = String::with_capacity(8 * 1024); let mut response = String::with_capacity(8 * 1024);
if self if self
.capabilities .capabilities
@ -678,7 +680,7 @@ pub struct ImapBlockingConnection {
} }
impl From<ImapConnection> for ImapBlockingConnection { impl From<ImapConnection> for ImapBlockingConnection {
fn from(mut conn: ImapConnection) -> Self { fn from(_conn: ImapConnection) -> Self {
unimplemented!() unimplemented!()
/* /*
conn.set_nonblocking(false) conn.set_nonblocking(false)

2
melib/src/backends/imap_async/operations.rs
View File

@ -25,7 +25,7 @@ use crate::backends::*;
use crate::email::*; use crate::email::*;
use crate::error::{MeliError, Result}; use crate::error::{MeliError, Result};
use std::cell::Cell; use std::cell::Cell;
use std::sync::{Arc, Mutex}; use std::sync::Arc;
/// `BackendOp` implementor for Imap /// `BackendOp` implementor for Imap
#[derive(Debug, Clone)] #[derive(Debug, Clone)]

34
melib/src/backends/imap_async/untagged.rs
View File

@ -19,7 +19,7 @@
* along with meli. If not, see <http://www.gnu.org/licenses/>. * along with meli. If not, see <http://www.gnu.org/licenses/>.
*/ */
use super::ImapConnection; use super::{ImapConnection, MailboxSelection};
use crate::backends::imap_async::protocol_parser::{ use crate::backends::imap_async::protocol_parser::{
ImapLineSplit, RequiredResponses, UidFetchResponse, UntaggedResponse, ImapLineSplit, RequiredResponses, UidFetchResponse, UntaggedResponse,
}; };
@ -33,7 +33,7 @@ use crate::error::*;
use std::time::Instant; use std::time::Instant;
impl ImapConnection { impl ImapConnection {
pub fn process_untagged(&mut self, line: &str) -> Result<bool> { pub async fn process_untagged(&mut self, line: &str) -> Result<bool> {
macro_rules! try_fail { macro_rules! try_fail {
($mailbox_hash: expr, $($result:expr)+) => { ($mailbox_hash: expr, $($result:expr)+) => {
$(if let Err(err) = $result { $(if let Err(err) = $result {
@ -52,10 +52,9 @@ impl ImapConnection {
}; };
} }
//FIXME //FIXME
let mailbox_hash = if let Some(mailbox_hash) = self.current_mailbox { let mailbox_hash = match self.current_mailbox {
mailbox_hash MailboxSelection::Select(h) | MailboxSelection::Examine(h) => h,
} else { MailboxSelection::None => return Ok(false),
return Ok(false);
}; };
let mailbox = let mailbox =
std::clone::Clone::clone(&self.uid_store.mailboxes.read().unwrap()[&mailbox_hash]); std::clone::Clone::clone(&self.uid_store.mailboxes.read().unwrap()[&mailbox_hash]);
@ -104,20 +103,19 @@ impl ImapConnection {
UntaggedResponse::Exists(n) => { UntaggedResponse::Exists(n) => {
/* UID FETCH ALL UID, cross-ref, then FETCH difference headers /* UID FETCH ALL UID, cross-ref, then FETCH difference headers
* */ * */
let mut prev_exists = mailbox.exists.lock().unwrap();
debug!("exists {}", n); debug!("exists {}", n);
if n > prev_exists.len() { if n > mailbox.exists.lock().unwrap().len() {
try_fail!( try_fail!(
mailbox_hash, mailbox_hash,
self.send_command( self.send_command(
&[ &[
b"FETCH", b"FETCH",
format!("{}:{}", prev_exists.len() + 1, n).as_bytes(), format!("{}:{}", mailbox.exists.lock().unwrap().len() + 1, n).as_bytes(),
b"(UID FLAGS RFC822)", b"(UID FLAGS RFC822)",
] ]
.join(&b' '), .join(&b' '),
) ).await
self.read_response(&mut response, RequiredResponses::FETCH_REQUIRED) self.read_response(&mut response, RequiredResponses::FETCH_REQUIRED).await
); );
match super::protocol_parser::uid_fetch_responses(&response) { match super::protocol_parser::uid_fetch_responses(&response) {
Ok((_, v, _)) => { Ok((_, v, _)) => {
@ -167,7 +165,7 @@ impl ImapConnection {
if !env.is_seen() { if !env.is_seen() {
mailbox.unseen.lock().unwrap().insert_new(env.hash()); mailbox.unseen.lock().unwrap().insert_new(env.hash());
} }
prev_exists.insert_new(env.hash()); mailbox.exists.lock().unwrap().insert_new(env.hash());
self.add_refresh_event(RefreshEvent { self.add_refresh_event(RefreshEvent {
account_hash: self.uid_store.account_hash, account_hash: self.uid_store.account_hash,
mailbox_hash, mailbox_hash,
@ -185,8 +183,8 @@ impl ImapConnection {
UntaggedResponse::Recent(_) => { UntaggedResponse::Recent(_) => {
try_fail!( try_fail!(
mailbox_hash, mailbox_hash,
self.send_command(b"UID SEARCH RECENT") self.send_command(b"UID SEARCH RECENT").await
self.read_response(&mut response, RequiredResponses::SEARCH) self.read_response(&mut response, RequiredResponses::SEARCH).await
); );
match super::protocol_parser::search_results_raw(response.as_bytes()) match super::protocol_parser::search_results_raw(response.as_bytes())
.map(|(_, v)| v) .map(|(_, v)| v)
@ -201,8 +199,8 @@ impl ImapConnection {
self.send_command( self.send_command(
&[b"UID FETCH", v, b"(FLAGS RFC822)"] &[b"UID FETCH", v, b"(FLAGS RFC822)"]
.join(&b' '), .join(&b' '),
) ).await
self.read_response(&mut response, RequiredResponses::FETCH_REQUIRED) self.read_response(&mut response, RequiredResponses::FETCH_REQUIRED).await
); );
debug!(&response); debug!(&response);
match super::protocol_parser::uid_fetch_responses(&response) { match super::protocol_parser::uid_fetch_responses(&response) {
@ -294,8 +292,8 @@ impl ImapConnection {
format!("{}", msg_seq).as_bytes(), format!("{}", msg_seq).as_bytes(),
] ]
.join(&b' '), .join(&b' '),
) ).await
self.read_response(&mut response, RequiredResponses::SEARCH) self.read_response(&mut response, RequiredResponses::SEARCH).await
); );
debug!(&response); debug!(&response);
match super::protocol_parser::search_results( match super::protocol_parser::search_results(

31
melib/src/backends/imap_async/watch.rs
View File

@ -22,7 +22,7 @@ use super::*;
use crate::backends::SpecialUsageMailbox; use crate::backends::SpecialUsageMailbox;
use crate::email::parser::BytesExt; use crate::email::parser::BytesExt;
use crate::email::parser::BytesIterExt; use crate::email::parser::BytesIterExt;
use std::sync::{Arc, Mutex}; use std::sync::Arc;
/// Arguments for IMAP watching functions /// Arguments for IMAP watching functions
pub struct ImapWatchKit { pub struct ImapWatchKit {
@ -32,7 +32,7 @@ pub struct ImapWatchKit {
} }
macro_rules! exit_on_error { macro_rules! exit_on_error {
($conn:expr, $mailbox_hash:ident, $thread_id:ident, $($result:expr)+) => { ($conn:expr, $mailbox_hash:ident, $($result:expr)+) => {
$(if let Err(e) = $result { $(if let Err(e) = $result {
*$conn.uid_store.is_online.lock().unwrap() = ( *$conn.uid_store.is_online.lock().unwrap() = (
Instant::now(), Instant::now(),
@ -59,7 +59,6 @@ pub async fn poll_with_examine(kit: ImapWatchKit) -> Result<()> {
} = kit; } = kit;
conn.connect().await?; conn.connect().await?;
let mut response = String::with_capacity(8 * 1024); let mut response = String::with_capacity(8 * 1024);
let thread_id: std::thread::ThreadId = std::thread::current().id();
loop { loop {
let mailboxes = uid_store.mailboxes.read()?; let mailboxes = uid_store.mailboxes.read()?;
for mailbox in mailboxes.values() { for mailbox in mailboxes.values() {
@ -83,7 +82,6 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
uid_store, uid_store,
} = kit; } = kit;
conn.connect().await?; conn.connect().await?;
let thread_id: std::thread::ThreadId = std::thread::current().id();
let mailbox: ImapMailbox = match uid_store let mailbox: ImapMailbox = match uid_store
.mailboxes .mailboxes
.read() .read()
@ -110,7 +108,6 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
exit_on_error!( exit_on_error!(
conn, conn,
mailbox_hash, mailbox_hash,
thread_id,
conn.send_command(format!("SELECT \"{}\"", mailbox.imap_path()).as_bytes()) conn.send_command(format!("SELECT \"{}\"", mailbox.imap_path()).as_bytes())
.await .await
conn.read_response(&mut response, RequiredResponses::SELECT_REQUIRED) conn.read_response(&mut response, RequiredResponses::SELECT_REQUIRED)
@ -165,12 +162,7 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
} }
}; };
} }
exit_on_error!( exit_on_error!(conn, mailbox_hash, conn.send_command(b"IDLE").await);
conn,
mailbox_hash,
thread_id,
conn.send_command(b"IDLE").await
);
let mut iter = ImapBlockingConnection::from(conn); let mut iter = ImapBlockingConnection::from(conn);
let mut beat = std::time::Instant::now(); let mut beat = std::time::Instant::now();
let mut watch = std::time::Instant::now(); let mut watch = std::time::Instant::now();
@ -185,7 +177,6 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
exit_on_error!( exit_on_error!(
iter.conn, iter.conn,
mailbox_hash, mailbox_hash,
thread_id,
iter.conn.send_raw(b"DONE").await iter.conn.send_raw(b"DONE").await
iter.conn.read_response(&mut response, RequiredResponses::empty()).await iter.conn.read_response(&mut response, RequiredResponses::empty()).await
iter.conn.send_command(b"IDLE").await iter.conn.send_command(b"IDLE").await
@ -201,7 +192,6 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
exit_on_error!( exit_on_error!(
conn, conn,
mailbox_hash, mailbox_hash,
thread_id,
examine_updates(mailbox, &mut conn, &uid_store).await examine_updates(mailbox, &mut conn, &uid_store).await
); );
} }
@ -218,7 +208,6 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
exit_on_error!( exit_on_error!(
conn, conn,
mailbox_hash, mailbox_hash,
thread_id,
conn.examine_mailbox(mailbox_hash, &mut response, false).await conn.examine_mailbox(mailbox_hash, &mut response, false).await
conn.send_command(b"UID SEARCH RECENT").await conn.send_command(b"UID SEARCH RECENT").await
conn.read_response(&mut response, RequiredResponses::SEARCH).await conn.read_response(&mut response, RequiredResponses::SEARCH).await
@ -234,7 +223,6 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
exit_on_error!( exit_on_error!(
conn, conn,
mailbox_hash, mailbox_hash,
thread_id,
conn.send_command( conn.send_command(
&[&b"UID FETCH"[..], &v.trim().split(|b| b == &b' ').join(b','), &b"(FLAGS RFC822)"[..]] &[&b"UID FETCH"[..], &v.trim().split(|b| b == &b' ').join(b','), &b"(FLAGS RFC822)"[..]]
.join(&b' '), .join(&b' '),
@ -244,13 +232,10 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
debug!(&response); debug!(&response);
match protocol_parser::uid_fetch_responses(&response) { match protocol_parser::uid_fetch_responses(&response) {
Ok((_, v, _)) => { Ok((_, v, _)) => {
let len = v.len();
let mut ctr = 0;
for UidFetchResponse { for UidFetchResponse {
uid, flags, body, .. uid, flags, body, ..
} in v } in v
{ {
ctr += 1;
if !uid_store if !uid_store
.uid_index .uid_index
.lock() .lock()
@ -367,7 +352,6 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
exit_on_error!( exit_on_error!(
conn, conn,
mailbox_hash, mailbox_hash,
thread_id,
conn.examine_mailbox(mailbox_hash, &mut response, false).await conn.examine_mailbox(mailbox_hash, &mut response, false).await
conn.send_command( conn.send_command(
&[ &[
@ -381,8 +365,6 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
); );
match protocol_parser::uid_fetch_responses(&response) { match protocol_parser::uid_fetch_responses(&response) {
Ok((_, v, _)) => { Ok((_, v, _)) => {
let len = v.len();
let mut ctr = 0;
'fetch_responses_b: for UidFetchResponse { 'fetch_responses_b: for UidFetchResponse {
uid, flags, body, .. uid, flags, body, ..
} in v } in v
@ -393,14 +375,12 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
.unwrap() .unwrap()
.contains_key(&(mailbox_hash, uid)) .contains_key(&(mailbox_hash, uid))
{ {
ctr += 1;
continue 'fetch_responses_b; continue 'fetch_responses_b;
} }
if let Ok(mut env) = Envelope::from_bytes( if let Ok(mut env) = Envelope::from_bytes(
body.unwrap(), body.unwrap(),
flags.as_ref().map(|&(f, _)| f), flags.as_ref().map(|&(f, _)| f),
) { ) {
ctr += 1;
uid_store uid_store
.hash_index .hash_index
.lock() .lock()
@ -463,7 +443,6 @@ pub async fn idle(kit: ImapWatchKit) -> Result<()> {
exit_on_error!( exit_on_error!(
conn, conn,
mailbox_hash, mailbox_hash,
thread_id,
conn.examine_mailbox(mailbox_hash, &mut response, false).await conn.examine_mailbox(mailbox_hash, &mut response, false).await
conn.send_command( conn.send_command(
&[ &[
@ -532,7 +511,6 @@ pub async fn examine_updates(
exit_on_error!( exit_on_error!(
conn, conn,
mailbox_hash, mailbox_hash,
thread_id,
conn.examine_mailbox(mailbox_hash, &mut response, true) conn.examine_mailbox(mailbox_hash, &mut response, true)
.await .await
); );
@ -583,7 +561,6 @@ pub async fn examine_updates(
exit_on_error!( exit_on_error!(
conn, conn,
mailbox_hash, mailbox_hash,
thread_id,
conn.send_command(b"UID SEARCH RECENT").await conn.send_command(b"UID SEARCH RECENT").await
conn.read_response(&mut response, RequiredResponses::SEARCH).await conn.read_response(&mut response, RequiredResponses::SEARCH).await
); );
@ -598,7 +575,6 @@ pub async fn examine_updates(
exit_on_error!( exit_on_error!(
conn, conn,
mailbox_hash, mailbox_hash,
thread_id,
conn.send_command( conn.send_command(
&[&b"UID FETCH"[..], &v.trim().split(|b| b == &b' ').join(b','), &b"(FLAGS RFC822)"[..]] &[&b"UID FETCH"[..], &v.trim().split(|b| b == &b' ').join(b','), &b"(FLAGS RFC822)"[..]]
.join(&b' '), .join(&b' '),
@ -701,7 +677,6 @@ pub async fn examine_updates(
exit_on_error!( exit_on_error!(
conn, conn,
mailbox_hash, mailbox_hash,
thread_id,
conn.send_command( conn.send_command(
&[ &[
b"FETCH", b"FETCH",

9
melib/src/backends/maildir/backend.rs
View File

@ -19,12 +19,9 @@
* along with meli. If not, see <http://www.gnu.org/licenses/>. * along with meli. If not, see <http://www.gnu.org/licenses/>.
*/ */
use super::{ use super::{MaildirMailbox, MaildirOp, MaildirPathTrait};
BackendMailbox, BackendOp, MailBackend, Mailbox, MailboxHash, MaildirPathTrait, RefreshEvent,
RefreshEventConsumer, RefreshEventKind::*,
};
use super::{MaildirMailbox, MaildirOp};
use crate::async_workers::*; use crate::async_workers::*;
use crate::backends::{RefreshEventKind::*, *};
use crate::conf::AccountSettings; use crate::conf::AccountSettings;
use crate::email::{Envelope, EnvelopeHash, Flag}; use crate::email::{Envelope, EnvelopeHash, Flag};
use crate::error::{MeliError, Result}; use crate::error::{MeliError, Result};
@ -202,7 +199,7 @@ impl MailBackend for MaildirType {
let mailbox_hash = mailbox.hash(); let mailbox_hash = mailbox.hash();
let unseen = mailbox.unseen.clone(); let unseen = mailbox.unseen.clone();
let total = mailbox.total.clone(); let total = mailbox.total.clone();
let mut path: PathBuf = mailbox.fs_path().into(); let path: PathBuf = mailbox.fs_path().into();
let root_path = self.path.to_path_buf(); let root_path = self.path.to_path_buf();
let map = self.hash_indexes.clone(); let map = self.hash_indexes.clone();
let mailbox_index = self.mailbox_index.clone(); let mailbox_index = self.mailbox_index.clone();

176
melib/src/backends/maildir/stream.rs
View File

@ -19,34 +19,33 @@
* along with meli. If not, see <http://www.gnu.org/licenses/>. * along with meli. If not, see <http://www.gnu.org/licenses/>.
*/ */
use futures::task::{Context, Poll};
use core::pin::Pin;
use super::*; use super::*;
use std::sync::{Arc,Mutex};
use std::io::{self, Read, Write};
use std::ops::{Deref, DerefMut};
use std::os::unix::fs::PermissionsExt;
use std::path::{Component, Path, PathBuf};
use std::result;
use std::sync::mpsc::channel;
use crate::backends::maildir::backend::move_to_cur; use crate::backends::maildir::backend::move_to_cur;
use core::future::Future; use core::future::Future;
use futures::stream::FuturesUnordered; use core::pin::Pin;
use futures::stream::{FuturesUnordered, StreamExt};
use futures::task::{Context, Poll};
use std::io::{self};
use std::os::unix::fs::PermissionsExt;
use std::path::PathBuf;
use std::result;
use std::sync::{Arc, Mutex};
pub struct MaildirStream { pub struct MaildirStream {
mailbox_hash: MailboxHash, payloads: Pin<Box<FuturesUnordered<Pin<Box<dyn Future<Output = Result<Vec<Envelope>>> + Send + 'static>>>>>,
unseen: Arc<Mutex<usize>>, }
total: Arc<Mutex<usize>>,
path: PathBuf,
root_path: PathBuf,
map: HashIndexes,
mailbox_index: Arc<Mutex<HashMap<EnvelopeHash, MailboxHash>>>,
payloads: Pin<Box<FuturesUnordered<Pin<Box<dyn Future<Output = Result<Vec<Envelope>>>>>>>>,
}
impl MaildirStream { impl MaildirStream {
pub fn new(name: &str, mailbox_hash: MailboxHash, unseen: Arc<Mutex<usize>>, total: Arc<Mutex<usize>>, mut path: PathBuf, root_path: PathBuf, map: HashIndexes, mailbox_index: Arc<Mutex<HashMap<EnvelopeHash, MailboxHash>>>) -> Result<Box<dyn Stream<Item = Result<Vec<Envelope>>>>> { pub fn new(
name: &str,
mailbox_hash: MailboxHash,
unseen: Arc<Mutex<usize>>,
total: Arc<Mutex<usize>>,
mut path: PathBuf,
root_path: PathBuf,
map: HashIndexes,
mailbox_index: Arc<Mutex<HashMap<EnvelopeHash, MailboxHash>>>,
) -> Result<Pin<Box<dyn Stream<Item = Result<Vec<Envelope>>> + Send + 'static>>> {
path.push("new"); path.push("new");
for d in path.read_dir()? { for d in path.read_dir()? {
if let Ok(p) = d { if let Ok(p) = d {
@ -65,26 +64,47 @@ impl MaildirStream {
Ok(path) Ok(path)
})?; })?;
files.push(e); files.push(e);
}let payloads =Box::pin( }
if !files.is_empty() { let payloads = Box::pin(if !files.is_empty() {
let cores = 4_usize; let cores = 4_usize;
let chunk_size = if count / cores > 0 { let chunk_size = if count / cores > 0 {
count / cores count / cores
} else { } else {
count count
}; };
files.chunks(chunk_size).map(|chunk| { files
//Self::chunk(chunk, name, mailbox_hash, unseen, total, path, root_path, map, mailbox_index)}) .chunks(chunk_size)
let cache_dir = xdg::BaseDirectories::with_profile("meli", &name).unwrap(); .map(|chunk| {
Box::pin(Self::chunk(SmallVec::from(chunk), cache_dir, mailbox_hash, unseen.clone(), total.clone(), path.clone(), root_path.clone(), map.clone(), mailbox_index.clone())) as Pin<Box<dyn Future<Output = _>>>}) //Self::chunk(chunk, name, mailbox_hash, unseen, total, path, root_path, map, mailbox_index)})
let cache_dir = xdg::BaseDirectories::with_profile("meli", &name).unwrap();
Box::pin(Self::chunk(
SmallVec::from(chunk),
cache_dir,
mailbox_hash,
unseen.clone(),
total.clone(),
root_path.clone(),
map.clone(),
mailbox_index.clone(),
)) as Pin<Box<dyn Future<Output = _> + Send + 'static>>
})
.collect::<_>() .collect::<_>()
} else {
FuturesUnordered::new()
} else { FuturesUnordered::new() }); });
Ok(Box::new(Self{mailbox_hash, unseen, total, path, root_path, map, mailbox_index, payloads})) Ok(Self { payloads }.boxed())
} }
async fn chunk(chunk:SmallVec<[std::path::PathBuf; 2048]>, cache_dir:xdg::BaseDirectories, mailbox_hash: MailboxHash, unseen: Arc<Mutex<usize>>, total: Arc<Mutex<usize>>, path: PathBuf, root_path: PathBuf, map: HashIndexes, mailbox_index: Arc<Mutex<HashMap<EnvelopeHash, MailboxHash>>>) -> Result<Vec<Envelope>> { async fn chunk(
chunk: SmallVec<[std::path::PathBuf; 2048]>,
cache_dir: xdg::BaseDirectories,
mailbox_hash: MailboxHash,
unseen: Arc<Mutex<usize>>,
total: Arc<Mutex<usize>>,
root_path: PathBuf,
map: HashIndexes,
mailbox_index: Arc<Mutex<HashMap<EnvelopeHash, MailboxHash>>>,
) -> Result<Vec<Envelope>> {
let unseen = unseen.clone(); let unseen = unseen.clone();
let total = total.clone(); let total = total.clone();
let map = map.clone(); let map = map.clone();
@ -92,12 +112,9 @@ impl MaildirStream {
let root_path = root_path.clone(); let root_path = root_path.clone();
let len = chunk.len(); let len = chunk.len();
let size = if len <= 100 { 100 } else { (len / 100) * 100 }; let size = if len <= 100 { 100 } else { (len / 100) * 100 };
let mut local_r: Vec<Envelope> = let mut local_r: Vec<Envelope> = Vec::with_capacity(chunk.len());
Vec::with_capacity(chunk.len());
for c in chunk.chunks(size) { for c in chunk.chunks(size) {
let map = map.clone(); let map = map.clone();
let mailbox_index = mailbox_index.clone();
let len = c.len();
for file in c { for file in c {
/* Check if we have a cache file with this email's /* Check if we have a cache file with this email's
* filename */ * filename */
@ -105,67 +122,50 @@ impl MaildirStream {
.strip_prefix(&root_path) .strip_prefix(&root_path)
.unwrap() .unwrap()
.to_path_buf(); .to_path_buf();
if let Some(cached) = if let Some(cached) = cache_dir.find_cache_file(&file_name) {
cache_dir.find_cache_file(&file_name) /* Cached struct exists, try to load it */
{ let reader = io::BufReader::new(fs::File::open(&cached).unwrap());
/* Cached struct exists, try to load it */ let result: result::Result<Envelope, _> = bincode::deserialize_from(reader);
let reader = io::BufReader::new( if let Ok(env) = result {
fs::File::open(&cached).unwrap(), let mut map = map.lock().unwrap();
); let map = map.entry(mailbox_hash).or_default();
let result: result::Result<Envelope, _> = let hash = env.hash();
bincode::deserialize_from(reader); map.insert(hash, file.clone().into());
if let Ok(env) = result { mailbox_index.lock().unwrap().insert(hash, mailbox_hash);
let mut map = map.lock().unwrap(); if !env.is_seen() {
let map = map.entry(mailbox_hash).or_default(); *unseen.lock().unwrap() += 1;
let hash = env.hash();
map.insert(hash, file.clone().into());
mailbox_index
.lock()
.unwrap()
.insert(hash, mailbox_hash);
if !env.is_seen() {
*unseen.lock().unwrap() += 1;
}
*total.lock().unwrap() += 1;
local_r.push(env);
continue;
} }
}; *total.lock().unwrap() += 1;
local_r.push(env);
continue;
}
};
let hash = get_file_hash(file); let hash = get_file_hash(file);
{ {
let mut map = map.lock().unwrap(); let mut map = map.lock().unwrap();
let map = map.entry(mailbox_hash).or_default(); let map = map.entry(mailbox_hash).or_default();
(*map).insert(hash, PathBuf::from(file).into()); (*map).insert(hash, PathBuf::from(file).into());
} }
let op = Box::new(MaildirOp::new( let op = Box::new(MaildirOp::new(hash, map.clone(), mailbox_hash));
hash,
map.clone(),
mailbox_hash,
));
if let Some(e) = Envelope::from_token(op, hash) { if let Some(e) = Envelope::from_token(op, hash) {
mailbox_index mailbox_index.lock().unwrap().insert(e.hash(), mailbox_hash);
.lock() if let Ok(cached) = cache_dir.place_cache_file(file_name) {
.unwrap() /* place result in cache directory */
.insert(e.hash(), mailbox_hash); let f = match fs::File::create(cached) {
if let Ok(cached) = Ok(f) => f,
cache_dir.place_cache_file(file_name) Err(e) => {
{ panic!("{}", e);
/* place result in cache directory */ }
let f = match fs::File::create(cached) { };
Ok(f) => f, let metadata = f.metadata().unwrap();
Err(e) => { let mut permissions = metadata.permissions();
panic!("{}", e);
}
};
let metadata = f.metadata().unwrap();
let mut permissions = metadata.permissions();
permissions.set_mode(0o600); // Read/write for owner only. permissions.set_mode(0o600); // Read/write for owner only.
f.set_permissions(permissions).unwrap(); f.set_permissions(permissions).unwrap();
let writer = io::BufWriter::new(f); let writer = io::BufWriter::new(f);
bincode::serialize_into(writer, &e).unwrap(); bincode::serialize_into(writer, &e).unwrap();
} }
if !e.is_seen() { if !e.is_seen() {
*unseen.lock().unwrap() += 1; *unseen.lock().unwrap() += 1;
} }
@ -187,7 +187,7 @@ impl MaildirStream {
impl Stream for MaildirStream { impl Stream for MaildirStream {
type Item = Result<Vec<Envelope>>; type Item = Result<Vec<Envelope>>;
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>>{ fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
//todo!() //todo!()
let payloads = self.payloads.as_mut(); let payloads = self.payloads.as_mut();
payloads.poll_next(cx) payloads.poll_next(cx)

7
melib/src/error.rs
View File

@ -276,3 +276,10 @@ impl From<nom::Err<(&str, nom::error::ErrorKind)>> for MeliError {
.set_source(Some(Arc::new(MeliError::new(format!("{}", kind))))) .set_source(Some(Arc::new(MeliError::new(format!("{}", kind)))))
} }
} }
impl<'a> From<&'a mut MeliError> for MeliError {
#[inline]
fn from(kind: &'a mut MeliError) -> MeliError {
kind.clone()
}
}

4
src/conf/accounts.rs
View File

@ -24,7 +24,7 @@
*/ */
use super::{AccountConf, FileMailboxConf}; use super::{AccountConf, FileMailboxConf};
use crate::jobs1::{JobExecutor, JobId}; use crate::jobs1::{JobExecutor, JobId, JoinHandle};
use melib::async_workers::{Async, AsyncBuilder, AsyncStatus, WorkContext}; use melib::async_workers::{Async, AsyncBuilder, AsyncStatus, WorkContext};
use melib::backends::{ use melib::backends::{
AccountHash, BackendOp, Backends, MailBackend, Mailbox, MailboxHash, NotifyFn, ReadOnlyOp, AccountHash, BackendOp, Backends, MailBackend, Mailbox, MailboxHash, NotifyFn, ReadOnlyOp,
@ -130,7 +130,7 @@ pub struct Account {
pub(crate) settings: AccountConf, pub(crate) settings: AccountConf,
pub(crate) backend: Arc<RwLock<Box<dyn MailBackend>>>, pub(crate) backend: Arc<RwLock<Box<dyn MailBackend>>>,
job_executor: Arc<JobExecutor>, pub job_executor: Arc<JobExecutor>,
active_jobs: HashMap<JobId, JobRequest>, active_jobs: HashMap<JobId, JobRequest>,
sender: Sender<ThreadEvent>, sender: Sender<ThreadEvent>,
event_queue: VecDeque<(MailboxHash, RefreshEvent)>, event_queue: VecDeque<(MailboxHash, RefreshEvent)>,

1
src/jobs1.rs
View File

@ -36,7 +36,6 @@ use crossbeam::deque::{Injector, Steal, Stealer, Worker};
use crossbeam::sync::{Parker, Unparker}; use crossbeam::sync::{Parker, Unparker};
use crossbeam::Sender; use crossbeam::Sender;
pub use futures::channel::oneshot; pub use futures::channel::oneshot;
use once_cell::sync::Lazy;
use std::iter; use std::iter;
type AsyncTask = async_task::Task<()>; type AsyncTask = async_task::Task<()>;