view: simplify eml_entry callers further

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

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index b15fc3a09a1157f4937ef80d8ad91ba4a95df5a5..bf095a2cc8e3f7540e4baa66a792781956617431 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -11,9 +11,7 @@ use PublicInbox::Smsg; # this loads w/o Search::Xapian
 
 sub generate_i {
        my ($ctx) = @_;
-       while (my $smsg = shift @{$ctx->{msgs}}) {
-               return $smsg;
-       }
+       shift @{$ctx->{msgs}};
 }
 
 # main function
@@ -50,15 +48,14 @@ sub generate_html_index {
 }
 
 sub new_html_i {
-       my ($ctx) = @_;
-       return $ctx->html_top if exists $ctx->{-html_tip};
-       my $msgs = $ctx->{msgs};
-       while (my $smsg = shift @$msgs) {
-               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');
+       my ($ctx, $eml) = @_;
+       $ctx->zmore($ctx->html_top) if exists $ctx->{-html_tip};
+
+       $eml and return PublicInbox::View::eml_entry($ctx, $eml);
+       my $smsg = shift @{$ctx->{msgs}} or
+               $ctx->zmore(PublicInbox::View::pagination_footer(
+                                               $ctx, './new.html'));
+       $smsg;
 }
 
 sub new_html {
@@ -71,7 +68,7 @@ sub new_html {
        $ctx->{-html_tip} = '<pre>';
        $ctx->{-upfx} = '';
        $ctx->{-hr} = 1;
-       PublicInbox::WwwStream::response($ctx, 200, \&new_html_i);
+       PublicInbox::WwwStream::aresponse($ctx, 200, \&new_html_i);
 }
 
 # private subs