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

Jump to bottom

change how to log to terminal #235

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

change how to log to terminal #235

Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion META.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"Module::CPANfile" : "0",
"Module::Metadata" : "0",
"Module::cpmfile" : "0.001",
"Parallel::Pipes::App" : "0.100",
"Parallel::Pipes::App" : "0.200",
"Parse::PMFile" : "0.43",
"Proc::ForkSafe" : "0.001",
"local::lib" : "2.000018",
Expand Down Expand Up @@ -79,6 +79,12 @@
"App::cpm::Logger::File" : {
"file" : "lib/App/cpm/Logger/File.pm"
},
"App::cpm::Logger::Terminal" : {
"file" : "lib/App/cpm/Logger/Terminal.pm"
},
"App::cpm::Logger::Terminal::Lines" : {
"file" : "lib/App/cpm/Logger/Terminal.pm"
},
"App::cpm::Master" : {
"file" : "lib/App/cpm/Master.pm"
},
Expand Down
2 changes: 1 addition & 1 deletion cpm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ prereqs:
Module::CPANfile:
Module::Metadata:
Module::cpmfile: { version: '0.001' }
Parallel::Pipes::App: { version: '0.100' }
Parallel::Pipes::App: { version: '0.200' }
Parse::PMFile: { version: '0.43' }
Proc::ForkSafe: { version: '0.001' }
local::lib: { version: '2.000018' }
Expand Down
16 changes: 13 additions & 3 deletions lib/App/cpm/CLI.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,21 +371,31 @@ sub install {
my @task = $master->get_task;
Parallel::Pipes::App->run(
num => $num,
init_work => sub {
my $pipes = shift;
my @pid = sort { $a <=> $b } keys %{$pipes->{pipes}};
$master->{_pids} = \@pid;
},
before_work => sub {
my $task = shift;
$task->in_charge(1);
my ($task, $worker) = @_;
$task->in_charge($worker->{pid});
},
work => sub {
my $task = shift;
return $worker->work($task);
$worker->work($task);
},
after_work => sub {
my $result = shift;
$master->register_result($result);
@task = $master->get_task;
},
tasks => \@task,
idle_tick => 0.5,
idle_work => sub {
$master->log_task;
},
);
$master->log_task_finalize;
}

