diff options
Diffstat (limited to 'lib/PublicInbox/Feed.pm')
| -rw-r--r-- | lib/PublicInbox/Feed.pm | 79 |
1 files changed, 36 insertions, 43 deletions
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index ae69af36..225565f4 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -1,20 +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 PublicInbox::MIME; +use v5.10.1; use PublicInbox::View; use PublicInbox::WwwAtomStream; -use PublicInbox::SearchMsg; # this loads w/o Search::Xapian +use PublicInbox::Smsg; # this loads w/o 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 @@ -22,43 +19,42 @@ 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 { my ($ctx) = @_; # 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}; - if ($qp && !$qp->{r} && $ibx->over) { + !$ctx->{qp}->{r} && $ctx->{ibx}->over and return PublicInbox::View::index_topics($ctx); - } - my $env = $ctx->{env}; - my $url = $ibx->base_url($env) . 'new.html'; - my $qs = $env->{QUERY_STRING}; + my $url = $ctx->{ibx}->base_url($ctx->{env}) . 'new.html'; + my $qs = $ctx->{env}->{QUERY_STRING}; $url .= "?$qs" if $qs ne ''; [302, [ 'Location', $url, 'Content-Type', 'text/plain'], [ "Redirecting to $url\n" ] ]; } 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); + 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 { @@ -70,8 +66,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 @@ -82,25 +79,19 @@ sub _no_thread () { 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); - } + 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 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'; - my $r = $qp->{r} if $qp; + my $r = $ctx->{qp}->{r}; if ($r && ($r =~ /\A(?:$refhex\.\.)?$refhex\z/o)) { $range = $r; } @@ -116,13 +107,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; } @@ -134,15 +125,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::SearchMsg' } @oids ]; + $last_commit and + $ctx->{next_page} = qq[<a\nhref="?r=$last_commit"\nrel=next>] . + 'next (older)</a>'; + \@ret; } 1; |