Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix table layout #335

Merged
3 commits merged into from May 31, 2023
Merged

Fix table layout #335

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc82080
Include translated severity in width computation
May 30, 2023
ab25b3f
Refactoring
May 30, 2023
66ec177
Replace sprintf usage
May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions lib/Zonemaster/CLI.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,9 +435,17 @@ sub run {
Zonemaster::Engine->preload_cache( $self->restore );
}

my $level_width = 0;
foreach ( keys %numeric ) {
if ( $numeric{ $self->level } <= $numeric{$_} ) {
my $width_l10n = length( decode_utf8( translate_severity( $_ ) ) );
$level_width = $width_l10n if $width_l10n > $level_width;
}
}

my %field_width = (
seconds => 7,
level => 9,
seconds => 7,
level => $level_width,
module => 12,
testcase => 14
);
Expand All @@ -452,8 +460,8 @@ sub run {
message => __( 'Message' )
);
foreach ( keys %header_names ) {
$field_width{$_} = _max( $field_width{$_}, length( decode( 'UTF-8', $header_names{$_} ) ) );
$remaining_space{$_} = $field_width{$_} - length( decode( 'UTF-8', $header_names{$_} ) );
$field_width{$_} = _max( $field_width{$_}, length( decode_utf8( $header_names{$_} ) ) );
$remaining_space{$_} = $field_width{$_} - length( decode_utf8( $header_names{$_} ) );
}
}

Expand Down Expand Up @@ -492,7 +500,9 @@ sub run {
}

if ( $self->show_level ) {
$prefix .= sprintf "%-*s ", ${field_width{level}}, $self->raw ? $entry->level : translate_severity( $entry->level );
$prefix .= $self->raw ? $entry->level : translate_severity( $entry->level );
my $space_l10n = ${field_width{level}} - length( decode_utf8( translate_severity($entry->level) ) ) + 1;
$prefix .= ' ' x $space_l10n;
}

if ( $self->show_module ) {
Expand Down