www: more descriptive pagination

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

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index ae07189504327530290eb986bede736ae25c25cd..cbdf5db99f8b8486e8a14caff84259c63e560fd9 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -1,44 +1,32 @@
-# Copyright (C) 2013-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2013-2020 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 PublicInbox::View;
 use PublicInbox::WwwAtomStream;
-use PublicInbox::SearchMsg; # this loads w/o Search::Xapian
+use PublicInbox::Smsg; # this loads w/o Search::Xapian
+
+sub generate_i {
+       my ($ctx) = @_;
+       shift @{$ctx->{msgs}};
+}
 
 # main function
 sub generate {
        my ($ctx) = @_;
-       my $msgs = recent_msgs($ctx);
+       my $msgs = $ctx->{msgs} = recent_msgs($ctx);
        return _no_thread() unless @$msgs;
-
-       my $ibx = $ctx->{-inbox};
-       PublicInbox::WwwAtomStream->response($ctx, 200, sub {
-               while (my $smsg = shift @$msgs) {
-                       $ibx->smsg_mime($smsg) and return $smsg;
-               }
-       });
+       PublicInbox::WwwAtomStream->response($ctx, 200, \&generate_i);
 }
 
 sub generate_thread_atom {
        my ($ctx) = @_;
-       my $mid = $ctx->{mid};
-       my $ibx = $ctx->{-inbox};
-       my $msgs = $ibx->over->get_thread($mid);
+       my $msgs = $ctx->{msgs} = $ctx->{-inbox}->over->get_thread($ctx->{mid});
        return _no_thread() unless @$msgs;
-
-       my $html_url = $ibx->base_url($ctx->{env});
-       $html_url .= PublicInbox::Hval->new_msgid($mid)->{href};
-       $ctx->{-html_url} = $html_url;
-       PublicInbox::WwwAtomStream->response($ctx, 200, sub {
-               while (my $smsg = shift @$msgs) {
-                       $ibx->smsg_mime($smsg) and return $smsg;
-               }
-       });
+       PublicInbox::WwwAtomStream->response($ctx, 200, \&generate_i);
 }
 
 sub generate_html_index {
@@ -59,9 +47,20 @@ sub generate_html_index {
                [ "Redirecting to $url\n" ] ];
 }
 
+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);
+       my $smsg = shift @{$ctx->{msgs}} or
+               $ctx->zmore(PublicInbox::View::pagination_footer(
+                                               $ctx, './new.html'));
+       $smsg;
+}
+
 sub new_html {
        my ($ctx) = @_;
-       my $msgs = recent_msgs($ctx);
+       my $msgs = $ctx->{msgs} = recent_msgs($ctx);
        if (!@$msgs) {
                return [404, ['Content-Type', 'text/plain'],
                        ["No messages, yet\n"] ];
@@ -69,15 +68,7 @@ sub new_html {
        $ctx->{-html_tip} = '<pre>';
        $ctx->{-upfx} = '';
        $ctx->{-hr} = 1;
-       my $ibx = $ctx->{-inbox};
-       PublicInbox::WwwStream->response($ctx, 200, sub {
-               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);
-               }
-               PublicInbox::View::pagination_footer($ctx, './new.html');
-       });
+       PublicInbox::WwwStream::aresponse($ctx, 200, \&new_html_i);
 }
 
 # private subs
@@ -90,15 +81,10 @@ sub recent_msgs {
        my ($ctx) = @_;
        my $ibx = $ctx->{-inbox};
        my $max = $ibx->{feedmax};
-       my $qp = $ctx->{qp};
-       my $v = $ibx->{version} || 1;
-       if ($v > 2) {
-               die "BUG: unsupported inbox version: $v\n";
-       }
-       if ($ibx->over) {
-               return PublicInbox::View::paginate_recent($ctx, $max);
-       }
+       return PublicInbox::View::paginate_recent($ctx, $max) if $ibx->over;
 
+       # only for rare v1 inboxes which aren't indexed at all
+       my $qp = $ctx->{qp};
        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})$!;
@@ -147,8 +133,11 @@ sub recent_msgs {
                }
        }
 
-       $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>';
+
+       [ map { bless {blob => $_ }, 'PublicInbox::Smsg' } @oids ];
 }
 
 1;