www*stream: gzip ->getline responses

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

diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index c3fbb1a7cef589479f55860474390a7a3b3e5687..c407e343fdac6afb614f3babbd02421f4b7331b6 100644 (file)
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -14,6 +14,7 @@ use Digest::SHA qw(sha1_hex);
 use PublicInbox::Address;
 use PublicInbox::Hval qw(ascii_html mid_href);
 use PublicInbox::MsgTime qw(msg_timestamp);
+use PublicInbox::GzipFilter qw(gzf_maybe);
 
 # called by PSGI server after getline:
 sub close {}
@@ -26,18 +27,28 @@ sub new {
 
 sub response {
        my ($class, $ctx, $code, $cb) = @_;
-       [ $code, [ 'Content-Type', 'application/atom+xml' ],
-         $class->new($ctx, $cb) ]
+       my $h = [ 'Content-Type' => 'application/atom+xml' ];
+       my $self = $class->new($ctx, $cb);
+       $self->{gzf} = gzf_maybe($h, $ctx->{env});
+       [ $code, $h, $self ]
 }
 
 # called once for each message by PSGI server
 sub getline {
        my ($self) = @_;
-       if (my $middle = $self->{cb}) {
-               my $smsg = $middle->($self->{ctx});
-               return feed_entry($self, $smsg) if $smsg;
-       }
-       delete $self->{cb} ? '</feed>' : undef;
+       my $buf = do {
+               if (my $middle = $self->{cb}) {
+                       my $smsg = $middle->($self->{ctx});
+                       feed_entry($self, $smsg) if $smsg;
+               }
+       } // (delete($self->{cb}) ? '</feed>' : undef);
+
+       # gzf may be GzipFilter, `undef' or `0'
+       my $gzf = $self->{gzf} or return $buf;
+
+       return $gzf->translate($buf) if defined $buf;
+       $self->{gzf} = 0; # next call to ->getline returns $buf (== undef)
+       $gzf->translate(undef);
 }
 
 # private
@@ -99,9 +110,9 @@ sub atom_header {
 sub feed_entry {
        my ($self, $smsg) = @_;
        my $ctx = $self->{ctx};
-       my $mid = $smsg->mid; # may extract Message-ID from {mime}
-       my $mime = delete $smsg->{mime};
-       my $hdr = $mime->header_obj;
+       my $eml = $ctx->{-inbox}->smsg_eml($smsg) or return '';
+       my $hdr = $eml->header_obj;
+       my $mid = $smsg->{mid};
        my $irt = PublicInbox::View::in_reply_to($hdr);
        my $uuid = to_uuid($mid);
        my $base = $ctx->{feed_base_url};
@@ -141,7 +152,7 @@ sub feed_entry {
                qq(<pre\nstyle="white-space:pre-wrap">);
        $ctx->{obuf} = \$s;
        $ctx->{mhref} = $href;
-       PublicInbox::View::multipart_text_as_html($mime, $ctx);
+       PublicInbox::View::multipart_text_as_html($eml, $ctx);
        delete $ctx->{obuf};
        $s .= '</pre></div></content></entry>';
 }