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

configure: emit errors via DC_EVENT_CONFIGURE_PROGRESS

Browse Source 
Node test expects progress to report either success or error
eventually.

Also update the error text expected by node test.
This commit is contained in:
link2xt
2022-06-17 17:28:53 +00:00
parent 0ed3480258
commit 10f3ad6122
3 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/configure.rs
View File

@@ -75,6 +75,24 @@ impl Context {
}))
.await;
if let Err(err) = res.as_ref() {
progress!(
self,
0,
Some(
stock_str::configuration_failed(
self,
// We are using Anyhow's .context() and to show the
// inner error, too, we need the {:#}:
format!("{:#}", err),
)
.await
)
);
} else {
progress!(self, 1000);
}
self.free_ongoing().await;
res
@@ -114,30 +132,10 @@ impl Context {
}
}
match success {
Ok(_) => {
self.set_config(Config::NotifyAboutWrongPw, Some("1"))
.await?;
progress!(self, 1000);
Ok(())
}
Err(err) => {
progress!(
self,
0,
Some(
stock_str::configuration_failed(
self,
// We are using Anyhow's .context() and to show the
// inner error, too, we need the {:#}:
format!("{:#}", err),
)
.await
)
);
Err(err)
}
}
success?;
self.set_config(Config::NotifyAboutWrongPw, Some("1"))
.await?;
Ok(())
}
}