Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Accept &str instead of AsRef<str> in fetch_new_mesages()

Browse Source
This commit is contained in:
link2xt
2021-09-13 16:01:50 +00:00
parent 3096193d58
commit f8a4a88fb2
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/imap.rs
View File

@@ -462,7 +462,7 @@ impl Imap {
self.prepare(context).await?;
while self
.fetch_new_messages(context, &watch_folder, false)
.fetch_new_messages(context, watch_folder, false)
.await?
{
// We fetch until no more new messages are there.
@@ -647,10 +647,10 @@ impl Imap {
Ok(false)
}
pub(crate) async fn fetch_new_messages<S: AsRef<str>>(
pub(crate) async fn fetch_new_messages(
&mut self,
context: &Context,
folder: S,
folder: &str,
fetch_existing_msgs: bool,
) -> Result<bool> {
let show_emails = ShowEmails::from_i32(context.get_config_int(Config::ShowEmails).await?)
@@ -658,15 +658,15 @@ impl Imap {
let download_limit = context.download_limit().await?;
let new_emails = self
.select_with_uidvalidity(context, folder.as_ref())
.select_with_uidvalidity(context, folder)
.await?;
if !new_emails && !fetch_existing_msgs {
info!(context, "No new emails in folder {}", folder.as_ref());
info!(context, "No new emails in folder {}", folder);
return Ok(false);
}
let old_uid_next = get_uid_next(context, folder.as_ref()).await?;
let old_uid_next = get_uid_next(context, folder).await?;
let msgs = if fetch_existing_msgs {
self.prefetch_existing_msgs().await?
@@ -674,7 +674,6 @@ impl Imap {
self.prefetch(old_uid_next).await?
};
let read_cnt = msgs.len();
let folder: &str = folder.as_ref();
let mut read_errors = 0;
let mut uids_fetch_fully = Vec::with_capacity(msgs.len());

2
src/job.rs
View File

@@ -715,7 +715,7 @@ impl Job {
Config::ConfiguredSentboxFolder,
] {
if let Some(folder) = job_try!(context.get_config(*config).await) {
if let Err(e) = imap.fetch_new_messages(context, folder, true).await {
if let Err(e) = imap.fetch_new_messages(context, &folder, true).await {
// We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
warn!(context, "Could not fetch messages, retrying: {:#}", e);
return Status::RetryLater;