X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFeed.pm;h=de1e7dfeb584a5631acb8704d909b51ceedc2223;hb=refs%2Fheads%2Fmaster;hp=4c1056b4665dec330f69576f56bf345c847073df;hpb=7e782e8ff3ec64500913069a2efb5815fe711a36;p=public-inbox.git

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 4c1056b4..de1e7dfe 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -1,19 +1,17 @@
-# Copyright (C) 2013-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 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 v5.10.1;
 use PublicInbox::View;
 use PublicInbox::WwwAtomStream;
 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
@@ -21,14 +19,14 @@ sub generate {
 	my ($ctx) = @_;
 	my $msgs = $ctx->{msgs} = recent_msgs($ctx);
 	return _no_thread() unless @$msgs;
-	PublicInbox::WwwAtomStream->response($ctx, 200, \&generate_i);
+	PublicInbox::WwwAtomStream->response($ctx, \&generate_i);
 }
 
 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);
+	PublicInbox::WwwAtomStream->response($ctx, \&generate_i);
 }
 
 sub generate_html_index {
@@ -36,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);
 	}
@@ -50,14 +48,17 @@ sub generate_html_index {
 }
 
 sub new_html_i {
-	my ($nr, $ctx) = @_;
-	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);
+	my ($ctx, $eml) = @_;
+	print { $ctx->zfh } $ctx->html_top if exists $ctx->{-html_tip};
+
+	if ($eml) {
+		$ctx->{smsg}->populate($eml) if !$ctx->{ibx}->{over};
+		return PublicInbox::View::eml_entry($ctx, $eml);
 	}
-	PublicInbox::View::pagination_footer($ctx, './new.html');
+	my $smsg = shift @{$ctx->{msgs}} or
+		print { $ctx->zfh } PublicInbox::View::pagination_footer(
+						$ctx, './new.html');
+	$smsg;
 }
 
 sub new_html {
@@ -69,8 +70,9 @@ sub new_html {
 	}
 	$ctx->{-html_tip} = '<pre>';
 	$ctx->{-upfx} = '';
+	$ctx->{-spfx} = '' if $ctx->{ibx}->{coderepo};
 	$ctx->{-hr} = 1;
-	PublicInbox::WwwStream->response($ctx, 200, \&new_html_i);
+	PublicInbox::WwwStream::aresponse($ctx, \&new_html_i);
 }
 
 # private subs
@@ -81,8 +83,8 @@ sub _no_thread () {
 
 sub recent_msgs {
 	my ($ctx) = @_;
-	my $ibx = $ctx->{-inbox};
-	my $max = $ibx->{feedmax};
+	my $ibx = $ctx->{ibx};
+	my $max = $ibx->{feedmax} // 25;
 	return PublicInbox::View::paginate_recent($ctx, $max) if $ibx->over;
 
 	# only for rare v1 inboxes which aren't indexed at all
@@ -90,7 +92,7 @@ sub recent_msgs {
 	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';
@@ -110,13 +112,13 @@ sub recent_msgs {
 	my $last;
 	my $last_commit;
 	local $/ = "\n";
-	my @oids;
+	my @ret;
 	while (defined(my $line = <$log>)) {
 		if ($line =~ /$addmsg/o) {
 			my $add = $1;
 			next if $deleted{$add}; # optimization-only
-			push @oids, $add;
-			if (scalar(@oids) >= $max) {
+			push(@ret, bless { blob => $add }, 'PublicInbox::Smsg');
+			if (scalar(@ret) >= $max) {
 				$last = 1;
 				last;
 			}
@@ -128,15 +130,17 @@ 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::Smsg' } @oids ];
+	$last_commit and
+		$ctx->{next_page} = qq[<a\nhref="?r=$last_commit"\nrel=next>] .
+					'next (older)</a>';
+	\@ret;
 }
 
 1;