justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[boot] Don't print 'ok' in status line until success

Browse Source 
Previously, status_line would show 'ok' until something went wrong. Now,
show an empty box until either a warning or error happens, or the
cleanup happens without an issue.
This commit is contained in:
Justin C. Miller
2023-01-31 22:40:05 -08:00
parent 72db77fb58
commit 61199d2f80
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/boot/status.cpp
View File

@@ -11,17 +11,19 @@ constexpr int num_boxes = 30;
namespace boot { namespace boot {
static constexpr int level_ok = 0; static constexpr int level_ok = 1;
static constexpr int level_warn = 1; static constexpr int level_warn = 2;
static constexpr int level_fail = 2; static constexpr int level_fail = 3;
static const wchar_t *level_tags[] = { static const wchar_t *level_tags[] = {
L" ",
L" ok ", L" ok ",
L" warn ", L" warn ",
L"failed" L"failed"
}; };
static const uefi::attribute level_colors[] = { static const uefi::attribute level_colors[] = {
uefi::attribute::green,
uefi::attribute::green, uefi::attribute::green,
uefi::attribute::brown, uefi::attribute::brown,
uefi::attribute::light_red uefi::attribute::light_red
@@ -33,7 +35,7 @@ unsigned status_bar::s_count = 0;
status_line::status_line(const wchar_t *message, const wchar_t *context, bool fails_clean) : status_line::status_line(const wchar_t *message, const wchar_t *context, bool fails_clean) :
status(fails_clean), status(fails_clean),
m_level(level_ok), m_level(0),
m_depth(0), m_depth(0),
m_outer(nullptr) m_outer(nullptr)
{ {
@@ -70,6 +72,12 @@ status_line::~status_line()
m_outer->m_level = m_level; m_outer->m_level = m_level;
m_outer->print_status_tag(); m_outer->print_status_tag();
} }
if (m_level < level_ok) {
m_level = level_ok;
print_status_tag();
}
s_current = m_outer; s_current = m_outer;
} }