X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFeed.pm;h=e0810420809e3eb8fce5216eff08e47c83a53add;hb=81ea7f0100f016ad8c66605b49230e876a1eb82d;hp=476d946f515d2882e881d61ab3c0117c38042721;hpb=bf8ea90e0db55666e558893bf00b703ddd211d45;p=public-inbox.git
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 476d946f..e0810420 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -1,10 +1,10 @@
-# Copyright (C) 2013-2020 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
#
# 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
@@ -24,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);
}
@@ -34,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,8 +51,10 @@ sub new_html_i {
my ($ctx, $eml) = @_;
$ctx->zmore($ctx->html_top) if exists $ctx->{-html_tip};
- $eml and return PublicInbox::View::eml_entry($ctx, $eml,
- scalar @{$ctx->{msgs}});
+ if ($eml) {
+ $ctx->{smsg}->populate($eml) if !$ctx->{ibx}->{over};
+ return PublicInbox::View::eml_entry($ctx, $eml);
+ }
my $smsg = shift @{$ctx->{msgs}} or
$ctx->zmore(PublicInbox::View::pagination_footer(
$ctx, './new.html'));
@@ -80,8 +82,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
@@ -89,7 +91,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';
@@ -109,13 +111,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;
}
@@ -127,15 +129,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[] .
+ 'next (older)';
+ \@ret;
}
1;