thread: remove Mail::Thread dependency

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 6f79f601d777d2c9e9f895acc48b6c365f47d904..9f1bf46005ad66c3332ae4e875b5e71cd96254da 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -407,14 +407,16 @@ sub flush_quote {
        $$s .= qq(<span\nclass="q">) . $rv . '</span>'
 }
 
-sub attach_link ($$$$) {
-       my ($upfx, $ct, $p, $fn) = @_;
+sub attach_link ($$$$;$) {
+       my ($upfx, $ct, $p, $fn, $err) = @_;
        my ($part, $depth, @idx) = @$p;
        my $nl = $idx[-1] > 1 ? "\n" : '';
        my $idx = join('.', @idx);
        my $size = bytes::length($part->body);
-       $ct ||= 'text/plain';
-       $ct =~ s/;.*//; # no attributes
+
+       # hide attributes normally, unless we want to aid users in
+       # spotting MUA problems:
+       $ct =~ s/;.*// unless $err;
        $ct = ascii_html($ct);
        my $desc = $part->header('Content-Description');
        $desc = $fn unless defined $desc;
@@ -427,31 +429,50 @@ sub attach_link ($$$$) {
        } else {
                $sfn = 'a.bin';
        }
-       my @ret = qq($nl<a\nhref="$upfx$idx-$sfn">[-- Attachment #$idx: );
+       my $ret = qq($nl<a\nhref="$upfx$idx-$sfn">);
+       if ($err) {
+               $ret .=
+"[-- Warning: decoded text below may be mangled --]\n";
+       }
+       $ret .= "[-- Attachment #$idx: ";
        my $ts = "Type: $ct, Size: $size bytes";
-       push(@ret, ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]");
-       join('', @ret, "</a>\n");
+       $ret .= ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]";
+       $ret .= "</a>\n";
 }
 
 sub add_text_body {
        my ($upfx, $p) = @_; # from msg_iter: [ Email::MIME, depth, @idx ]
        my ($part, $depth, @idx) = @$p;
-       my $ct = $part->content_type;
+       my $ct = $part->content_type || 'text/plain';
        my $fn = $part->filename;
 
-       if (defined $ct && $ct =~ m!\btext/x?html\b!i) {
+       if ($ct =~ m!\btext/x?html\b!i) {
                return attach_link($upfx, $ct, $p, $fn);
        }
 
        my $s = eval { $part->body_str };
 
        # badly-encoded message? tell the world about it!
-       return attach_link($upfx, $ct, $p, $fn) if $@;
+       my $err = $@;
+       if ($err) {
+               if ($ct =~ m!\btext/plain\b!i) {
+                       # Try to assume UTF-8 because Alpine seems to
+                       # do wacky things and set charset=X-UNKNOWN
+                       $part->charset_set('UTF-8');
+                       $s = eval { $part->body_str };
+
+                       # If forcing charset=UTF-8 failed,
+                       # attach_link will warn further down...
+                       $s = $part->body if $@;
+               } else {
+                       return attach_link($upfx, $ct, $p, $fn);
+               }
+       }
 
        my @lines = split(/^/m, $s);
        $s = '';
-       if (defined($fn) || $depth > 0) {
-               $s .= attach_link($upfx, $ct, $p, $fn);
+       if (defined($fn) || $depth > 0 || $err) {
+               $s .= attach_link($upfx, $ct, $p, $fn, $err);
                $s .= "\n";
        }
        my @quot;
@@ -702,8 +723,6 @@ sub anchor_for {
 
 sub ghost_parent {
        my ($upfx, $mid) = @_;
-       # 'subject dummy' is used internally by Mail::Thread
-       return '[no common parent]' if ($mid eq 'subject dummy');
 
        $mid = PublicInbox::Hval->new_msgid($mid);
        my $href = $mid->{href};
@@ -730,8 +749,8 @@ sub msg_timestamp {
 
 sub thread_results {
        my ($msgs) = @_;
-       require PublicInbox::Thread;
-       my $th = PublicInbox::Thread->new(@$msgs);
+       require PublicInbox::SearchThread;
+       my $th = PublicInbox::SearchThread->new($msgs);
        $th->thread;
        $th->order(*sort_ts);
        $th
@@ -817,12 +836,6 @@ sub skel_dump {
                my $dst = $ctx->{dst};
                my $mapping = $ctx->{mapping};
                my $map = $mapping->{$mid} if $mapping;
-               if ($mid eq 'subject dummy') {
-                       my $ncp = "\t[no common parent]\n";
-                       $map->[1] = $ncp if $map;
-                       $$dst .= $ncp;
-                       return;
-               }
                my $d = $ctx->{pct} ? '    [irrelevant] ' # search result
                                    : '     [not found] ';
                $d .= indent_for($level) . th_pfx($level);