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 053848a8b49f2a51ad6f283648ce56a65881c825..3cbc363b9d113b4b811af9d1acc121e03ad9f5cd 100644 (file)
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2020 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,8 +15,7 @@
 
 package PublicInbox::ViewVCS;
 use strict;
-use warnings;
-use bytes (); # only for bytes::length
+use v5.10.1;
 use PublicInbox::SolverGit;
 use PublicInbox::WwwStream qw(html_oneshot);
 use PublicInbox::Linkify;
@@ -27,7 +26,7 @@ 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
 
@@ -49,13 +48,13 @@ 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);
@@ -112,7 +111,7 @@ 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> };
@@ -139,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);
        }
@@ -195,9 +194,9 @@ sub show ($$;$) {
                $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 {