treewide: replace {-inbox} with {ibx} for consistency

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

diff --git a/lib/PublicInbox/MboxGz.pm b/lib/PublicInbox/MboxGz.pm
index 535ef96c9eb448237a7170813a01648d61212f33..ab3c9770e994905eeb4fed04429267411c76242c 100644 (file)
--- a/lib/PublicInbox/MboxGz.pm
+++ b/lib/PublicInbox/MboxGz.pm
@@ -6,44 +6,46 @@ use parent 'PublicInbox::GzipFilter';
 use PublicInbox::Eml;
 use PublicInbox::Hval qw/to_filename/;
 use PublicInbox::Mbox;
+*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});
-       bless {
-               gz => PublicInbox::GzipFilter::gzip_or_die(),
-               cb => $cb,
-               ctx => $ctx
-       }, $class;
+sub async_next ($) {
+       my ($http) = @_; # PublicInbox::HTTP
+       my $ctx = $http->{forward} or return;
+       eval {
+               $ctx->{smsg} = $ctx->{cb}->($ctx) or return $ctx->close;
+               $ctx->smsg_blob($ctx->{smsg});
+       };
+       warn "E: $@" if $@;
 }
 
-sub response {
-       my ($class, $ctx, $cb, $fn) = @_;
-       my $body = $class->new($ctx, $cb);
+sub mbox_gz {
+       my ($self, $cb, $fn) = @_;
+       $self->{cb} = $cb;
+       $self->{base_url} = $self->{ibx}->base_url($self->{env});
+       $self->{gz} = PublicInbox::GzipFilter::gzip_or_die();
+       $fn = to_filename($fn // '') // 'no-subject';
        # 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 ];
+       bless $self, __PACKAGE__;
+       my $res_hdr = [ 'Content-Type' => 'application/gzip',
+               'Content-Disposition' => "inline; filename=$fn.mbox.gz" ];
+       $self->psgi_response(200, $res_hdr);
 }
 
-# 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;
-       while (my $smsg = $self->{cb}->($ctx)) {
-               my $mref = $ctx->{-inbox}->msg_by_smsg($smsg) or next;
-               my $h = PublicInbox::Eml->new($mref)->header_obj;
-               $self->zmore(
-                       PublicInbox::Mbox::msg_hdr($ctx, $h, $smsg->{mid})
-               );
-               return $self->translate(PublicInbox::Mbox::msg_body($$mref));
+       my $cb = $self->{cb} or return;
+       while (my $smsg = $cb->($self)) {
+               my $eml = $self->{ibx}->smsg_eml($smsg) or next;
+               $self->zmore(msg_hdr($self, $eml, $smsg->{mid}));
+               return $self->translate(msg_body($eml));
        }
        # signal that we're done and can return undef next call:
-       delete $self->{ctx};
+       delete $self->{cb};
        $self->zflush;
 }
 
-sub close {} # noop
-
+no warnings 'once';
+*async_eml = \&PublicInbox::Mbox::async_eml;
 1;