X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFeed.pm;h=0bd458c94e2bdd05564f386136d0ddacbfaca83f;hb=227a1d886672767e37cc86a3432952c14eb8a143;hp=3277b09c895bedadfb750e478a1ddfe93b6bd523;hpb=2eea27a1e97ce522e3e1e63499a2bf7e472d8ee9;p=public-inbox.git diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 3277b09c..0bd458c9 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2018 all contributors +# Copyright (C) 2013-2019 all contributors # License: AGPL-3.0+ # # Used for generating Atom feeds for web-accessible mailing list archives. @@ -8,40 +8,28 @@ use warnings; use PublicInbox::MIME; use PublicInbox::View; use PublicInbox::WwwAtomStream; +use PublicInbox::SearchMsg; # 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; + } +} # main function sub generate { my ($ctx) = @_; - my @oids; - each_recent_blob($ctx, sub { push @oids, $_[0] }); - return _no_thread() unless @oids; - - my $git = $ctx->{-inbox}->git; - PublicInbox::WwwAtomStream->response($ctx, 200, sub { - while (my $oid = shift @oids) { - my $msg = $git->cat_file($oid) or next; - return PublicInbox::MIME->new($msg); - } - }); + my $msgs = $ctx->{msgs} = recent_msgs($ctx); + return _no_thread() unless @$msgs; + PublicInbox::WwwAtomStream->response($ctx, 200, \&generate_i); } sub generate_thread_atom { my ($ctx) = @_; - my $mid = $ctx->{mid}; - my $res = $ctx->{srch}->get_thread($mid); - return _no_thread() unless $res->{total}; - - my $ibx = $ctx->{-inbox}; - my $html_url = $ibx->base_url($ctx->{env}); - $html_url .= PublicInbox::Hval->new_msgid($mid)->{href}; - $ctx->{-html_url} = $html_url; - my $msgs = $res->{msgs}; - PublicInbox::WwwAtomStream->response($ctx, 200, sub { - while (my $msg = shift @$msgs) { - $msg = $ibx->msg_by_smsg($msg) and - return PublicInbox::MIME->new($msg); - } - }); + my $msgs = $ctx->{msgs} = $ctx->{-inbox}->over->get_thread($ctx->{mid}); + return _no_thread() unless @$msgs; + PublicInbox::WwwAtomStream->response($ctx, 200, \&generate_i); } sub generate_html_index { @@ -49,44 +37,41 @@ 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}; - if ($qp && !$qp->{r} && $ctx->{srch}) { + my $ibx = $ctx->{-inbox}; + if ($qp && !$qp->{r} && $ibx->over) { return PublicInbox::View::index_topics($ctx); } my $env = $ctx->{env}; - my $url = $ctx->{-inbox}->base_url($env) . 'new.html'; + my $url = $ibx->base_url($env) . 'new.html'; my $qs = $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); + } + PublicInbox::View::pagination_footer($ctx, './new.html'); +} + sub new_html { my ($ctx) = @_; - die "BUG: new_html is not used with search" if $ctx->{srch}; - my @oids; - my (undef, $last) = each_recent_blob($ctx, sub { - my ($oid, $commit, $ts, $u, $subj) = @_; - $ctx->{first} ||= $commit; - push @oids, $oid; - }); - if (!@oids) { + my $msgs = $ctx->{msgs} = recent_msgs($ctx); + if (!@$msgs) { return [404, ['Content-Type', 'text/plain'], ["No messages, yet\n"] ]; } $ctx->{-html_tip} = '
';
 	$ctx->{-upfx} = '';
 	$ctx->{-hr} = 1;
-	my $git = $ctx->{-inbox}->git;
-	PublicInbox::WwwStream->response($ctx, 200, sub {
-		while (my $oid = shift @oids) {
-			my $msg = $git->cat_file($oid) or next;
-			my $m = PublicInbox::MIME->new($msg);
-			my $more = scalar @oids;
-			return PublicInbox::View::index_entry($m, $ctx, $more);
-		}
-		new_html_footer($ctx, $last);
-	});
+	PublicInbox::WwwStream->response($ctx, 200, \&new_html_i);
 }
 
 # private subs
@@ -95,46 +80,23 @@ sub _no_thread () {
 	[404, ['Content-Type', 'text/plain'], ["No feed found for thread\n"]];
 }
 
-sub new_html_footer {
-	my ($ctx, $last) = @_;
-	my $qp = delete $ctx->{qp} or return;
-	my $old_r = $qp->{r};
-	my $latest = '';
-	my $next = '    ';
-
-	if ($last) {
-		$next = qq!next!;
-	}
-	if ($old_r) {
-		$latest = qq! latest!;
-	}
-	"
page: $next$latest
"; -} - -sub each_recent_blob { - my ($ctx, $cb) = @_; +sub recent_msgs { + my ($ctx) = @_; my $ibx = $ctx->{-inbox}; my $max = $ibx->{feedmax}; - my $v = $ibx->{version} || 1; - if ($v == 2) { - wantarray and die "each_recent_blob return ignored for v2"; - } elsif ($v != 1) { + my $qp = $ctx->{qp}; + my $v = $ibx->version; + if ($v > 2) { die "BUG: unsupported inbox version: $v\n"; } - if (my $srch = $ibx->search) { - my $res = $srch->query('', { limit => $max }); - foreach my $smsg (@{$res->{msgs}}) { - # search-enabled callers do not need author/date/subject - $cb->($smsg->{blob}); - } - return; + if ($ibx->over) { + return PublicInbox::View::paginate_recent($ctx, $max); } 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})(?:~\d+)?/; - my $qp = $ctx->{qp}; + my $refhex = qr/(?:HEAD|${hex}{4,40})(?:~[0-9]+)?/; # revision ranges may be specified my $range = 'HEAD'; @@ -149,45 +111,38 @@ sub each_recent_blob { my $log = $ibx->git->popen(qw/log --no-notes --no-color --raw -r --no-abbrev --abbrev-commit/, - "--format=%h%x00%ct%x00%an%x00%s%x00", - $range); + "--format=%H", $range); my %deleted; # only an optimization at this point my $last; - my $nr = 0; - my ($cur_commit, $first_commit, $last_commit); - my ($ts, $subj, $u); + my $last_commit; local $/ = "\n"; + my @oids; while (defined(my $line = <$log>)) { if ($line =~ /$addmsg/o) { my $add = $1; next if $deleted{$add}; # optimization-only - $cb->($add, $cur_commit, $ts, $u, $subj) and $nr++; - if ($nr >= $max) { + push @oids, $add; + if (scalar(@oids) >= $max) { $last = 1; last; } } elsif ($line =~ /$delmsg/o) { $deleted{$1} = 1; - } elsif ($line =~ /^${hex}{7,40}/o) { - ($cur_commit, $ts, $u, $subj) = split("\0", $line); - unless (defined $first_commit) { - $first_commit = $cur_commit; - } } } if ($last) { local $/ = "\n"; while (my $line = <$log>) { - if ($line =~ /^(${hex}{7,40})/o) { + if ($line =~ /^(${hex}{7,40})/) { $last_commit = $1; last; } } } - # for pagination - ($first_commit, $last_commit); + $ctx->{next_page} = "r=$last_commit" if $last_commit; + [ map { bless {blob => $_ }, 'PublicInbox::SearchMsg' } @oids ]; } 1;