imap+nntp: share COMPRESS implementation

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

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index f25dd267e30a8155f3546f509d47f6bdb2bf3b17..b2219dad9955005c2cb97d0fe3d47b710d617837 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2013-2021 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.
@@ -11,9 +11,7 @@ use PublicInbox::Smsg; # this loads w/o Search::Xapian
 
 sub generate_i {
        my ($ctx) = @_;
-       while (my $smsg = shift @{$ctx->{msgs}}) {
-               return $smsg;
-       }
+       shift @{$ctx->{msgs}};
 }
 
 # main function
@@ -26,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);
 }
@@ -36,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);
        }
@@ -50,14 +48,14 @@ sub generate_html_index {
 }
 
 sub new_html_i {
-       my ($nr, $ctx) = @_;
-       my $msgs = $ctx->{msgs};
-       while (my $smsg = shift @$msgs) {
-               my $eml = $ctx->{-inbox}->smsg_eml($smsg) or next;
-               return PublicInbox::View::eml_entry($ctx, $smsg, $eml,
-                                                       scalar @$msgs);
-       }
-       PublicInbox::View::pagination_footer($ctx, './new.html');
+       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 {
@@ -70,7 +68,7 @@ sub new_html {
        $ctx->{-html_tip} = '<pre>';
        $ctx->{-upfx} = '';
        $ctx->{-hr} = 1;
-       PublicInbox::WwwStream::response($ctx, 200, \&new_html_i);
+       PublicInbox::WwwStream::aresponse($ctx, 200, \&new_html_i);
 }
 
 # private subs
@@ -81,8 +79,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
@@ -90,7 +88,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';
@@ -128,14 +126,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;
+       $last_commit and
+               $ctx->{next_page} = qq[<a\nhref="?r=$last_commit"\nrel=next>] .
+                                       'next (older)</a>';
+
        [ map { bless {blob => $_ }, 'PublicInbox::Smsg' } @oids ];
 }