wwwatomstream: simplify feed_update callers

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

diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index 83984d37e1813525f621a72afe9a09dc67079706..c494fa22679add475dd98f7d698ead5a8c98a30d 100644 (file)
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Atom body stream for which yields getline+close methods
@@ -12,34 +12,43 @@ use warnings;
 use POSIX qw(strftime);
 use Digest::SHA qw(sha1_hex);
 use PublicInbox::Address;
-use PublicInbox::Hval qw(ascii_html);
-use PublicInbox::MID qw/mid_clean mid_escape/;
+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 {}
 
 sub new {
        my ($class, $ctx, $cb) = @_;
-       $ctx->{emit_header} = 1;
        $ctx->{feed_base_url} = $ctx->{-inbox}->base_url($ctx->{env});
-       bless { cb => $cb || *close, ctx => $ctx }, $class;
+       bless { cb => $cb || \&close, ctx => $ctx, emit_header => 1 }, $class;
 }
 
 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->();
-               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
@@ -71,7 +80,7 @@ sub atom_header {
        my $mid = $ctx->{mid};
        my $page_id;
        if (defined $mid) { # per-thread
-               $self_url .= mid_escape($mid).'/t.atom';
+               $self_url .= mid_href($mid).'/t.atom';
                $page_id = to_uuid("t\n".$mid)
        } elsif (defined $search_q) {
                my $query = $search_q->{'q'};
@@ -94,31 +103,29 @@ sub atom_header {
                qq(\nhref="$base_url"/>) .
        qq(<link\nrel="self"\nhref="$self_url"/>) .
        qq(<id>$page_id</id>) .
-       feed_updated(gmtime($mtime));
+       feed_updated($mtime);
 }
 
 # returns undef or string
 sub feed_entry {
        my ($self, $smsg) = @_;
        my $ctx = $self->{ctx};
-       my $mime = $smsg->{mime};
-       my $hdr = $mime->header_obj;
-       my $mid = $smsg->mid;
+       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};
        if (defined $irt) {
                my $irt_uuid = to_uuid($irt);
-               $irt = mid_escape($irt);
+               $irt = mid_href($irt);
                $irt = qq(<thr:in-reply-to\nref="$irt_uuid"\n).
                        qq(href="$base$irt/"/>);
        } else {
                $irt = '';
        }
-       my $href = $base . mid_escape($mid) . '/';
-       my $t = msg_timestamp($hdr);
-       my @t = gmtime(defined $t ? $t : time);
-       my $updated = feed_updated(@t);
+       my $href = $base . mid_href($mid) . '/';
+       my $updated = feed_updated(msg_timestamp($hdr));
 
        my $title = $hdr->header('Subject');
        $title = '(no subject)' unless defined $title && $title ne '';
@@ -131,7 +138,7 @@ sub feed_entry {
        $email = ascii_html($email);
 
        my $s = '';
-       if (delete $ctx->{emit_header}) {
+       if (delete $self->{emit_header}) {
                $s .= atom_header($ctx, $title);
        }
        $s .= "<entry><author><name>$name</name><email>$email</email>" .
@@ -140,13 +147,16 @@ sub feed_entry {
                "<id>$uuid</id>$irt" .
                qq{<content\ntype="xhtml">} .
                qq{<div\nxmlns="http://www.w3.org/1999/xhtml">} .
-               qq(<pre\nstyle="white-space:pre-wrap">) .
-               PublicInbox::View::multipart_text_as_html($mime, $href, $ctx) .
-               '</pre></div></content></entry>';
+               qq(<pre\nstyle="white-space:pre-wrap">);
+       $ctx->{obuf} = \$s;
+       $ctx->{mhref} = $href;
+       PublicInbox::View::multipart_text_as_html($eml, $ctx);
+       delete $ctx->{obuf};
+       $s .= '</pre></div></content></entry>';
 }
 
 sub feed_updated {
-       '<updated>' . strftime('%Y-%m-%dT%H:%M:%SZ', @_) . '</updated>';
+       '<updated>' . strftime('%Y-%m-%dT%H:%M:%SZ', gmtime(@_)) . '</updated>';
 }
 
 1;