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 6ed0cb212d6d790d5b9c4d8ea142b3052f5379c4..c494fa22679add475dd98f7d698ead5a8c98a30d 100644 (file)
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -12,9 +12,9 @@ use warnings;
 use POSIX qw(strftime);
 use Digest::SHA qw(sha1_hex);
 use PublicInbox::Address;
-use PublicInbox::MID qw(mids);
 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 {}
@@ -27,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
@@ -93,7 +103,7 @@ 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
@@ -102,7 +112,7 @@ sub feed_entry {
        my $ctx = $self->{ctx};
        my $eml = $ctx->{-inbox}->smsg_eml($smsg) or return '';
        my $hdr = $eml->header_obj;
-       my $mid = $smsg->{mid} // mids($hdr)->[0];
+       my $mid = $smsg->{mid};
        my $irt = PublicInbox::View::in_reply_to($hdr);
        my $uuid = to_uuid($mid);
        my $base = $ctx->{feed_base_url};
@@ -115,9 +125,7 @@ sub feed_entry {
                $irt = '';
        }
        my $href = $base . mid_href($mid) . '/';
-       my $t = msg_timestamp($hdr);
-       my @t = gmtime(defined $t ? $t : time);
-       my $updated = feed_updated(@t);
+       my $updated = feed_updated(msg_timestamp($hdr));
 
        my $title = $hdr->header('Subject');
        $title = '(no subject)' unless defined $title && $title ne '';
@@ -148,7 +156,7 @@ sub feed_entry {
 }
 
 sub feed_updated {
-       '<updated>' . strftime('%Y-%m-%dT%H:%M:%SZ', @_) . '</updated>';
+       '<updated>' . strftime('%Y-%m-%dT%H:%M:%SZ', gmtime(@_)) . '</updated>';
 }
 
 1;