feed: respect feedmax, again

[public-inbox.git] / lib / PublicInbox / Feed.pm

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 74d0bbde476f069642526d06329e4161762f9b65..d7df07ee9c4577a1d15fe5410f68e6bdd68ee3e2 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -8,18 +8,18 @@ use warnings;
 use PublicInbox::MIME;
 use PublicInbox::View;
 use PublicInbox::WwwAtomStream;
+use PublicInbox::SearchMsg; # this loads w/o Search::Xapian
 
 # main function
 sub generate {
        my ($ctx) = @_;
-       my $oids = recent_blobs($ctx);
-       return _no_thread() unless @$oids;
+       my $msgs = recent_msgs($ctx);
+       return _no_thread() unless @$msgs;
 
-       my $git = $ctx->{-inbox}->git;
+       my $ibx = $ctx->{-inbox};
        PublicInbox::WwwAtomStream->response($ctx, 200, sub {
-               while (my $oid = shift @$oids) {
-                       my $msg = $git->cat_file($oid) or next;
-                       return PublicInbox::MIME->new($msg);
+               while (my $smsg = shift @$msgs) {
+                       $ibx->smsg_mime($smsg) and return $smsg;
                }
        });
 }
@@ -27,18 +27,16 @@ sub generate {
 sub generate_thread_atom {
        my ($ctx) = @_;
        my $mid = $ctx->{mid};
-       my $res = $ctx->{srch}->get_thread($mid);
-       return _no_thread() unless $res->{total};
+       my $msgs = $ctx->{srch}->get_thread($mid);
+       return _no_thread() unless @$msgs;
 
        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);
+               while (my $smsg = shift @$msgs) {
+                       $ibx->smsg_mime($smsg) and return $smsg;
                }
        });
 }
@@ -62,23 +60,22 @@ sub generate_html_index {
 
 sub new_html {
        my ($ctx) = @_;
-       my $oids = recent_blobs($ctx);
-       if (!@$oids) {
+       my $msgs = recent_msgs($ctx);
+       if (!@$msgs) {
                return [404, ['Content-Type', 'text/plain'],
                        ["No messages, yet\n"] ];
        }
        $ctx->{-html_tip} = '<pre>';
        $ctx->{-upfx} = '';
        $ctx->{-hr} = 1;
-       my $git = $ctx->{-inbox}->git;
+       my $ibx = $ctx->{-inbox};
        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;
+               while (my $smsg = shift @$msgs) {
+                       my $m = $ibx->smsg_mime($smsg) or next;
+                       my $more = scalar @$msgs;
                        return PublicInbox::View::index_entry($m, $ctx, $more);
                }
-               new_html_footer($ctx);
+               PublicInbox::View::pagination_footer($ctx, './new.html');
        });
 }
 
@@ -88,22 +85,7 @@ sub _no_thread () {
        [404, ['Content-Type', 'text/plain'], ["No feed found for thread\n"]];
 }
 
-sub new_html_footer {
-       my ($ctx) = @_;
-       my $qp = delete $ctx->{qp} or return;
-       my $latest = '';
-       my $next = delete $ctx->{next_page} || '';
-       if ($next) {
-               $next = qq!<a\nhref="?$next"\nrel=next>next</a>!;
-       }
-       if (!$qp) {
-               $latest = qq! <a\nhref='./new.html'>latest</a>!;
-               $next ||= '    ';
-       }
-       "<hr><pre>page: $next$latest</pre>";
-}
-
-sub recent_blobs {
+sub recent_msgs {
        my ($ctx) = @_;
        my $ibx = $ctx->{-inbox};
        my $max = $ibx->{feedmax};
@@ -113,13 +95,7 @@ sub recent_blobs {
                die "BUG: unsupported inbox version: $v\n";
        }
        if (my $srch = $ibx->search) {
-               my $o = $qp ? $qp->{o} : 0;
-               $o += 0;
-               $o = 0 if $o < 0;
-               my $res = $srch->query('', { limit => $max, offset => $o });
-               my $next = $o + $max;
-               $ctx->{next_page} = "o=$next" if $res->{total} >= $next;
-               return [ map { $_->{blob} } @{$res->{msgs}} ];
+               return PublicInbox::View::paginate_recent($ctx, $max);
        }
 
        my $hex = '[a-f0-9]';
@@ -171,7 +147,7 @@ sub recent_blobs {
        }
 
        $ctx->{next_page} = "r=$last_commit" if $last_commit;
-       \@oids;
+       [ map { bless {blob => $_ }, 'PublicInbox::SearchMsg' } @oids ];
 }
 
 1;