1
0
Fork 0
mirror of https://github.com/lise-henry/crowbook synced 2024-05-10 00:16:16 +02:00

Merge pull request #77 from dvalter/fix/renderer-error-bar

Fix endless progress bar on renderer failure
This commit is contained in:
Élisabeth Henry 2020-07-07 01:34:33 +02:00 committed by GitHub
commit 5b09dcf15f
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -886,15 +886,25 @@ impl Book {
let bar = self.add_spinner_to_multibar(format);
match self.formats.get(format) {
Some(&(ref description, ref renderer)) => {
renderer.render(self, f)?;
self.bar_finish(Crowbar::Spinner(bar),
match renderer.render(self, f) {
Ok(_) => {
self.bar_finish(Crowbar::Spinner(bar),
CrowbarState::Success,
&lformat!("generated {format}",
format = format));
self.bar_finish(Crowbar::Main, CrowbarState::Success, &lformat!("Finished"));
info!("{}", lformat!("Succesfully generated {format}",
format = description));
Ok(())
self.bar_finish(Crowbar::Main, CrowbarState::Success, &lformat!("Finished"));
info!("{}", lformat!("Succesfully generated {format}",
format = description));
Ok(())
},
Err(e) => {
self.bar_finish(Crowbar::Spinner(bar),
CrowbarState::Error,
&lformat!("{error}", error = e));
self.bar_finish(Crowbar::Main, CrowbarState::Error, &lformat!("ERROR"));
Err(e)
}
}
},
None => {
self.bar_finish(Crowbar::Spinner(bar),