wwwatomstream: convert callers to use smsg_eml

We can simplify WwwAtomStream callbacks by performing ->smsg_eml
calls in the `feed_entry' sub itself.  This simplifies callers,
by reducing the number of places which can load an Eml object
into memory.

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index e64628be830a34675b4c0c01462ec615af045329..b770a35077c2f0194db5472a55756f59433a4169 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -12,7 +12,7 @@ use PublicInbox::Smsg; # this loads w/o Search::Xapian
 sub generate_i {
        my ($ctx) = @_;
        while (my $smsg = shift @{$ctx->{msgs}}) {
-               $ctx->{-inbox}->smsg_mime($smsg) and return $smsg;
+               return $smsg;
        }
 }
 

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 4336e4d9b2d83ed289521450b0e958e0b1f762d0..249cf53926df75eb6ec22aa91ca1525b62c7803f 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -340,7 +340,7 @@ sub adump_i {
                my $smsg = eval {
                        PublicInbox::Smsg::from_mitem($mi, $ctx->{srch});
                } or next;
-               $ctx->{-inbox}->smsg_mime($smsg) and return $smsg;
+               return $smsg;
        }
 }
 

diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index c3fbb1a7cef589479f55860474390a7a3b3e5687..6ed0cb212d6d790d5b9c4d8ea142b3052f5379c4 100644 (file)
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -12,6 +12,7 @@ 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);
 
@@ -99,9 +100,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} // mids($hdr)->[0];
        my $irt = PublicInbox::View::in_reply_to($hdr);
        my $uuid = to_uuid($mid);
        my $base = $ctx->{feed_base_url};
@@ -141,7 +142,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>';
 }