wwwstream: reduce blob fetch paths for ->getline

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

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 4cb295e60e4291f37b23137d78eaa688aacccb97..b15fc3a09a1157f4937ef80d8ad91ba4a95df5a5 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -5,7 +5,6 @@
 package PublicInbox::Feed;
 use strict;
 use warnings;
-use PublicInbox::MIME;
 use PublicInbox::View;
 use PublicInbox::WwwAtomStream;
 use PublicInbox::Smsg; # this loads w/o Search::Xapian
@@ -13,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;
        }
 }
 
@@ -51,12 +50,13 @@ sub generate_html_index {
 }
 
 sub new_html_i {
-       my ($nr, $ctx) = @_;
+       my ($ctx) = @_;
+       return $ctx->html_top if exists $ctx->{-html_tip};
        my $msgs = $ctx->{msgs};
        while (my $smsg = shift @$msgs) {
-               my $m = $ctx->{-inbox}->smsg_mime($smsg) or next;
-               my $more = scalar @$msgs;
-               return PublicInbox::View::index_entry($m, $ctx, $more);
+               my $eml = $ctx->{-inbox}->smsg_eml($smsg) or next;
+               return PublicInbox::View::eml_entry($ctx, $smsg, $eml,
+                                                       scalar @$msgs);
        }
        PublicInbox::View::pagination_footer($ctx, './new.html');
 }
@@ -71,7 +71,7 @@ sub new_html {
        $ctx->{-html_tip} = '<pre>';
        $ctx->{-upfx} = '';
        $ctx->{-hr} = 1;
-       PublicInbox::WwwStream->response($ctx, 200, \&new_html_i);
+       PublicInbox::WwwStream::response($ctx, 200, \&new_html_i);
 }
 
 # private subs