inbox: add ->version method

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

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index d7df07ee9c4577a1d15fe5410f68e6bdd68ee3e2..0bd458c94e2bdd05564f386136d0ddacbfaca83f 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2013-2019 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.
@@ -10,35 +10,26 @@ 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 $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 $msgs = $ctx->{srch}->get_thread($mid);
+       my $msgs = $ctx->{msgs} = $ctx->{-inbox}->over->get_thread($ctx->{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;
-       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 {
@@ -46,21 +37,33 @@ 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) = @_;
-       my $msgs = recent_msgs($ctx);
+       my $msgs = $ctx->{msgs} = recent_msgs($ctx);
        if (!@$msgs) {
                return [404, ['Content-Type', 'text/plain'],
                        ["No messages, yet\n"] ];
@@ -68,15 +71,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->response($ctx, 200, \&new_html_i);
 }
 
 # private subs
@@ -90,18 +85,18 @@ sub recent_msgs {
        my $ibx = $ctx->{-inbox};
        my $max = $ibx->{feedmax};
        my $qp = $ctx->{qp};
-       my $v = $ibx->{version} || 1;
+       my $v = $ibx->version;
        if ($v > 2) {
                die "BUG: unsupported inbox version: $v\n";
        }
-       if (my $srch = $ibx->search) {
+       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 $refhex = qr/(?:HEAD|${hex}{4,40})(?:~[0-9]+)?/;
 
        # revision ranges may be specified
        my $range = 'HEAD';
@@ -116,7 +111,7 @@ sub recent_msgs {
        my $log = $ibx->git->popen(qw/log
                                --no-notes --no-color --raw -r
                                --no-abbrev --abbrev-commit/,
-                               "--format=%h", $range);
+                               "--format=%H", $range);
        my %deleted; # only an optimization at this point
        my $last;
        my $last_commit;