X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMboxGz.pm;h=8c9010afb549c5ceebe7f4bba78a13a5d4e13e03;hb=c86657e655936d59cab8a88ef1fc1e986c5fb3f0;hp=30074e4dc2a73c7b50e28a9253d6fc53d125f9a6;hpb=31cb75037a757c9388f74283a8b1ecb7c5b65f24;p=public-inbox.git
diff --git a/lib/PublicInbox/MboxGz.pm b/lib/PublicInbox/MboxGz.pm
index 30074e4d..8c9010af 100644
--- a/lib/PublicInbox/MboxGz.pm
+++ b/lib/PublicInbox/MboxGz.pm
@@ -1,68 +1,100 @@
-# Copyright (C) 2015-2019 all contributors
+# Copyright (C) 2015-2020 all contributors
# License: AGPL-3.0+
package PublicInbox::MboxGz;
use strict;
-use warnings;
-use Email::Simple;
+use parent 'PublicInbox::GzipFilter';
+use PublicInbox::Eml;
use PublicInbox::Hval qw/to_filename/;
use PublicInbox::Mbox;
-use Compress::Raw::Zlib qw(Z_FINISH Z_OK);
-my %OPT = (-WindowBits => 15 + 16, -AppendOutput => 1);
+use PublicInbox::GitAsyncCat;
+*msg_hdr = \&PublicInbox::Mbox::msg_hdr;
+*msg_body = \&PublicInbox::Mbox::msg_body;
sub new {
my ($class, $ctx, $cb) = @_;
$ctx->{base_url} = $ctx->{-inbox}->base_url($ctx->{env});
- my ($gz, $err) = Compress::Raw::Zlib::Deflate->new(%OPT);
- $err == Z_OK or die "Deflate->new failed: $err";
- bless { gz => $gz, cb => $cb, ctx => $ctx }, $class;
+ bless {
+ gz => PublicInbox::GzipFilter::gzip_or_die(),
+ cb => $cb,
+ ctx => $ctx
+ }, $class;
}
+# this is public-inbox-httpd-specific
+sub mboxgz_blob_cb { # git->cat_async callback
+ my ($bref, $oid, $type, $size, $self) = @_;
+ my $http = $self->{ctx}->{env}->{'psgix.io'} or return; # client abort
+ my $smsg = delete $self->{smsg} or die 'BUG: no smsg';
+ if (!defined($oid)) {
+ # it's possible to have TOCTOU if an admin runs
+ # public-inbox-(edit|purge), just move onto the next message
+ return $http->next_step(\&async_next);
+ } else {
+ $smsg->{blob} eq $oid or die "BUG: $smsg->{blob} != $oid";
+ }
+ $self->zmore(msg_hdr($self->{ctx},
+ PublicInbox::Eml->new($bref)->header_obj,
+ $smsg->{mid}));
+
+ # PublicInbox::HTTP::{Chunked,Identity}::write
+ $self->{http_out}->write($self->translate(msg_body($$bref)));
+
+ $http->next_step(\&async_next);
+}
+
+# this is public-inbox-httpd-specific
+sub async_step ($) {
+ my ($self) = @_;
+ if (my $smsg = $self->{smsg} = $self->{cb}->($self->{ctx})) {
+ git_async_cat($self->{ctx}->{-inbox}->git, $smsg->{blob},
+ \&mboxgz_blob_cb, $self);
+ } elsif (my $out = delete $self->{http_out}) {
+ $out->write($self->zflush);
+ $out->close;
+ }
+}
+
+# called by PublicInbox::DS::write
+sub async_next {
+ my ($http) = @_; # PublicInbox::HTTP
+ async_step($http->{forward});
+}
+
+# called by PublicInbox::HTTP::close, or any other PSGI server
+sub close { !!delete($_[0]->{http_out}) }
+
sub response {
my ($class, $ctx, $cb, $fn) = @_;
- my $body = $class->new($ctx, $cb);
+ my $self = $class->new($ctx, $cb);
# http://www.iana.org/assignments/media-types/application/gzip
$fn = defined($fn) && $fn ne '' ? to_filename($fn) : 'no-subject';
my $h = [ qw(Content-Type application/gzip),
'Content-Disposition', "inline; filename=$fn.mbox.gz" ];
- [ 200, $h, $body ];
-}
-
-sub gzip_fail ($$) {
- my ($ctx, $err) = @_;
- $ctx->{env}->{'psgi.errors'}->print("deflate failed: $err\n");
- '';
+ if ($ctx->{env}->{'pi-httpd.async'}) {
+ sub {
+ my ($wcb) = @_; # -httpd provided write callback
+ $self->{http_out} = $wcb->([200, $h]);
+ $self->{ctx}->{env}->{'psgix.io'}->{forward} = $self;
+ async_step($self); # start stepping
+ };
+ } else { # generic PSGI
+ [ 200, $h, $self ];
+ }
}
-# called by Plack::Util::foreach or similar
+# called by Plack::Util::foreach or similar (generic PSGI)
sub getline {
my ($self) = @_;
my $ctx = $self->{ctx} or return;
- my $gz = $self->{gz};
- my $buf = delete($self->{buf});
while (my $smsg = $self->{cb}->($ctx)) {
my $mref = $ctx->{-inbox}->msg_by_smsg($smsg) or next;
- my $h = Email::Simple->new($mref)->header_obj;
-
- my $err = $gz->deflate(
- PublicInbox::Mbox::msg_hdr($ctx, $h, $smsg->{mid}),
- $buf);
- return gzip_fail($ctx, $err) if $err != Z_OK;
-
- $err = $gz->deflate(PublicInbox::Mbox::msg_body($$mref), $buf);
- return gzip_fail($ctx, $err) if $err != Z_OK;
-
- return $buf if length($buf) >= 8192;
-
- # be fair to other clients on public-inbox-httpd:
- $self->{buf} = $buf;
- return '';
+ my $h = PublicInbox::Eml->new($mref)->header_obj;
+ $self->zmore(msg_hdr($ctx, $h, $smsg->{mid}));
+ return $self->translate(msg_body($$mref));
}
# signal that we're done and can return undef next call:
delete $self->{ctx};
- my $err = $gz->flush($buf, Z_FINISH);
- ($err == Z_OK) ? $buf : gzip_fail($ctx, $err);
+ $self->zflush;
}
-sub close {} # noop
-
1;