hval: export prurl and add prototype

[public-inbox.git] / lib / PublicInbox / WwwListing.pm

diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index 03534f03e670c6b92e5da18ab4975984fe88a6ed..a52dba110c359fa988e4781657d2be81d7fe6d0c 100644 (file)
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -6,38 +6,46 @@
 package PublicInbox::WwwListing;
 use strict;
 use warnings;
-use PublicInbox::Hval qw(ascii_html);
+use PublicInbox::Hval qw(ascii_html prurl);
 use PublicInbox::Linkify;
 use PublicInbox::View;
+use PublicInbox::Inbox;
 use bytes ();
 use HTTP::Date qw(time2str);
 require Digest::SHA;
 require File::Spec;
-{ no warnings 'once'; *try_cat = *PublicInbox::Inbox::try_cat };
+*try_cat = \&PublicInbox::Inbox::try_cat;
+
+sub list_all_i {
+       my ($ibx, $arg) = @_;
+       my ($list, $hide_key) = @$arg;
+       push @$list, $ibx unless $ibx->{-hide}->{$hide_key};
+}
 
 sub list_all ($$$) {
        my ($self, $env, $hide_key) = @_;
-       my @list;
-       $self->{pi_config}->each_inbox(sub {
-               my ($ibx) = @_;
-               push @list, $ibx unless $ibx->{-hide}->{$hide_key};
-       });
-       \@list;
+       my $list = [];
+       $self->{pi_config}->each_inbox(\&list_all_i, [ $list, $hide_key ]);
+       $list;
+}
+
+sub list_match_domain_i {
+       my ($ibx, $arg) = @_;
+       my ($list, $hide_key, $re) = @$arg;
+       if (!$ibx->{-hide}->{$hide_key} && grep($re, @{$ibx->{url}})) {
+               push @$list, $ibx;
+       }
 }
 
 sub list_match_domain ($$$) {
        my ($self, $env, $hide_key) = @_;
-       my @list;
+       my $list = [];
        my $host = $env->{HTTP_HOST} // $env->{SERVER_NAME};
        $host =~ s/:[0-9]+\z//;
-       my $re = qr!\A(?:https?:)?//\Q$host\E(?::[0-9]+)?/!i;
-       $self->{pi_config}->each_inbox(sub {
-               my ($ibx) = @_;
-               if (!$ibx->{-hide}->{$hide_key} && $ibx->{url} =~ $re) {
-                       push @list, $ibx;
-               }
-       });
-       \@list;
+       my $arg = [ $list, $hide_key,
+               qr!\A(?:https?:)?//\Q$host\E(?::[0-9]+)?/!i ];
+       $self->{pi_config}->each_inbox(\&list_match_domain_i, $arg);
+       $list;
 }
 
 sub list_404 ($$) { [] }
@@ -76,13 +84,13 @@ sub new {
 sub ibx_entry {
        my ($mtime, $ibx, $env) = @_;
        my $ts = PublicInbox::View::fmt_ts($mtime);
-       my $url = PublicInbox::Hval::prurl($env, $ibx->{url});
+       my $url = prurl($env, $ibx->{url});
        my $tmp = <<"";
 * $ts - $url
   ${\$ibx->description}
 
-       if (defined(my $info_url = $ibx->{info_url})) {
-               $tmp .= "\n$info_url";
+       if (defined(my $info_url = $ibx->{infourl})) {
+               $tmp .= '  ' . prurl($env, $info_url) . "\n";
        }
        $tmp;
 }
@@ -126,7 +134,9 @@ sub _json () {
 
 sub fingerprint ($) {
        my ($git) = @_;
-       my $fh = $git->popen('show-ref') or
+       # TODO: convert to qspawn for fairness when there's
+       # thousands of repos
+       my ($fh, $pid) = $git->popen('show-ref') or
                die "popen($git->{git_dir} show-ref) failed: $!";
 
        my $dig = Digest::SHA->new(1);
@@ -134,6 +144,7 @@ sub fingerprint ($) {
                $dig->add($buf);
        }
        close $fh;
+       waitpid($pid, 0);
        return if $?; # empty, uninitialized git repo
        $dig->hexdigest;
 }