www_coderepo: allow searching one extindex|inbox

I'm not sure how to best make a UI for one coderepo to many
inboxes/extindices, yet; but at least allow a simple 1:1
mapping, for now.  This ensures /$CODEREPO/$OID/s/ can work
as effectively as /$INBOX/$OID/s/ when looking for emails
associated with a git commit.

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index a430cd5ccd2106d886bd7d8feda0b72acb8e7904..c27928deddb7f1a5df17f2efe358719a64e47aba 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -404,6 +404,11 @@ sub repo_objs {
                        push @repo_objs, $repo if $repo;
                }
                if (scalar @repo_objs) {
+                       require Scalar::Util;
+                       for (@repo_objs) {
+                               push @{$_->{-ibxs}}, $ibxish;
+                               Scalar::Util::weaken($_->{-ibxs}->[-1]);
+                       }
                        $ibxish->{-repo_objs} = \@repo_objs;
                } else {
                        delete $ibxish->{coderepo};

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 3532bb584236d4d466d12c234e338867699b5936..cb98d2ad5e29cbc017ddf65df293e9bbe1546d9f 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -205,7 +205,8 @@ sub base_url {
                $url .= '/' if $url !~ m!/\z!;
                return $url .= $self->{name} . '/';
        }
-       # called from a non-PSGI environment (e.g. NNTP/POP3):
+       # called from a non-PSGI environment or cross-inbox environment
+       # where multiple inboxes can have different domains
        my $url = $self->{url} // return undef;
        $url = $url->[0] // return undef;
        # expand protocol-relative URLs to HTTPS if we're

diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 6ada03e6fb1d5d4aa2a45a26a63676284d7cb165..72b79ab79cc9fc89d5c2c38ef3cf580082f63707 100644 (file)
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -25,7 +25,7 @@ use PublicInbox::ViewDiff qw(flush_diff uri_escape_path);
 use PublicInbox::View;
 use PublicInbox::Eml;
 use Text::Wrap qw(wrap);
-use PublicInbox::Hval qw(ascii_html to_filename);
+use PublicInbox::Hval qw(ascii_html to_filename prurl);
 my $hl = eval {
        require PublicInbox::HlMod;
        PublicInbox::HlMod->new;
@@ -152,6 +152,25 @@ sub show_commit_start { # ->psgi_qx callback
        }
 }
 
+sub ibx_url_for {
+       my ($ctx) = @_;
+       $ctx->{ibx} and return; # just fall back to $upfx
+       $ctx->{git} or return; # /$CODEREPO/$OID/s/ to (eidx|ibx)
+       if (my $ALL = $ctx->{www}->{pi_cfg}->ALL) {
+               $ALL->base_url // $ALL->base_url($ctx->{env});
+       } elsif (my $ibxs = $ctx->{git}->{-ibxs}) {
+               for my $ibx (@$ibxs) {
+                       if ($ibx->isrch) {
+                               return defined($ibx->{url}) ?
+                                       prurl($ctx->{env}, $ibx->{url}) :
+                                       "../../../$ibx->{name}/";
+                       }
+               }
+       } else {
+               undef;
+       }
+}
+
 sub cmt_finalize {
        my ($ctx) = @_;
        $ctx->{-linkify} //= PublicInbox::Linkify->new;
@@ -227,12 +246,16 @@ EOM
                        $q = wrap('', '', $q);
                        my $rows = ($q =~ tr/\n/\n/) + 1;
                        $q = ascii_html($q);
+                       my $ibx_url = ibx_url_for($ctx);
+                       my $alt = $ibx_url ? ' '.ascii_html($ibx_url) : '';
+                       $ibx_url = ascii_html($ibx_url) if defined $ibx_url;
+                       $ibx_url //= $upfx;
                        print $zfh <<EOM;
-<hr><form action=$upfx
+<hr><form action="$ibx_url"
 id=related><pre>find related emails, including ancestors/descendants/conflicts
 <textarea name=q cols=${\PublicInbox::View::COLS} rows=$rows>$q</textarea>
-<input type=submit value=search
-/>\t(<a href=${upfx}_/text/help/>help</a>)</pre></form>
+<input type=submit value="search$alt"
+/>\t(<a href="${ibx_url}_/text/help/">help</a>)</pre></form>
 EOM
                }
        }

diff --git a/lib/PublicInbox/WwwCoderepo.pm b/lib/PublicInbox/WwwCoderepo.pm
index 2184e89d14572e0012bd9a2b0490c7b4cf2a6e52..99df39ef9cb9d8ac971d31733c2ede0e90808ed8 100644 (file)
--- a/lib/PublicInbox/WwwCoderepo.pm
+++ b/lib/PublicInbox/WwwCoderepo.pm
@@ -35,6 +35,20 @@ sub prepare_coderepos {
                $k = substr($k, length('coderepo.'), -length('.dir'));
                $code_repos->{$k} //= $pi_cfg->fill_code_repo($k);
        }
+
+       # associate inboxes and extindices with coderepos for search:
+       for my $k (grep(/\Apublicinbox\.(?:.+)\.coderepo\z/, keys %$pi_cfg)) {
+               $k = substr($k, length('publicinbox.'), -length('.coderepo'));
+               my $ibx = $pi_cfg->lookup_name($k) // next;
+               $pi_cfg->repo_objs($ibx);
+               push @{$self->{-strong}}, $ibx; # strengthen {-ibxs} weakref
+       }
+       for my $k (grep(/\Aextindex\.(?:.+)\.coderepo\z/, keys %$pi_cfg)) {
+               $k = substr($k, length('extindex.'), -length('.coderepo'));
+               my $eidx = $pi_cfg->lookup_ei($k) // next;
+               $pi_cfg->repo_objs($eidx);
+               push @{$self->{-strong}}, $eidx; # strengthen {-ibxs} weakref
+       }
        while (my ($nick, $repo) = each %$code_repos) {
                $self->{"\0$nick"} = $repo;
        }