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

imap: add info events when fetching existing messages

Browse Source
This commit is contained in:
link2xt
2022-06-26 13:24:59 +00:00
parent 88a047b003
commit a20bc21c19
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/tests/test_0_complex_or_slow.py
View File

@@ -228,14 +228,26 @@ def test_fetch_existing(acfactory, lp, mvbox_move):
assert_folders_configured(ac1_clone) assert_folders_configured(ac1_clone)
lp.sec("check that ac2 contact was fetchted during configure") lp.sec("check that ac2 contact was fetchted during configure")
for ev in ac1_clone._evtracker.iter_events():
if ev.name == "DC_EVENT_INFO" and "Started fetching existing contacts." in ev.data2:
break
ac1_clone._evtracker.get_matching("DC_EVENT_CONTACTS_CHANGED") ac1_clone._evtracker.get_matching("DC_EVENT_CONTACTS_CHANGED")
ac2_addr = ac2.get_config("addr") ac2_addr = ac2.get_config("addr")
assert any(c.addr == ac2_addr for c in ac1_clone.get_contacts()) assert any(c.addr == ac2_addr for c in ac1_clone.get_contacts())
for ev in ac1_clone._evtracker.iter_events():
if ev.name == "DC_EVENT_INFO" and "Done fetching existing contacts." in ev.data2:
break
assert_folders_configured(ac1_clone) assert_folders_configured(ac1_clone)
lp.sec("check that messages changed events arrive for the correct message") lp.sec("check that messages changed events arrive for the correct message")
for ev in ac1_clone._evtracker.iter_events():
if ev.name == "DC_EVENT_INFO" and "Started fetching existing messages." in ev.data2:
break
msg = ac1_clone._evtracker.wait_next_messages_changed() msg = ac1_clone._evtracker.wait_next_messages_changed()
assert msg.text == "message text" assert msg.text == "message text"
for ev in ac1_clone._evtracker.iter_events():
if ev.name == "DC_EVENT_INFO" and "Done fetching existing messages." in ev.data2:
break
assert_folders_configured(ac1) assert_folders_configured(ac1)
assert_folders_configured(ac1_clone) assert_folders_configured(ac1_clone)

7
src/imap.rs
View File

@@ -919,11 +919,14 @@ impl Imap {
} }
self.prepare(context).await.context("could not connect")?; self.prepare(context).await.context("could not connect")?;
info!(context, "Started fetching existing contacts.");
add_all_recipients_as_contacts(context, self, Config::ConfiguredSentboxFolder).await?; add_all_recipients_as_contacts(context, self, Config::ConfiguredSentboxFolder).await?;
add_all_recipients_as_contacts(context, self, Config::ConfiguredMvboxFolder).await?; add_all_recipients_as_contacts(context, self, Config::ConfiguredMvboxFolder).await?;
add_all_recipients_as_contacts(context, self, Config::ConfiguredInboxFolder).await?; add_all_recipients_as_contacts(context, self, Config::ConfiguredInboxFolder).await?;
info!(context, "Done fetching existing contacts.");
if context.get_config_bool(Config::FetchExistingMsgs).await? { if context.get_config_bool(Config::FetchExistingMsgs).await? {
info!(context, "Started fetching existing messages.");
for config in &[ for config in &[
Config::ConfiguredMvboxFolder, Config::ConfiguredMvboxFolder,
Config::ConfiguredInboxFolder, Config::ConfiguredInboxFolder,
@@ -935,9 +938,11 @@ impl Imap {
.context("could not fetch messages")?; .context("could not fetch messages")?;
} }
} }
info!(context, "Done fetching existing messages.");
} else {
info!(context, "Not fetching existing messages.");
} }
info!(context, "Done fetching existing messages.");
context context
.set_config_bool(Config::FetchedExistingMsgs, true) .set_config_bool(Config::FetchedExistingMsgs, true)
.await?; .await?;