X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFeed.pm;h=4dd584d3478a2e2371be75de2375ac50793fc489;hb=e3b57fe9f68e80fc85cff46ccec9246b670f1312;hp=cbf25d46cf9359052b926ca69a9277a6787085d7;hpb=65e3cc8f6cc73e45db827cbeee4ccecbf1502496;p=public-inbox.git

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index cbf25d46..4dd584d3 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -1,20 +1,17 @@
-# Copyright (C) 2013-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2013-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used for generating Atom feeds for web-accessible mailing list archives.
 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
@@ -27,7 +24,7 @@ sub generate {
 
 sub generate_thread_atom {
 	my ($ctx) = @_;
-	my $msgs = $ctx->{msgs} = $ctx->{-inbox}->over->get_thread($ctx->{mid});
+	my $msgs = $ctx->{msgs} = $ctx->{ibx}->over->get_thread($ctx->{mid});
 	return _no_thread() unless @$msgs;
 	PublicInbox::WwwAtomStream->response($ctx, 200, \&generate_i);
 }
@@ -37,7 +34,7 @@ sub generate_html_index {
 	# if the 'r' query parameter is given, it is a legacy permalink
 	# which we must continue supporting:
 	my $qp = $ctx->{qp};
-	my $ibx = $ctx->{-inbox};
+	my $ibx = $ctx->{ibx};
 	if ($qp && !$qp->{r} && $ibx->over) {
 		return PublicInbox::View::index_topics($ctx);
 	}
@@ -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
@@ -82,21 +79,16 @@ sub _no_thread () {
 
 sub recent_msgs {
 	my ($ctx) = @_;
-	my $ibx = $ctx->{-inbox};
+	my $ibx = $ctx->{ibx};
 	my $max = $ibx->{feedmax};
-	my $qp = $ctx->{qp};
-	my $v = $ibx->{version} || 1;
-	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})$!;
-	my $refhex = qr/(?:HEAD|${hex}{4,40})(?:~[0-9]+)?/;
+	my $refhex = qr/(?:HEAD|${hex}{4,})(?:~[0-9]+)?/;
 
 	# revision ranges may be specified
 	my $range = 'HEAD';
@@ -134,15 +126,18 @@ sub recent_msgs {
 	if ($last) {
 		local $/ = "\n";
 		while (my $line = <$log>) {
-			if ($line =~ /^(${hex}{7,40})/) {
+			if ($line =~ /^(${hex}{7,})/) {
 				$last_commit = $1;
 				last;
 			}
 		}
 	}
 
-	$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;