viewvcs: prepopulate search bar with dfpost + dfn

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

diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index e0fdf63999c20aaf7e3ce58442d1a12b3b3d15f2..51a7bcbcb43b81dd2062c662394972b2be3d2d1b 100644 (file)
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -125,6 +125,27 @@ sub cmt_title { # git->cat_async callback
                cmt_finalize($ctx);
 }
 
+sub do_cat_async {
+       my ($ctx, $cb, @req) = @_;
+       # favor git(1) over Gcf2 (libgit2) for SHA-256 support
+       $ctx->{git}->cat_async($_, $cb, $ctx) for @req;
+       if ($ctx->{env}->{'pi-httpd.async'}) {
+               PublicInbox::GitAsyncCat::watch_cat($ctx->{git});
+       } else { # synchronous, generic PSGI
+               $ctx->{git}->cat_async_wait;
+       }
+}
+
+sub do_check_async {
+       my ($ctx, $cb, @req) = @_;
+       if ($ctx->{env}->{'pi-httpd.async'}) {
+               async_check($ctx, $_, $cb, $ctx) for @req;
+       } else { # synchronous, generic PSGI
+               $ctx->{git}->check_async($_, $cb, $ctx) for @req;
+               $ctx->{git}->check_async_wait;
+       }
+}
+
 sub show_commit_start { # ->psgi_qx callback
        my ($bref, $ctx) = @_;
        if (my $qsp_err = delete $ctx->{-qsp_err}) {
@@ -142,16 +163,7 @@ sub show_commit_start { # ->psgi_qx callback
        return cmt_finalize($ctx) if !$P;
        @{$ctx->{-cmt_P}} = split(/ /, $P);
        @{$ctx->{-cmt_p}} = split(/ /, $p); # abbreviated
-       if ($ctx->{env}->{'pi-httpd.async'}) {
-               for (@{$ctx->{-cmt_P}}) {
-                       ibx_async_cat($ctx, $_, \&cmt_title, $ctx);
-               }
-       } else { # synchronous
-               for (@{$ctx->{-cmt_P}}) {
-                       $ctx->{git}->cat_async($_, \&cmt_title, $ctx);
-               }
-               $ctx->{git}->cat_async_wait;
-       }
+       do_cat_async($ctx, \&cmt_title, @{$ctx->{-cmt_P}});
 }
 
 sub ibx_url_for {
@@ -473,12 +485,7 @@ sub show_tag ($$) {
        my ($ctx, $res) = @_;
        my ($git, $oid) = @$res;
        $ctx->{git} = $git;
-       if ($ctx->{env}->{'pi-httpd.async'}) {
-               ibx_async_cat($ctx, $oid, \&show_tag_result, $ctx);
-       } else { # synchronous (generic PSGI)
-               $git->cat_async($oid, \&show_tag_result, $ctx);
-               $git->cat_async_wait;
-       }
+       do_cat_async($ctx, \&show_tag_result, $oid);
 }
 
 # user_cb for SolverGit, called as: user_cb->($result_or_error, $uarg)
@@ -493,11 +500,20 @@ sub solve_result {
        return show_tree($ctx, $res) if $type eq 'tree';
        return show_tag($ctx, $res) if $type eq 'tag';
        return show_other($ctx, $res) if $type ne 'blob';
+       my $fn = $di->{path_b} // $hints->{path_b};
        my $paths = $ctx->{-paths} //= do {
-               my $path = to_filename($di->{path_b}//$hints->{path_b}//'blob');
+               my $path = to_filename($fn // 'blob');
                my $raw_more = qq[(<a\nhref="$path">raw</a>)];
+
+               # XXX not sure if this is the correct wording
+               defined($fn) and $raw_more .=
+"\nname: ${\ascii_html($fn)} \t # note: path name is non-authoritative";
                [ $path, $raw_more ];
        };
+       $ctx->{-q_value_html} //= do {
+               my $s = defined($fn) ? 'dfn:'.ascii_html($fn).' ' : '';
+               $s.'dfpost:'.substr($oid, 0, 7);
+       };
 
        if ($size > $MAX_SIZE) {
                return stream_large_blob($ctx, $res) if defined $ctx->{fn};
@@ -508,12 +524,7 @@ EOM
        }
        bless $ctx, 'PublicInbox::WwwStream'; # for DESTROY
        $ctx->{git} = $git;
-       if ($ctx->{env}->{'pi-httpd.async'}) {
-               ibx_async_cat($ctx, $oid, \&show_blob, $ctx);
-       } else { # synchronous
-               $git->cat_async($oid, \&show_blob, $ctx);
-               $git->cat_async_wait;
-       }
+       do_cat_async($ctx, \&show_blob, $oid);
 }
 
 sub show_blob { # git->cat_async callback