Skip to content

Slow down the spinner a bit #419

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

Merged
marc-vanderwal merged 1 commit into from
May 27, 2025
Merged

Slow down the spinner a bit #419

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 15 additions & 9 deletions lib/Zonemaster/CLI.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ use Pod::Usage;
use POSIX qw[setlocale LC_MESSAGES LC_CTYPE];
use Readonly;
use Scalar::Util qw[blessed];
use Time::HiRes;
use Try::Tiny;
use Zonemaster::LDNS;
use Zonemaster::Engine;
Expand Down Expand Up @@ -400,9 +401,11 @@ sub run {

print_spinner() if $show_progress;

$counter{ uc $entry->level } += 1;
my $entry_level = $entry->level;

if ( $numeric{ uc $entry->level } >= $numeric{$opt_level} ) {
$counter{ uc $entry_level } += 1;

if ( $numeric{ uc $entry_level } >= $numeric{$opt_level} ) {
$printed_something = 1;

if ( $opt_json and $opt_json_stream ) {
Expand All @@ -412,8 +415,8 @@ sub run {
$r{module} = $entry->module if $opt_show_module;
$r{testcase} = $entry->testcase if $opt_show_testcase;
$r{tag} = $entry->tag;
$r{level} = $entry->level if $opt_show_level;
$r{args} = $entry->args if $entry->args;
$r{level} = $entry_level if $opt_show_level;
$r{args} = $entry->args if $entry->args;
$r{message} = $translator->translate_tag( $entry ) unless $opt_raw;

say $JSON->encode( \%r );
Expand All @@ -430,7 +433,7 @@ sub run {
if ( $opt_show_level ) {
$prefix .= $opt_raw ? $entry->level : translate_severity( $entry->level );
my $space_l10n =
${ field_width { level } } - length( decode_utf8( translate_severity( $entry->level ) ) ) + 1;
${ field_width { level } } - length( decode_utf8( translate_severity( $entry_level ) ) ) + 1;
$prefix .= ' ' x $space_l10n;
}

Expand All @@ -454,7 +457,7 @@ sub run {
}
}
else {
if ( $entry->level eq q{DEBUG3} and scalar( keys %{$entry->args} ) == 1 and defined $entry->args->{packet} ) {
if ( $entry_level eq q{DEBUG3} and scalar( keys %{$entry->args} ) == 1 and defined $entry->args->{packet} ) {
my $packet = $entry->args->{packet};
my $padding = q{ } x length $prefix;
$entry->args->{packet} = q{};
Expand Down Expand Up @@ -852,10 +855,13 @@ my @spinner_strings = ( ' | ', ' / ', ' - ', ' \\ ' );

sub print_spinner {
state $counter = 0;
state $last_spin = [0, 0];

printf "%s\r", $spinner_strings[ $counter++ % 4 ];

return;
my $time = [Time::HiRes::gettimeofday()];
if ( Time::HiRes::tv_interval($last_spin, $time) > 0.1 ) {
$last_spin = $time;
printf "%s\r", $spinner_strings[ $counter++ % 4 ];
}
}

sub print_test_list {
Expand Down