www_stream: coderepo-specific top bar

It gets nasty when multiple, non-ALL lists point to the same
coderepo, but I guess ALL exists for that.  Only lightly-tested
with various PSGI prefix mounts, but it seems to be working...

diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 6b641b327edda74e4c9ba73539daef7d34878258..7ac719bcaaa8d9e6e147f9c90bb52cdfc405ade1 100644 (file)
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -156,10 +156,14 @@ sub show_commit_start { # ->psgi_qx callback
 sub ibx_url_for {
        my ($ctx) = @_;
        $ctx->{ibx} and return; # fall back to $upfx
-       $ctx->{git} or return;
+       $ctx->{git} or die 'BUG: no {git}';
        if (my $ALL = $ctx->{www}->{pi_cfg}->ALL) {
-               return $ALL->base_url // $ALL->base_url($ctx->{env});
-       } elsif (my $ibx_names = $ctx->{git}->{ibx_names}) {
+               if (defined(my $u = $ALL->base_url($ctx->{env}))) {
+                       return wantarray ? ($u) : $u;
+               }
+       }
+       my @ret;
+       if (my $ibx_names = $ctx->{git}->{ibx_names}) {
                my $by_name = $ctx->{www}->{pi_cfg}->{-by_name};
                for my $name (@$ibx_names) {
                        my $ibx = $by_name->{$name} // do {
@@ -167,12 +171,13 @@ sub ibx_url_for {
                                next;
                        };
                        $ibx->isrch // next;
-                       return defined($ibx->{url}) ?
-                               prurl($ctx->{env}, $ibx->{url}) :
-                               "../../../$name/";
+                       my $u = defined($ibx->{url}) ?
+                               prurl($ctx->{env}, $ibx->{url}) : $name;
+                       $u .= '/' if substr($u, -1) ne '/';
+                       push @ret, $u;
                }
        }
-       undef;
+       wantarray ? (@ret) : $ret[0];
 }
 
 sub cmt_finalize {
@@ -253,8 +258,10 @@ EOM
                        my $ibx_url = ibx_url_for($ctx);
                        my $alt;
                        if (defined $ibx_url) {
+                               $alt = " `$ibx_url'";
+                               $ibx_url =~ m!://! or
+                                       substr($ibx_url, 0, 0, '../../../');
                                $ibx_url = ascii_html($ibx_url);
-                               $alt = ' '.$ibx_url;
                        } else {
                                $ibx_url = $upfx;
                                $alt = '';

diff --git a/lib/PublicInbox/WwwCoderepo.pm b/lib/PublicInbox/WwwCoderepo.pm
index e89a64565da7436a23f975259847b2b790271d7b..2fba0cd0be4571152b1e1f4fe49c068f2a22b499 100644 (file)
--- a/lib/PublicInbox/WwwCoderepo.pm
+++ b/lib/PublicInbox/WwwCoderepo.pm
@@ -79,14 +79,7 @@ sub summary_finish {
                $tip_html .= ' '.ascii_html($tip).' --';
        }
        print $zfh <<EOM;
-<pre>
-<a
-href='#readme'>about</a> <a
-href='#heads'>heads</a> <a
-href='#tags'>tags</a>
-
-<a
-id=log>\$</a> git log --pretty=format:'%h %s (%cs)%d'$tip_html
+<pre><a id=log>\$</a> git log --pretty=format:'%h %s (%cs)%d'$tip_html
 EOM
        for (@r) {
                my $d; # decorations

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 59edad5de5bd4238212b45f06c2b174f4e6ed7ae..8c40096afbdcc80f126fde73346f64e724a69745 100644 (file)
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -38,9 +38,60 @@ sub async_eml { # for async_blob_cb
        $ctx->write($ctx->{cb}->($ctx, $eml));
 }
 
+sub html_repo_top ($) {
+       my ($ctx) = @_;
+       my $git = $ctx->{git};
+       my $desc = ascii_html($git->description);
+       my $title = delete($ctx->{-title_html}) // $desc;
+       my $upfx = $ctx->{-upfx} // '';
+       my $atom = $ctx->{-atom} // (substr($upfx, -1) eq '/' ?
+                                       "${upfx}atom/" : "$upfx/atom/");
+       my $top = ascii_html($git->{nick});
+       $top = qq(<a\nhref="$upfx">$top</a>) if length($upfx);
+       $top .= <<EOM;
+  <a href='$upfx#readme'>about</a> / <a
+href='$upfx#heads'>heads</a> / <a
+href='$upfx#tags'>tags</a>
+<b>$desc</b>
+EOM
+       my @url = PublicInbox::ViewVCS::ibx_url_for($ctx);
+       if (@url) {
+               $ctx->{-has_srch} = 1;
+               my $base_url = base_url($ctx);
+               my ($pfx, $sfx) = ($base_url =~ m!\A(https?://[^/]+/)(.*)\z!i);
+               my $iupfx = '../' x (($sfx =~ tr!/!/!) + 1);
+               $pfx = ascii_html($pfx);
+               $pfx = qr/\A\Q$pfx\E/i;
+               my $tmp = $top;
+               $top = '';
+               my ($s, $u, $same_host);
+               my $q_val = delete($ctx->{-q_value_html}) // '';
+               $q_val = qq(\nvalue="$q_val") if $q_val ne '';
+               for (@url) {
+                       $u = $s = ascii_html($_);
+                       substr($u, 0, 0, $iupfx) if $u !~ m!://!;
+                       $s =~ s!$pfx!!;
+                       $s =~ s!/\z!!;
+                       $top .= qq{<form\naction="$u"><pre>$tmp} .
+                               qq{<input\nname=q type=text$q_val />} .
+                               qq{<input type=submit\n} .
+                               qq{value="search mail in `$s&#39;"/>} .
+                               q{</pre></form>};
+                       $tmp = '';
+               }
+       } else {
+               $top = "<pre>$top</pre>";
+       }
+       "<html><head><title>$title</title>" .
+               qq(<link\nrel=alternate\ntitle="Atom feed"\n).
+               qq(href="$atom"\ntype="application/atom+xml"/>) .
+               $ctx->{www}->style($upfx) .
+               '</head><body>'.$top;
+}
+
 sub html_top ($) {
        my ($ctx) = @_;
-       my $ibx = $ctx->{ibx} // $ctx->{git};
+       my $ibx = $ctx->{ibx} // return html_repo_top($ctx);
        my $desc = ascii_html($ibx->description);
        my $title = delete($ctx->{-title_html}) // $desc;
        my $upfx = $ctx->{-upfx} || '';