sub cleanup {
Expand Down
10 changes: 4 additions & 6 deletions lib/App/cpm/Distribution.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package App::cpm::Distribution;
use strict;
use warnings;

use App::cpm::Logger;
use App::cpm::Requirement;
use App::cpm::version;
use CPAN::DistnameInfo;
Expand Down Expand Up @@ -145,16 +144,15 @@ sub providing {
for my $provide (@{$self->provides}) {
if ($provide->{package} eq $package) {
if (!$version_range or App::cpm::version->parse($provide->{version})->satisfy($version_range)) {
return 1;
return (1, undef);
} else {
my $message = sprintf "%s provides %s (%s), but needs %s\n",
my $err = sprintf "%s provides %s (%s), but needs %s\n",
$self->distfile, $package, $provide->{version} || 0, $version_range;
App::cpm::Logger->log(result => "WARN", message => $message);
last;
return (undef, $err);
}
}
}
return;
return (undef, undef);
}

sub equals {
Expand Down
78 changes: 78 additions & 0 deletions lib/App/cpm/Logger/Terminal.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
package App::cpm::Logger::Terminal;
use strict;
use warnings;

{
package App::cpm::Logger::Terminal::Lines;
sub new {
my ($class, $pids, $progress) = @_;
my $num = keys %$pids;
bless {
pids => $pids,
progress => $progress,
num => $num,
worker_prefix => $num < 10 ? "worker%d" : "worker%-2d",
_lines => [],
}, $class;
}
my %_ing = (install => "installing", resolve => "resolving", fetch => "fetching", configure => "configuring");
sub set_worker {
my ($self, $pid, $task) = @_;
my $i = $self->{pids}{$pid};
my ($progress, $ing, $name) = $task ?
($self->{progress}, $_ing{$task->type}, $task->distvname) : (" ", "idle", "");
$self->{_lines}[$i] = sprintf "$self->{worker_prefix} %s \e[1;30m%-11s\e[m %s\n",
$i+1, $progress, $ing, $name;
}
sub set_summary {
my ($self, $all, $num) = @_;
$self->{_lines}[$self->{num}] = "--- $num/$all ---\n";
}
sub lines {
my $self = shift;
@{$self->{_lines}};
}
}

use IO::Handle;

sub new {
my ($class, @pid) = @_;
my %pid = map { ($pid[$_], $_) } 0 .. $#pid;
bless {
first => 1,
pids => \%pid,
lines => 1 + (keys %pid),
fh => \*STDERR,
_progress_index => 0,
}, $class;
}

my @_progress = qw(\\ | / -);
sub progress {
my $self = shift;
$self->{_progress_index} = ($self->{_progress_index}+1) % 4;
$_progress[$self->{_progress_index}];
}

sub new_lines {
my $self = shift;
App::cpm::Logger::Terminal::Lines->new($self->{pids}, $self->progress);
}

sub clear {
my $self = shift;
$self->{fh}->print( ("\e[1A\e[K") x $self->{lines} );
}

sub write {
my ($self, $lines) = @_;
if ($self->{first}) {
$self->{first} = undef;
} else {
$self->clear;
}
$self->{fh}->print($lines->lines);
}

1;
60 changes: 36 additions & 24 deletions lib/App/cpm/Master.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use warnings;

use App::cpm::CircularDependency;
use App::cpm::Distribution;
use App::cpm::Logger::Terminal;
use App::cpm::Logger;
use App::cpm::Task;
use App::cpm::version;
Expand Down Expand Up @@ -40,7 +41,7 @@ sub new {
} else {
my $msg = "You don't have Module::CoreList. "
. "The local-lib may result in incomplete self-contained directory.";
App::cpm::Logger->log(result => "WARN", message => $msg);
warn "$msg\n";
}
}
$self;
Expand Down Expand Up @@ -123,15 +124,33 @@ sub register_result {

%{$task} = %{$result}; # XXX

my $logged = $self->info($task);
#my $logged = $self->info($task);
my $method = "_register_@{[$task->{type}]}_result";
$self->$method($task);
$self->remove_task($task);
$self->_show_progress if $logged && $self->{show_progress};
#$self->_show_progress if $logged && $self->{show_progress};
$self->log_task($task);

return 1;
}

sub log_task {
my ($self, @done) = @_;
my $terminal = $self->{terminal} ||= App::cpm::Logger::Terminal->new(@{$self->{_pids}});
my $lines = $terminal->new_lines;
for my $pid (@{$self->{_pids}}) {
my ($task) = grep { $_->in_charge == $pid } @done, $self->tasks; # maybe task is undef
$lines->set_worker($pid, $task);
}
$lines->set_summary((0+keys %{$self->{distributions}}), $self->installed_distributions);
$terminal->write($lines);
}

sub log_task_finalize {
my $self = shift;
$self->{terminal}->clear;
}

sub info {
my ($self, $task) = @_;
my $type = $task->type;
Expand Down Expand Up @@ -226,7 +245,6 @@ sub _calculate_tasks {
my $msg = sprintf "%s requires perl %s, but you have only %s",
$dist->distvname, $req->{version_range}, $self->{target_perl} || $];
$self->{logger}->log($msg);
App::cpm::Logger->log(result => "FAIL", message => $msg);
$self->{_fail_install}{$dist->distfile}++;
}
}
Expand Down Expand Up @@ -264,7 +282,6 @@ sub _calculate_tasks {
my $msg = sprintf "%s requires perl %s, but you have only %s",
$dist->distvname, $req->{version_range}, $self->{target_perl} || $];
$self->{logger}->log($msg);
App::cpm::Logger->log(result => "FAIL", message => $msg);
$self->{_fail_install}{$dist->distfile}++;
}
}
Expand Down Expand Up @@ -330,14 +347,7 @@ sub is_core {
my $target_perl = $self->{target_perl};
if (exists $Module::CoreList::version{$target_perl}{$package}) {
if (!exists $Module::CoreList::version{$]}{$package}) {
if (!$self->{_removed_core}{$package}++) {
my $t = App::cpm::version->parse($target_perl)->normal;
my $v = App::cpm::version->parse($])->normal;
App::cpm::Logger->log(
result => "WARN",
message => "$package used to be core in $t, but not in $v, so will be installed",
);
}
# $package used to be core in $target_perl, but not in $], so will be installed
return;
}
return 1 unless $version_range;
Expand All @@ -363,7 +373,19 @@ sub is_satisfied {
}
next if $self->{target_perl} and $self->is_core($package, $version_range);
next if $self->is_installed($package, $version_range);
my ($resolved) = grep { $_->providing($package, $version_range) } @distributions;

my $resolved;
for my $dist (@distributions) {
my ($ok, $err) = $dist->providing($package, $version_range);
if ($ok) {
$resolved = $dist;
last;
}
if ($err) {
$self->{logger}->log($err);
last;
}
}
next if $resolved && $resolved->installed;

$is_satisfied = 0 if defined $is_satisfied;
Expand Down Expand Up @@ -397,11 +419,6 @@ sub _register_resolve_result {
if ($task->{distfile} and $task->{distfile} =~ m{/perl-5[^/]+$}) {
my $message = "$task->{package} is a core module.";
$self->{logger}->log($message);
App::cpm::Logger->log(
result => "DONE",
type => "install",
message => $message,
);
return;
}

Expand All @@ -415,11 +432,6 @@ sub _register_resolve_result {
: " is up to date. ($local)"
);
$self->{logger}->log($message);
App::cpm::Logger->log(
result => "DONE",
type => "install",
message => $message,
);
return;
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/App/cpm/Task.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use CPAN::DistnameInfo;

sub new {
my ($class, %option) = @_;
my $self = bless {%option}, $class;
my $self = bless {in_charge => 0, %option}, $class;
$self->{uid} = $self->_uid;
$self;
}
Expand Down