wwwstream: reduce object graph depth

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

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 828926c721790b2e9ad3176e6f7284c69eb2b873..71c3ae707bbfe4fc39d1b02f4f24a2dbc99931f3 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -6,8 +6,8 @@ package PublicInbox::SearchView;
 use strict;
 use warnings;
 use URI::Escape qw(uri_unescape uri_escape);
-use PublicInbox::SearchMsg;
-use PublicInbox::Hval qw/ascii_html obfuscate_addrs/;
+use PublicInbox::Smsg;
+use PublicInbox::Hval qw(ascii_html obfuscate_addrs mid_href);
 use PublicInbox::View;
 use PublicInbox::WwwAtomStream;
 use PublicInbox::SearchThread;
@@ -82,7 +82,7 @@ retry:
                        $cb = mset_summary($ctx, $mset, $q);
                }
        }
-       PublicInbox::WwwStream->response($ctx, $code, $cb);
+       PublicInbox::WwwStream::response($ctx, $code, $cb);
 }
 
 # display non-nested search results similar to what users expect from
@@ -100,7 +100,7 @@ sub mset_summary {
        foreach my $m ($mset->items) {
                my $rank = sprintf("%${pad}d", $m->get_rank + 1);
                my $pct = get_pct($m);
-               my $smsg = PublicInbox::SearchMsg::from_mitem($m, $srch);
+               my $smsg = PublicInbox::Smsg::from_mitem($m, $srch);
                unless ($smsg) {
                        eval {
                                $m = "$m ".$m->get_docid . " expired\n";
@@ -108,14 +108,14 @@ sub mset_summary {
                        };
                        next;
                }
-               my $s = ascii_html($smsg->subject);
-               my $f = ascii_html($smsg->from_name);
+               my $s = ascii_html($smsg->{subject});
+               my $f = ascii_html($smsg->{from_name});
                if ($obfs_ibx) {
                        obfuscate_addrs($obfs_ibx, $s);
                        obfuscate_addrs($obfs_ibx, $f);
                }
-               my $date = PublicInbox::View::fmt_ts($smsg->ds);
-               my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->{href};
+               my $date = PublicInbox::View::fmt_ts($smsg->{ds});
+               my $mid = mid_href($smsg->{mid});
                $s = '(no subject)' if $s eq '';
                $$res .= qq{$rank. <b><a\nhref="$mid/">}.
                        $s . "</a></b>\n";
@@ -243,8 +243,8 @@ sub search_nav_bot {
 
 sub sort_relevance {
        [ sort {
-               (eval { $b->topmost->{smsg}->{pct} } // 0) <=>
-               (eval { $a->topmost->{smsg}->{pct} } // 0)
+               (eval { $b->topmost->{pct} } // 0) <=>
+               (eval { $a->topmost->{pct} } // 0)
        } @{$_[0]} ]
 }
 
@@ -260,7 +260,7 @@ sub load_msgs {
        my ($mset) = @_;
        [ map {
                my $mi = $_;
-               my $smsg = PublicInbox::SearchMsg::from_mitem($mi);
+               my $smsg = PublicInbox::Smsg::from_mitem($mi);
                $smsg->{pct} = get_pct($mi);
                $smsg;
        } ($mset->items) ]
@@ -268,7 +268,8 @@ sub load_msgs {
 
 sub mset_thread {
        my ($ctx, $mset, $q) = @_;
-       my $msgs = $ctx->{-inbox}->search->retry_reopen(\&load_msgs, $mset);
+       my $ibx = $ctx->{-inbox};
+       my $msgs = $ibx->search->retry_reopen(\&load_msgs, $mset);
        my $r = $q->{r};
        my $rootset = PublicInbox::SearchThread::thread($msgs,
                $r ? \&sort_relevance : \&PublicInbox::View::sort_ds,
@@ -285,7 +286,7 @@ sub mset_thread {
        $ctx->{s_nr} = scalar(@$msgs).'+ results';
 
        # reduce hash lookups in skel_dump
-       $ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate};
+       $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
        PublicInbox::View::walk_thread($rootset, $ctx,
                \&PublicInbox::View::pre_thread);
 
@@ -299,8 +300,8 @@ sub mset_thread_i {
        my ($nr, $ctx) = @_;
        my $msgs = $ctx->{msgs} or return;
        while (my $smsg = pop @$msgs) {
-               $ctx->{-inbox}->smsg_mime($smsg) or next;
-               return PublicInbox::View::index_entry($smsg, $ctx,
+               my $eml = $ctx->{-inbox}->smsg_eml($smsg) or next;
+               return PublicInbox::View::eml_entry($ctx, $smsg, $eml,
                                                        scalar @$msgs);
        }
        my ($skel) = delete @$ctx{qw(skel msgs)};
@@ -337,9 +338,9 @@ sub adump_i {
        my ($ctx) = @_;
        while (my $mi = shift @{$ctx->{items}}) {
                my $smsg = eval {
-                       PublicInbox::SearchMsg::from_mitem($mi, $ctx->{srch});
+                       PublicInbox::Smsg::from_mitem($mi, $ctx->{srch});
                } or next;
-               $ctx->{-inbox}->smsg_mime($smsg) and return $smsg;
+               return $smsg;
        }
 }
 
@@ -365,14 +366,10 @@ sub new {
 }
 
 sub qs_html {
-       my ($self, %over) = @_;
+       my ($self, %override) = @_;
 
-       if (keys %over) {
-               my $tmp = bless { %$self }, ref($self);
-               foreach my $k (keys %over) {
-                       $tmp->{$k} = $over{$k};
-               }
-               $self = $tmp;
+       if (scalar(keys(%override))) {
+               $self = bless { (%$self, %override) }, ref($self);
        }
 
        my $q = uri_escape($self->{'q'}, MID_ESC);