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

remove some AsRef's for me to more easy to understand things

Browse Source
This commit is contained in:
holger krekel
2019-11-07 02:01:48 +01:00
parent 15bf53c092
commit 4cebdf3b84
2 changed files with 92 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/context.rs
View File

@@ -398,24 +398,21 @@ impl Context {
.unwrap_or_default() .unwrap_or_default()
} }
pub fn is_inbox(&self, folder_name: impl AsRef<str>) -> bool { pub fn is_inbox(&self, folder_name: &str) -> bool {
folder_name.as_ref() == "INBOX" folder_name == "INBOX"
} }
pub fn is_sentbox(&self, folder_name: impl AsRef<str>) -> bool { pub fn is_sentbox(&self, folder_name: &str) -> bool {
let sentbox_name = self.sql.get_raw_config(self, "configured_sentbox_folder"); if let Some(name) = self.sql.get_raw_config(self, "configured_sentbox_folder") {
if let Some(name) = sentbox_name { name == folder_name
name == folder_name.as_ref()
} else { } else {
false false
} }
} }
pub fn is_mvbox(&self, folder_name: impl AsRef<str>) -> bool { pub fn is_mvbox(&self, folder_name: &str) -> bool {
let mvbox_name = self.sql.get_raw_config(self, "configured_mvbox_folder"); if let Some(name) = self.sql.get_raw_config(self, "configured_mvbox_folder") {
name == folder_name
if let Some(name) = mvbox_name {
name == folder_name.as_ref()
} else { } else {
false false
} }

127
src/imap.rs
View File

@@ -502,8 +502,8 @@ impl Imap {
} }
info!(context, "IMAP unsetup_handle step 3 (clearing config)."); info!(context, "IMAP unsetup_handle step 3 (clearing config).");
// self.config.write().unwrap().selected_folder = None; self.config.write().unwrap().selected_folder = None;
// self.config.write().unwrap().selected_mailbox = None; self.config.write().unwrap().selected_mailbox = None;
info!(context, "IMAP unsetup_handle step 4 (disconnected).",); info!(context, "IMAP unsetup_handle step 4 (disconnected).",);
} }
@@ -632,27 +632,7 @@ impl Imap {
} }
} }
fn select_folder<S: AsRef<str>>(&self, context: &Context, folder: Option<S>) -> usize { fn expunge_folder(&self, context: &Context) -> bool {
if self.session.lock().unwrap().is_none() {
let mut cfg = self.config.write().unwrap();
cfg.selected_folder = None;
cfg.selected_folder_needs_expunge = false;
return 0;
}
// if there is a new folder and the new folder is equal to the selected one, there's nothing to do.
// if there is _no_ new folder, we continue as we might want to expunge below.
if let Some(ref folder) = folder {
if let Some(ref selected_folder) = self.config.read().unwrap().selected_folder {
if folder.as_ref() == selected_folder {
return 1;
}
}
}
// deselect existing folder, if needed (it's also done implicitly by SELECT, however, without EXPUNGE then)
let needs_expunge = { self.config.read().unwrap().selected_folder_needs_expunge };
if needs_expunge {
if let Some(ref folder) = self.config.read().unwrap().selected_folder { if let Some(ref folder) = self.config.read().unwrap().selected_folder {
info!(context, "Expunge messages in \"{}\".", folder); info!(context, "Expunge messages in \"{}\".", folder);
@@ -665,30 +645,53 @@ impl Imap {
} }
Err(err) => { Err(err) => {
warn!(context, "failed to close session: {:?}", err); warn!(context, "failed to close session: {:?}", err);
return 0; return false;
} }
} }
} else { } else {
unreachable!();
}
}
true
}
fn select_folder(&self, context: &Context, folder: &str) -> usize {
if self.session.lock().unwrap().is_none() {
let mut cfg = self.config.write().unwrap();
cfg.selected_folder = None;
cfg.selected_folder_needs_expunge = false;
return 0; return 0;
} }
// if there is a new folder and the new folder is equal to the selected one, there's nothing to do.
// if there is _no_ new folder, we continue as we might want to expunge below.
if let Some(ref selected_folder) = self.config.read().unwrap().selected_folder {
if folder == selected_folder {
return 1;
} }
}
// deselect existing folder, if needed (it's also done implicitly by SELECT, however, without EXPUNGE then)
let needs_expunge = { self.config.read().unwrap().selected_folder_needs_expunge };
if needs_expunge {
self.expunge_folder(context);
self.config.write().unwrap().selected_folder_needs_expunge = false; self.config.write().unwrap().selected_folder_needs_expunge = false;
} }
// select new folder // select new folder
if let Some(ref folder) = folder {
if let Some(ref mut session) = &mut *self.session.lock().unwrap() { if let Some(ref mut session) = &mut *self.session.lock().unwrap() {
match session.select(folder) { match session.select(&folder) {
Ok(mailbox) => { Ok(mailbox) => {
let mut config = self.config.write().unwrap(); let mut config = self.config.write().unwrap();
config.selected_folder = Some(folder.as_ref().to_string()); config.selected_folder = Some(folder.to_string());
config.selected_mailbox = Some(mailbox); config.selected_mailbox = Some(mailbox);
} }
Err(err) => { Err(err) => {
info!( info!(
context, context,
"Cannot select folder: {}; {:?}.", "Cannot select folder: {}; {:?}.",
folder.as_ref(), folder,
err err
); );
@@ -700,13 +703,12 @@ impl Imap {
} else { } else {
unreachable!(); unreachable!();
} }
}
1 1
} }
fn get_config_last_seen_uid<S: AsRef<str>>(&self, context: &Context, folder: S) -> (u32, u32) { fn get_config_last_seen_uid(&self, context: &Context, folder: &str) -> (u32, u32) {
let key = format!("imap.mailbox.{}", folder.as_ref()); let key = format!("imap.mailbox.{}", folder);
if let Some(entry) = context.sql.get_raw_config(context, &key) { if let Some(entry) = context.sql.get_raw_config(context, &key) {
// the entry has the format `imap.mailbox.<folder>=<uidvalidity>:<lastseenuid>` // the entry has the format `imap.mailbox.<folder>=<uidvalidity>:<lastseenuid>`
let mut parts = entry.split(':'); let mut parts = entry.split(':');
@@ -727,22 +729,22 @@ impl Imap {
} }
} }
fn fetch_from_single_folder<S: AsRef<str>>(&self, context: &Context, folder: S) -> usize { fn fetch_from_single_folder(&self, context: &Context, folder: &str) -> usize {
if !self.is_connected() { if !self.is_connected() {
info!( info!(
context, context,
"Cannot fetch from \"{}\" - not connected.", "Cannot fetch from \"{}\" - not connected.",
folder.as_ref() folder
); );
return 0; return 0;
} }
if self.select_folder(context, Some(&folder)) == 0 { if self.select_folder(context, &folder) == 0 {
info!( info!(
context, context,
"Cannot select folder \"{}\" for fetching.", "Cannot select folder \"{}\" for fetching.",
folder.as_ref() folder
); );
return 0; return 0;
@@ -750,11 +752,11 @@ impl Imap {
// compare last seen UIDVALIDITY against the current one // compare last seen UIDVALIDITY against the current one
let (mut uid_validity, mut last_seen_uid) = self.get_config_last_seen_uid(context, &folder); let (mut uid_validity, mut last_seen_uid) = self.get_config_last_seen_uid(context, &folder);
/*
let config = self.config.read().unwrap(); let uid_validity = self.config.read().unwrap().selected_mailbox.as_ref().expect("just selected").uid_validity;
let mailbox = config.selected_mailbox.as_ref().expect("just selected");
if mailbox.uid_validity.is_none() { if uid_validity.is_none() {
error!( error!(
context, context,
"Cannot get UIDVALIDITY for folder \"{}\".", "Cannot get UIDVALIDITY for folder \"{}\".",
@@ -764,7 +766,7 @@ impl Imap {
return 0; return 0;
} }
if mailbox.uid_validity.unwrap_or_default() != uid_validity { if .uid_validity.unwrap_or_default() != uid_validity {
// first time this folder is selected or UIDVALIDITY has changed, init lastseenuid and save it to config // first time this folder is selected or UIDVALIDITY has changed, init lastseenuid and save it to config
if mailbox.exists == 0 { if mailbox.exists == 0 {
@@ -820,6 +822,7 @@ impl Imap {
uid_validity, uid_validity,
); );
} }
*/
let mut read_cnt = 0; let mut read_cnt = 0;
let mut read_errors = 0; let mut read_errors = 0;
@@ -848,14 +851,14 @@ impl Imap {
let message_id = prefetch_get_message_id(msg).unwrap_or_default(); let message_id = prefetch_get_message_id(msg).unwrap_or_default();
if !precheck_imf(context, &message_id, folder.as_ref(), cur_uid) { if !precheck_imf(context, &message_id, &folder, cur_uid) {
// check passed, go fetch the rest // check passed, go fetch the rest
if self.fetch_single_msg(context, &folder, cur_uid) == 0 { if self.fetch_single_msg(context, &folder, cur_uid) == 0 {
info!( info!(
context, context,
"Read error for message {} from \"{}\", trying over later.", "Read error for message {} from \"{}\", trying over later.",
message_id, message_id,
folder.as_ref() folder
); );
read_errors += 1; read_errors += 1;
@@ -866,7 +869,7 @@ impl Imap {
context, context,
"Skipping message {} from \"{}\" by precheck.", "Skipping message {} from \"{}\" by precheck.",
message_id, message_id,
folder.as_ref(), folder
); );
} }
if cur_uid > new_last_seen_uid { if cur_uid > new_last_seen_uid {
@@ -886,7 +889,7 @@ impl Imap {
context, context,
"{} mails read from \"{}\" with {} errors.", "{} mails read from \"{}\" with {} errors.",
read_cnt, read_cnt,
folder.as_ref(), folder,
read_errors read_errors
); );
} else { } else {
@@ -894,30 +897,30 @@ impl Imap {
context, context,
"{} mails read from \"{}\".", "{} mails read from \"{}\".",
read_cnt, read_cnt,
folder.as_ref() folder
); );
} }
read_cnt read_cnt
} }
fn set_config_last_seen_uid<S: AsRef<str>>( fn set_config_last_seen_uid(
&self, &self,
context: &Context, context: &Context,
folder: S, folder: &str,
uidvalidity: u32, uidvalidity: u32,
lastseenuid: u32, lastseenuid: u32,
) { ) {
let key = format!("imap.mailbox.{}", folder.as_ref()); let key = format!("imap.mailbox.{}", folder);
let val = format!("{}:{}", uidvalidity, lastseenuid); let val = format!("{}:{}", uidvalidity, lastseenuid);
context.sql.set_raw_config(context, &key, Some(&val)).ok(); context.sql.set_raw_config(context, &key, Some(&val)).ok();
} }
fn fetch_single_msg<S: AsRef<str>>( fn fetch_single_msg(
&self, &self,
context: &Context, context: &Context,
folder: S, folder: &str,
server_uid: u32, server_uid: u32,
) -> usize { ) -> usize {
// the function returns: // the function returns:
@@ -938,7 +941,7 @@ impl Imap {
context, context,
"Error on fetching message #{} from folder \"{}\"; retry={}; error={}.", "Error on fetching message #{} from folder \"{}\"; retry={}; error={}.",
server_uid, server_uid,
folder.as_ref(), folder,
self.should_reconnect(), self.should_reconnect(),
err err
); );
@@ -954,7 +957,7 @@ impl Imap {
context, context,
"Message #{} does not exist in folder \"{}\".", "Message #{} does not exist in folder \"{}\".",
server_uid, server_uid,
folder.as_ref() folder,
); );
} else { } else {
let msg = &msgs[0]; let msg = &msgs[0];
@@ -974,7 +977,7 @@ impl Imap {
if !is_deleted && msg.body().is_some() { if !is_deleted && msg.body().is_some() {
let body = msg.body().unwrap_or_default(); let body = msg.body().unwrap_or_default();
unsafe { unsafe {
dc_receive_imf(context, &body, folder.as_ref(), server_uid, flags as u32); dc_receive_imf(context, &body, &folder, server_uid, flags as u32);
} }
} }
} }
@@ -990,11 +993,12 @@ impl Imap {
self.setup_handle_if_needed(context); self.setup_handle_if_needed(context);
let watch_folder = self.config.read().unwrap().watch_folder.clone(); let watch_folder = self.config.read().unwrap().watch_folder.clone();
if self.select_folder(context, watch_folder.as_ref()) == 0 { if let Some(wfolder) = watch_folder {
if self.select_folder(context, &wfolder) == 0 {
warn!(context, "IMAP-IDLE not setup.",); warn!(context, "IMAP-IDLE not setup.",);
return self.fake_idle(context); return self.fake_idle(context);
} }
}
let session = self.session.clone(); let session = self.session.clone();
let mut worker = Some({ let mut worker = Some({
@@ -1148,7 +1152,7 @@ impl Imap {
let watch_folder = self.config.read().unwrap().watch_folder.clone(); let watch_folder = self.config.read().unwrap().watch_folder.clone();
if let Some(watch_folder) = watch_folder { if let Some(watch_folder) = watch_folder {
if 0 != self.fetch_from_single_folder(context, watch_folder) { if 0 != self.fetch_from_single_folder(context, &watch_folder) {
do_fake_idle = false; do_fake_idle = false;
} }
} }
@@ -1285,7 +1289,7 @@ impl Imap {
return Some(ImapResult::RetryLater); return Some(ImapResult::RetryLater);
} }
} }
if self.select_folder(context, Some(&folder)) == 0 { if self.select_folder(context, &folder) == 0 {
warn!( warn!(
context, context,
"Cannot select folder {} for preparing IMAP operation", folder "Cannot select folder {} for preparing IMAP operation", folder
@@ -1501,7 +1505,7 @@ impl Imap {
pub fn empty_folder(&self, context: &Context, folder: &str) { pub fn empty_folder(&self, context: &Context, folder: &str) {
info!(context, "emptying folder {}", folder); info!(context, "emptying folder {}", folder);
if folder.is_empty() || self.select_folder(context, Some(&folder)) == 0 { if folder.is_empty() || self.select_folder(context, &folder) == 0 {
warn!(context, "Cannot select folder '{}' for emptying", folder); warn!(context, "Cannot select folder '{}' for emptying", folder);
return; return;
} }
@@ -1509,14 +1513,7 @@ impl Imap {
if !self.add_flag_finalized_with_set(context, SELECT_ALL, "\\Deleted") { if !self.add_flag_finalized_with_set(context, SELECT_ALL, "\\Deleted") {
warn!(context, "Cannot empty folder {}", folder); warn!(context, "Cannot empty folder {}", folder);
} else { } else {
// we now trigger expunge to actually delete messages if self.expunge_folder(context) {
self.config.write().unwrap().selected_folder_needs_expunge = true;
if self.select_folder::<String>(context, None) == 0 {
warn!(
context,
"could not perform expunge on empty-marked folder {}", folder
);
} else {
emit_event!(context, Event::ImapFolderEmptied(folder.to_string())); emit_event!(context, Event::ImapFolderEmptied(folder.to_string()));
} }
} }