X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFeed.pm;h=cbdf5db99f8b8486e8a14caff84259c63e560fd9;hb=68f9da93b11412122fff6e6154a42ecabcdbada0;hp=ae69af368e4d38cc111e51a37ee1dcc1fd62997e;hpb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;p=public-inbox.git

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index ae69af36..cbdf5db9 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -5,16 +5,13 @@
 package PublicInbox::Feed;
 use strict;
 use warnings;
-use PublicInbox::MIME;
 use PublicInbox::View;
 use PublicInbox::WwwAtomStream;
-use PublicInbox::SearchMsg; # this loads w/o Search::Xapian
+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;
-	}
+	shift @{$ctx->{msgs}};
 }
 
 # main function
@@ -51,14 +48,14 @@ sub generate_html_index {
 }
 
 sub new_html_i {
-	my ($nr, $ctx) = @_;
-	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);
-	}
-	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
@@ -84,15 +81,10 @@ sub recent_msgs {
 	my ($ctx) = @_;
 	my $ibx = $ctx->{-inbox};
 	my $max = $ibx->{feedmax};
-	my $qp = $ctx->{qp};
-	my $v = $ibx->version;
-	if ($v > 2) {
-		die "BUG: unsupported inbox version: $v\n";
-	}
-	if ($ibx->over) {
-		return PublicInbox::View::paginate_recent($ctx, $max);
-	}
+	return PublicInbox::View::paginate_recent($ctx, $max) if $ibx->over;
 
+	# only for rare v1 inboxes which aren't indexed at all
+	my $qp = $ctx->{qp};
 	my $hex = '[a-f0-9]';
 	my $addmsg = qr!^:000000 100644 \S+ (\S+) A\t${hex}{2}/${hex}{38}$!;
 	my $delmsg = qr!^:100644 000000 (\S+) \S+ D\t(${hex}{2}/${hex}{38})$!;
@@ -141,8 +133,11 @@ sub recent_msgs {
 		}
 	}
 
-	$ctx->{next_page} = "r=$last_commit" if $last_commit;
-	[ map { bless {blob => $_ }, 'PublicInbox::SearchMsg' } @oids ];
+	$last_commit and
+		$ctx->{next_page} = qq[<a\nhref="?r=$last_commit"\nrel=next>] .
+					'next (older)</a>';
+
+	[ map { bless {blob => $_ }, 'PublicInbox::Smsg' } @oids ];
 }
 
 1;