treewide: run update-copyrights from gnulib for 2019

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

diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 7618b19831c9419b2425ec482eea1deccd7265ae..1379bd583cc5cd43427a0ef882e6d6eabc046676 100644 (file)
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # show any VCS object, similar to "git show"
@@ -31,14 +31,17 @@ my %QP_MAP = ( A => 'oid_a', B => 'oid_b', a => 'path_a', b => 'path_b' );
 our $MAX_SIZE = 1024 * 1024; # TODO: configurable
 my $BIN_DETECT = 8000; # same as git
 
+sub html_i { # WwwStream::getline callback
+       my ($nr, $ctx) =  @_;
+       $nr == 1 ? ${delete $ctx->{obuf}} : undef;
+}
+
 sub html_page ($$$) {
        my ($ctx, $code, $strref) = @_;
        my $wcb = delete $ctx->{-wcb};
        $ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/"
-       my $res = PublicInbox::WwwStream->response($ctx, $code, sub {
-               my ($nr, undef) =  @_;
-               $nr == 1 ? $$strref : undef;
-       });
+       $ctx->{obuf} = $strref;
+       my $res = PublicInbox::WwwStream->response($ctx, $code, \&html_i);
        $wcb ? $wcb->($res) : $res;
 }
 
@@ -87,8 +90,7 @@ sub show_other_result ($$) {
        }
        my $l = PublicInbox::Linkify->new;
        utf8::decode($$bref);
-       $l->linkify_1($$bref);
-       $$bref = '<pre>'. $l->linkify_2(ascii_html($$bref));
+       $$bref = '<pre>'. $l->to_html($$bref);
        $$bref .= '</pre><hr>' . $$logref;
        html_page($ctx, 200, $bref);
 }
@@ -109,8 +111,10 @@ sub show_other ($$$$) {
        $qsp->psgi_qx($env, undef, \&show_other_result, $ctx);
 }
 
+# user_cb for SolverGit, called as: user_cb->($result_or_error, $uarg)
 sub solve_result {
-       my ($ctx, $res, $log, $hints, $fn) = @_;
+       my ($res, $ctx) = @_;
+       my ($log, $hints, $fn) = delete @$ctx{qw(log hints fn)};
 
        unless (seek($log, 0, 0)) {
                $ctx->{env}->{'psgi.errors'}->print("seek(log): $!\n");
@@ -120,9 +124,8 @@ sub solve_result {
 
        my $ref = ref($res);
        my $l = PublicInbox::Linkify->new;
-       $l->linkify_1($log);
        $log = '<pre>debug log:</pre><hr /><pre>' .
-               $l->linkify_2(ascii_html($log)) . '</pre>';
+               $l->to_html($log) . '</pre>';
 
        $res or return html_page($ctx, 404, \$log);
        $ref eq 'ARRAY' or return html_page($ctx, 500, \$log);
@@ -189,21 +192,20 @@ sub solve_result {
 sub show ($$;$) {
        my ($ctx, $oid_b, $fn) = @_;
        my $qp = $ctx->{qp};
-       my $hints = {};
+       my $hints = $ctx->{hints} = {};
        while (my ($from, $to) = each %QP_MAP) {
                defined(my $v = $qp->{$from}) or next;
                $hints->{$to} = $v;
        }
 
-       my $log = tmpfile("solve.$oid_b");
-       my $solver = PublicInbox::SolverGit->new($ctx->{-inbox}, sub {
-               solve_result($ctx, $_[0], $log, $hints, $fn);
-       });
-
-       # PSGI server will call this and give us a callback
+       $ctx->{'log'} = tmpfile("solve.$oid_b");
+       $ctx->{fn} = $fn;
+       my $solver = PublicInbox::SolverGit->new($ctx->{-inbox},
+                                               \&solve_result, $ctx);
+       # PSGI server will call this immediately and give us a callback (-wcb)
        sub {
                $ctx->{-wcb} = $_[0]; # HTTP write callback
-               $solver->solve($ctx->{env}, $log, $oid_b, $hints);
+               $solver->solve($ctx->{env}, $ctx->{log}, $oid_b, $hints);
        };
 }