use Date::Parse qw/str2time/;
use Encode qw/find_encoding/;
use Encode::MIME::Header;
-use Email::MIME::ContentType qw/parse_content_type/;
use PublicInbox::Hval qw/ascii_html/;
use PublicInbox::Linkify;
use PublicInbox::MID qw/mid_clean id_compress mid2path mid_mime/;
+use PublicInbox::MsgIter;
require POSIX;
use constant INDENT => ' ';
$footer = defined($footer) ? "\n$footer" : '';
my $hdr = $mime->header_obj;
headers_to_html_header($hdr, $ctx) .
- multipart_text_as_html($mime) .
+ multipart_text_as_html($mime, '') .
'</pre><hr /><pre>' .
html_footer($hdr, 1, $ctx, 'R/') .
$footer .
my $midx = $state->{anchor_idx}++;
my $ctx = $state->{ctx};
my $srch = $ctx->{srch};
- my $part_nr = 0;
my $hdr = $mime->header_obj;
my $subj = $hdr->header('Subject');
my $mhref = "${path}$href/";
# scan through all parts, looking for displayable text
- $mime->walk_parts(sub {
- index_walk($fh, $_[0], \$part_nr);
- });
- $mime->body_set('');
+ msg_iter($mime, sub { index_walk($fh, $mhref, $_[0]) });
$rv = "\n" . html_footer($hdr, 0, $ctx, "$path$href/R/");
if (defined $irt) {
}
sub index_walk {
- my ($fh, $part, $part_nr) = @_;
- my $s = add_text_body($part, $part_nr);
+ my ($fh, $upfx, $p) = @_;
+ my $s = add_text_body($upfx, $p);
return if $s eq '';
}
sub multipart_text_as_html {
- my ($mime) = @_;
+ my ($mime, $upfx) = @_;
my $rv = "";
- my $part_nr = 0;
# scan through all parts, looking for displayable text
- $mime->walk_parts(sub {
- my ($part) = @_;
- $part = add_text_body($part, \$part_nr);
- $rv .= $part;
- $rv .= "\n" if $part ne '';
+ msg_iter($mime, sub {
+ my ($p) = @_;
+ $p = add_text_body($upfx, $p);
+ $rv .= $p;
+ $rv .= "\n" if $p ne '';
});
- $mime->body_set('');
$rv;
}
-sub add_filename_line {
- my ($fn) = @_;
- my $len = 72;
- my $pad = "-";
- $len -= length($fn);
- $pad x= ($len/2) if ($len > 0);
- "$pad " . ascii_html($fn) . " $pad\n";
-}
-
sub flush_quote {
- my ($s, $l, $quot, $part_nr) = @_;
+ my ($s, $l, $quot) = @_;
# show everything in the full version with anchor from
# short version (see above)
$$s .= qq(<span\nclass="q">) . $rv . '</span>'
}
-sub attach ($$) {
- my ($ct, $n) = @_;
- my $nl = $n ? "\n" : '';
- "$nl<b>[-- Attachment #$n: " . ascii_html($ct) . " --]\n".
- "[-- TODO not shown --]</b>";
+sub attach_link ($$$$) {
+ my ($upfx, $ct, $p, $fn) = @_;
+ 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
+ $ct = ascii_html($ct);
+ my $desc = $part->header('Content-Description');
+ $desc = $fn unless defined $desc;
+ $desc = '' unless defined $desc;
+ $desc = ': '.$desc if $desc;
+ my $sfn;
+ if (defined $fn && $fn =~ /\A[\w-]+\.[a-z0-9]+\z/) {
+ $sfn = $fn;
+ } elsif ($ct eq 'text/plain') {
+ $sfn = 'a.txt';
+ } else {
+ $sfn = 'a.bin';
+ }
+ qq($nl<a\nhref="$upfx$idx-$sfn">[-- Attachment #$idx$desc --]\n) .
+ "[-- Type: $ct, Size: $size bytes --]</a>"
}
sub add_text_body {
- my ($part, $part_nr) = @_;
- return '' if $part->subparts;
+ my ($upfx, $p) = @_; # from msg_iter: [ Email::MIME, depth, @idx ]
+ my ($part, $depth, @idx) = @$p;
my $ct = $part->content_type;
+ my $fn = $part->filename;
if (defined $ct && $ct =~ m!\btext/x?html\b!i) {
- return attach($ct, $$part_nr);
+ return attach_link($upfx, $ct, $p, $fn);
}
my $s = eval { $part->body_str };
# badly-encoded message? tell the world about it!
- return attach($ct, $$part_nr) if $@;
+ return attach_link($upfx, $ct, $p, $fn) if $@;
my @lines = split(/^/m, $s);
$s = '';
- if ($$part_nr > 0) {
- my $fn = $part->filename;
- defined($fn) or $fn = "part #" . ($$part_nr + 1);
- $s .= add_filename_line($fn);
+ if (defined($fn) || $depth > 0) {
+ $s .= attach_link($upfx, $ct, $p, $fn);
+ $s .= "\n\n";
}
-
my @quot;
my $l = PublicInbox::Linkify->new;
while (defined(my $cur = shift @lines)) {
if ($cur !~ /^>/) {
# show the previously buffered quote inline
- flush_quote(\$s, $l, \@quot, $$part_nr) if @quot;
+ flush_quote(\$s, $l, \@quot) if @quot;
# regular line, OK
$cur = $l->linkify_1($cur);
}
}
- flush_quote(\$s, $l, \@quot, $$part_nr) if @quot;
- ++$$part_nr;
-
+ flush_quote(\$s, $l, \@quot) if @quot;
$s =~ s/[ \t]+$//sgm; # kill per-line trailing whitespace
$s =~ s/\A\n+//s; # kill leading blank lines
$s =~ s/\s+\z//s; # kill all trailing spaces (final "\n" added if ne '')