josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

prefix certain progress bars with what is being done (closes: #16)

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-08-18 14:31:38 +02:00
parent df18304449
commit 307cbf5a41
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
mmdebstrap
View file

@ -657,11 +657,28 @@ sub run_progress {
POSIX::sigprocmask(SIG_UNBLOCK, $sigset) POSIX::sigprocmask(SIG_UNBLOCK, $sigset)
or error "Can't unblock signals: $!"; or error "Can't unblock signals: $!";
print_progress(0.0); my $progress = 0.0;
my $status = undef;
print_progress($progress);
while (my $line = <$rfh>) { while (my $line = <$rfh>) {
my $output = $line_handler->($line); my ($newprogress, $newstatus) = $line_handler->($line);
next unless $output; next unless $newprogress;
print_progress($output); # start a new line if the new progress value is less than the
# previous one
if ($newprogress < $progress) {
print_progress("done");
}
if (defined $newstatus) {
$status = $newstatus;
}
## no critic (InputOutput::ProhibitInteractiveTest)
if (defined $status and $verbosity_level == 1 and -t STDERR) {
# \e[2K clears everything on the current line (i.e. the
# progress bar)
print STDERR "\e[2K$status: ";
}
print_progress($newprogress);
$progress = $newprogress;
} }
print_progress("done"); print_progress("done");
@ -727,10 +744,18 @@ sub run_dpkg_progress {
# number is twice the number of packages # number is twice the number of packages
my $total = (scalar @debs) * 2; my $total = (scalar @debs) * 2;
my $line_handler = sub { my $line_handler = sub {
my $status = undef;
if ($_[0] =~ /^processing: (install|configure): /) { if ($_[0] =~ /^processing: (install|configure): /) {
if ($1 eq 'install') {
$status = 'installing';
} elsif ($1 eq 'configure') {
$status = 'configuring';
} else {
error "unknown status: $1";
}
$num += 1; $num += 1;
} }
return $num / $total * 100; return $num / $total * 100, $status;
}; };
run_progress $get_exec, $line_handler, $line_has_error; run_progress $get_exec, $line_handler, $line_has_error;
return; return;
@ -764,7 +789,15 @@ sub run_apt_progress {
} }
my $line_handler = sub { my $line_handler = sub {
if ($_[0] =~ /(pmstatus|dlstatus):[^:]+:(\d+\.\d+):.*/) { if ($_[0] =~ /(pmstatus|dlstatus):[^:]+:(\d+\.\d+):.*/) {
return $2; my $status = undef;
if ($1 eq 'pmstatus') {
$status = "installing";
} elsif ($1 eq 'dlstatus') {
$status = "downloading";
} else {
error "unknown status: $1";
}
return $2, $status;
} }
}; };
run_progress $get_exec, $line_handler, $line_has_error, $options->{CHDIR}; run_progress $get_exec, $line_handler, $line_has_error, $options->{CHDIR};