imap+nntp: share COMPRESS implementation

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

diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index ead8c2b45fe1fd8e1791227b13872f480e2560aa..3cbc363b9d113b4b811af9d1acc121e03ad9f5cd 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-2021 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"
@@ -15,10 +15,9 @@
 
 package PublicInbox::ViewVCS;
 use strict;
-use warnings;
-use bytes (); # only for bytes::length
+use v5.10.1;
 use PublicInbox::SolverGit;
-use PublicInbox::WwwStream;
+use PublicInbox::WwwStream qw(html_oneshot);
 use PublicInbox::Linkify;
 use PublicInbox::Tmpfile;
 use PublicInbox::Hval qw(ascii_html to_filename);
@@ -27,21 +26,15 @@ my $hl = eval {
        PublicInbox::HlMod->new;
 };
 
-my %QP_MAP = ( A => 'oid_a', B => 'oid_b', a => 'path_a', b => 'path_b' );
+my %QP_MAP = ( A => 'oid_a', 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->{rv}} : undef;
-}
-
 sub html_page ($$$) {
        my ($ctx, $code, $strref) = @_;
        my $wcb = delete $ctx->{-wcb};
        $ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/"
-       $ctx->{rv} = $strref;
-       my $res = PublicInbox::WwwStream->response($ctx, $code, \&html_i);
+       my $res = html_oneshot($ctx, $code, $strref);
        $wcb ? $wcb->($res) : $res;
 }
 
@@ -55,15 +48,16 @@ sub stream_blob_parse_hdr { # {parse_hdr} for Qspawn
        } elsif (index($$bref, "\0") >= 0) {
                [200, [qw(Content-Type application/octet-stream), @cl] ];
        } else {
-               my $n = bytes::length($$bref);
+               my $n = length($$bref);
                if ($n >= $BIN_DETECT || $n == $size) {
                        return [200, [ 'Content-Type',
                                'text/plain; charset=UTF-8', @cl ] ];
                }
                if ($r == 0) {
-                       warn "premature EOF on $oid $$logref\n";
+                       warn "premature EOF on $oid $$logref";
                        return html_page($ctx, 500, $logref);
                }
+               @$ctx{qw(-res -logref)} = ($res, $logref);
                undef; # bref keeps growing
        }
 }
@@ -90,8 +84,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);
 }
@@ -118,23 +111,22 @@ sub solve_result {
        my ($log, $hints, $fn) = delete @$ctx{qw(log hints fn)};
 
        unless (seek($log, 0, 0)) {
-               $ctx->{env}->{'psgi.errors'}->print("seek(log): $!\n");
+               warn "seek(log): $!";
                return html_page($ctx, 500, \'seek error');
        }
        $log = do { local $/; <$log> };
 
        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);
 
        my ($git, $oid, $type, $size, $di) = @$res;
        return show_other($ctx, $res, \$log, $fn) if $type ne 'blob';
-       my $path = to_filename($di->{path_b} || $hints->{path_b} || 'blob');
+       my $path = to_filename($di->{path_b} // $hints->{path_b} // 'blob');
        my $raw_link = "(<a\nhref=$path>raw</a>)";
        if ($size > $MAX_SIZE) {
                return stream_large_blob($ctx, $res, \$log, $fn) if defined $fn;
@@ -146,7 +138,7 @@ sub solve_result {
        my $blob = $git->cat_file($oid);
        if (!$blob) { # WTF?
                my $e = "Failed to retrieve generated blob ($oid)";
-               $ctx->{env}->{'psgi.errors'}->print("$e ($git->{git_dir})\n");
+               warn "$e ($git->{git_dir})";
                $log = "<pre><b>$e</b></pre>" . $log;
                return html_page($ctx, 500, \$log);
        }
@@ -166,7 +158,7 @@ sub solve_result {
 
        # TODO: detect + convert to ensure validity
        utf8::decode($$blob);
-       my $nl = ($$blob =~ tr/\n/\n/);
+       my $nl = ($$blob =~ s/\r?\n/\n/sg);
        my $pad = length($nl);
 
        $l->linkify_1($$blob);
@@ -191,18 +183,20 @@ sub solve_result {
        html_page($ctx, 200, \$log);
 }
 
+# GET /$INBOX/$GIT_OBJECT_ID/s/
+# GET /$INBOX/$GIT_OBJECT_ID/s/$FILENAME
 sub show ($$;$) {
        my ($ctx, $oid_b, $fn) = @_;
        my $qp = $ctx->{qp};
        my $hints = $ctx->{hints} = {};
        while (my ($from, $to) = each %QP_MAP) {
                defined(my $v = $qp->{$from}) or next;
-               $hints->{$to} = $v;
+               $hints->{$to} = $v if $v ne '';
        }
 
-       $ctx->{'log'} = tmpfile("solve.$oid_b");
+       $ctx->{'log'} = tmpfile("solve.$oid_b") // die "tmpfile: $!";
        $ctx->{fn} = $fn;
-       my $solver = PublicInbox::SolverGit->new($ctx->{-inbox},
+       my $solver = PublicInbox::SolverGit->new($ctx->{ibx},
                                                \&solve_result, $ctx);
        # PSGI server will call this immediately and give us a callback (-wcb)
        sub {