www_stream: linkify cloneurl entries if they're HTTP/HTTPS

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

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 2ec7ddf843340568519922a9241fe02f115a3beb..ae875bf736d2bb3be8f28ec63d19373f856243fe 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -8,7 +8,7 @@ use warnings;
 use PublicInbox::SearchMsg;
 use PublicInbox::Hval qw/ascii_html/;
 use PublicInbox::View;
-use PublicInbox::MID qw(mid2path mid_clean mid_mime);
+use PublicInbox::MID qw(mid2path mid_mime);
 use Email::MIME;
 require PublicInbox::Git;
 require PublicInbox::Thread;
@@ -151,7 +151,6 @@ sub tdump {
                $m;
        } ($mset->items);
 
-       my @rootset;
        my $th = PublicInbox::Thread->new(@m);
        $th->thread;
        if ($q->{r}) { # order by relevance
@@ -164,17 +163,16 @@ sub tdump {
        } else { # order by time (default for threaded view)
                $th->order(*PublicInbox::View::sort_ts);
        }
-       @rootset = $th->rootset;
-       my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
        my $state = {
                ctx => $ctx,
                anchor_idx => 0,
                pct => \%pct,
                cur_level => 0,
+               -inbox => $ctx->{-inbox},
                fh => $fh,
        };
        $ctx->{searchview} = 1;
-       tdump_ent($git, $state, $_, 0) for @rootset;
+       PublicInbox::View::walk_thread($th, $state, *tdump_ent);
        PublicInbox::View::thread_adj_level($state, 0);
 
        $fh->write(search_nav_bot($mset, $q). "\n\n" .
@@ -184,17 +182,14 @@ sub tdump {
 }
 
 sub tdump_ent {
-       my ($git, $state, $node, $level) = @_;
-       return unless $node;
+       my ($state, $level, $node) = @_;
        my $mime = $node->message;
 
        if ($mime) {
                # lazy load the full message from mini_mime:
                my $mid = mid_mime($mime);
-               $mime = eval {
-                       my $path = mid2path(mid_clean($mid));
-                       Email::MIME->new($git->cat_file('HEAD:'.$path));
-               };
+               $mime = eval { $state->{-inbox}->msg_by_mid($mid) } and
+                       $mime = Email::MIME->new($mime);
        }
        if ($mime) {
                my $end = PublicInbox::View::thread_adj_level($state, $level);
@@ -204,8 +199,6 @@ sub tdump_ent {
                my $mid = $node->messageid;
                PublicInbox::View::ghost_flush($state, '', $mid, $level);
        }
-       tdump_ent($git, $state, $node->child, $level + 1);
-       tdump_ent($git, $state, $node->next, $level);
 }
 
 sub foot {
@@ -237,7 +230,7 @@ sub html_start {
 sub adump {
        my ($cb, $mset, $q, $ctx) = @_;
        my $fh = $cb->([ 200, ['Content-Type' => 'application/atom+xml']]);
-       my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
+       my $ibx = $ctx->{-inbox};
        my $feed_opts = PublicInbox::Feed::get_feedopts($ctx);
        my $x = ascii_html($q->{'q'});
        $x = qq{$x - search results};
@@ -249,7 +242,8 @@ sub adump {
        for ($mset->items) {
                $x = PublicInbox::SearchMsg->load_doc($_->get_document)->mid;
                $x = mid2path($x);
-               PublicInbox::Feed::add_to_feed($feed_opts, $fh, $x, $git);
+               my $s = PublicInbox::Feed::feed_entry($feed_opts, $x, $ibx);
+               $fh->write($s) if defined $s;
        }
        PublicInbox::Feed::end_feed($fh);
 }