feed: optimize query for feeds, too

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 5fb2b31c5997da6c8750ad1372221cd44004d15f..8ac405f2b73cd78ce91b8e308738898694ac732b 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -9,8 +9,7 @@ use warnings;
 use PublicInbox::MsgTime qw(msg_datestamp);
 use PublicInbox::Hval qw/ascii_html obfuscate_addrs/;
 use PublicInbox::Linkify;
-use PublicInbox::MID qw/mid_clean id_compress mid_mime mid_escape mids
-                       references/;
+use PublicInbox::MID qw/id_compress mid_escape mids references/;
 use PublicInbox::MsgIter;
 use PublicInbox::Address;
 use PublicInbox::WwwStream;
@@ -24,7 +23,7 @@ sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
 # public functions: (unstable)
 
 sub msg_html {
-       my ($ctx, $mime, $more) = @_;
+       my ($ctx, $mime, $more, $smsg) = @_;
        my $hdr = $mime->header_obj;
        my $ibx = $ctx->{-inbox};
        my $obfs_ibx = $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
@@ -33,7 +32,9 @@ sub msg_html {
        PublicInbox::WwwStream->response($ctx, 200, sub {
                my ($nr, undef) = @_;
                if ($nr == 1) {
-                       $tip . multipart_text_as_html($mime, '', $obfs_ibx) .
+                       # $more cannot be true w/o $smsg being defined:
+                       my $upfx = $more ? '../'.mid_escape($smsg->mid).'/' : '';
+                       $tip . multipart_text_as_html($mime, $upfx, $obfs_ibx) .
                                '</pre><hr>'
                } elsif ($more && @$more) {
                        ++$end;
@@ -57,13 +58,13 @@ sub msg_page {
        my $mid = $ctx->{mid};
        my $ibx = $ctx->{-inbox};
        my ($first, $more, $head, $tail, $db);
+       my $smsg;
        if (my $srch = $ibx->search) {
                $srch->retry_reopen(sub {
                        ($head, $tail, $db) = $srch->each_smsg_by_mid($mid);
                        for (; !defined($first) && $head != $tail; $head++) {
                                my @args = ($head, $db, $mid);
-                               my $smsg = PublicInbox::SearchMsg->get(@args);
-                               next if $smsg->type ne 'mail';
+                               $smsg = PublicInbox::SearchMsg->get(@args);
                                $first = $ibx->msg_by_smsg($smsg);
                        }
                        if ($head != $tail) {
@@ -74,7 +75,7 @@ sub msg_page {
        } else {
                $first = $ibx->msg_by_mid($mid) or return;
        }
-       msg_html($ctx, PublicInbox::MIME->new($first), $more);
+       msg_html($ctx, PublicInbox::MIME->new($first), $more, $smsg);
 }
 
 sub msg_html_more {
@@ -85,7 +86,6 @@ sub msg_html_more {
                my $mid = $ctx->{mid};
                for (; !defined($smsg) && $head != $tail; $head++) {
                        my $m = PublicInbox::SearchMsg->get($head, $db, $mid);
-                       next if $m->type ne 'mail';
                        $smsg = $ctx->{-inbox}->smsg_mime($m);
                }
                if ($head == $tail) { # done
@@ -95,8 +95,9 @@ sub msg_html_more {
                }
                if ($smsg) {
                        my $mime = $smsg->{mime};
+                       my $upfx = '../' . mid_escape($smsg->mid) . '/';
                        _msg_html_prepare($mime->header_obj, $ctx, $more, $nr) .
-                               multipart_text_as_html($mime, '',
+                               multipart_text_as_html($mime, $upfx,
                                                        $ctx->{-obfs_ibx}) .
                                '</pre><hr>'
                } else {
@@ -408,7 +409,7 @@ sub thread_html {
        my $mid = $ctx->{mid};
        my $srch = $ctx->{srch};
        my $sres = $srch->get_thread($mid);
-       my $msgs = load_results($srch, $sres);
+       my $msgs = $sres->{msgs};
        my $nr = $sres->{total};
        return missing_thread($ctx) if $nr == 0;
        my $skel = '<hr><pre>';
@@ -428,7 +429,7 @@ sub thread_html {
        $ctx->{mapping} = {};
        $ctx->{s_nr} = "$nr+ messages in thread";
 
-       my $rootset = thread_results($msgs, $srch);
+       my $rootset = thread_results($ctx, $msgs);
 
        # reduce hash lookups in pre_thread->skel_dump
        my $inbox = $ctx->{-inbox};
@@ -679,12 +680,12 @@ sub thread_skel {
        $ctx->{prev_attr} = '';
        $ctx->{prev_level} = 0;
        $ctx->{dst} = $dst;
-       $sres = load_results($srch, $sres);
+       $sres = $sres->{msgs};
 
        # reduce hash lookups in skel_dump
        my $ibx = $ctx->{-inbox};
        $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
-       walk_thread(thread_results($sres, $srch), $ctx, *skel_dump);
+       walk_thread(thread_results($ctx, $sres), $ctx, *skel_dump);
 
        $ctx->{parent_msg} = $parent;
 }
@@ -800,16 +801,10 @@ sub indent_for {
        $level ? INDENT x ($level - 1) : '';
 }
 
-sub load_results {
-       my ($srch, $sres) = @_;
-       my $msgs = delete $sres->{msgs};
-       $srch->retry_reopen(sub { [ map { $_->mid; $_ } @$msgs ] });
-}
-
 sub thread_results {
-       my ($msgs, $srch) = @_;
+       my ($ctx, $msgs) = @_;
        require PublicInbox::SearchThread;
-       PublicInbox::SearchThread::thread($msgs, *sort_ds, $srch);
+       PublicInbox::SearchThread::thread($msgs, *sort_ds, $ctx->{-inbox});
 }
 
 sub missing_thread {
@@ -950,7 +945,7 @@ sub acc_topic {
        my ($ctx, $level, $node) = @_;
        my $srch = $ctx->{srch};
        my $mid = $node->{id};
-       my $x = $node->{smsg} || $srch->lookup_mail($mid);
+       my $x = $node->{smsg} || $ctx->{-inbox}->smsg_by_mid($mid);
        my ($subj, $ds);
        my $topic;
        if ($x) {
@@ -1068,17 +1063,16 @@ sub index_nav { # callback for WwwStream
 sub index_topics {
        my ($ctx) = @_;
        my ($off) = (($ctx->{qp}->{o} || '0') =~ /(\d+)/);
-       my $opts = { offset => $off, limit => 200 };
 
        $ctx->{order} = [];
        my $srch = $ctx->{srch};
-       my $sres = $srch->query('', $opts);
-       my $nr = scalar @{$sres->{msgs}};
+       my $sres = $ctx->{-inbox}->recent({offset => $off, limit => 200 });
+       $sres = $sres->{msgs};
+       my $nr = scalar @$sres;
        if ($nr) {
-               $sres = load_results($srch, $sres);
-               walk_thread(thread_results($sres, $srch), $ctx, *acc_topic);
+               walk_thread(thread_results($ctx, $sres), $ctx, *acc_topic);
        }
-       $ctx->{-next_o} = $off+ $nr;
+       $ctx->{-next_o} = $off + $nr;
        $ctx->{-cur_o} = $off;
        PublicInbox::WwwStream->response($ctx, dump_topics($ctx), *index_nav);
 }