$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
my $hdr = $ctx->{hdr} = $mime->header_obj;
$ctx->{obuf} = _msg_page_prepare_obuf($hdr, $ctx, 0);
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
my $hdr = $ctx->{hdr} = $mime->header_obj;
$ctx->{obuf} = _msg_page_prepare_obuf($hdr, $ctx, 0);
$ctx->{mhref} = $next ? '../'.mid_href($smsg->{mid}).'/' : '';
multipart_text_as_html($mime, $ctx);
$ctx->{-html_tip} = (${delete $ctx->{obuf}} .= '</pre><hr>');
$ctx->{mhref} = $next ? '../'.mid_href($smsg->{mid}).'/' : '';
multipart_text_as_html($mime, $ctx);
$ctx->{-html_tip} = (${delete $ctx->{obuf}} .= '</pre><hr>');
my $ibx = $ctx->{-inbox};
my $next = $ibx->over->next_by_mid($ctx->{mid}, \$id, \$prev);
$ctx->{more} = [ $id, $prev, $next ] if $next;
my $ibx = $ctx->{-inbox};
my $next = $ibx->over->next_by_mid($ctx->{mid}, \$id, \$prev);
$ctx->{more} = [ $id, $prev, $next ] if $next;
- my $mime = delete $smsg->{mime};
- $ctx->{obuf} = _msg_page_prepare_obuf($mime->header_obj, $ctx, $nr);
- multipart_text_as_html($mime, $ctx);
+ $ctx->{obuf} = _msg_page_prepare_obuf($eml->header_obj, $ctx, $nr);
+ multipart_text_as_html($eml, $ctx);
-sub index_entry {
- my ($smsg, $ctx, $more) = @_;
- my $subj = $smsg->subject;
- my $mid_raw = $smsg->mid;
+sub eml_entry {
+ my ($ctx, $smsg, $eml, $more) = @_;
+ my $subj = delete $smsg->{subject};
+ my $mid_raw = $smsg->{mid};
$rv .= $subj . "\n";
$rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx);
my @tocc;
$rv .= $subj . "\n";
$rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx);
my @tocc;
- my $ds = $smsg->ds; # for v1 non-Xapian/SQLite users
- # deleting {mime} is critical to memory use,
- # the rest of the fields saves about 400K as we iterate across 1K msgs
- my ($mime) = delete @$smsg{qw(mime ds ts blob subject)};
+ my $ds = delete $smsg->{ds}; # for v1 non-Xapian/SQLite users
+
+ # Deleting these fields saves about 400K as we iterate across 1K msgs
+ delete @$smsg{qw(ts blob)};
my $from = _hdr_names_html($hdr, 'From');
obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx;
$rv .= "From: $from @ ".fmt_ts($ds)." UTC";
my $from = _hdr_names_html($hdr, 'From');
obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx;
$rv .= "From: $from @ ".fmt_ts($ds)." UTC";
-sub thread_index_entry {
- my ($ctx, $level, $smsg) = @_;
+sub thread_eml_entry {
+ my ($ctx, $level, $smsg, $eml) = @_;
- $beg . '<pre>' . index_entry($smsg, $ctx, 0) . '</pre>' . $end;
+ $beg . '<pre>' . eml_entry($ctx, $smsg, $eml, 0) . '</pre>' . $end;
my $node = shift @$q or next;
my $cl = $level + 1;
unshift @$q, map { ($cl, $_) } @{$node->{children}};
my $node = shift @$q or next;
my $cl = $level + 1;
unshift @$q, map { ($cl, $_) } @{$node->{children}};
- if ($ctx->{-inbox}->smsg_mime($node)) {
- return thread_index_entry($ctx, $level, $node);
+ if (my $eml = $ctx->{-inbox}->smsg_eml($node)) {
+ return thread_eml_entry($ctx, $level, $node, $eml);
my ($rootset, $ctx) = @_;
my $ibx = $ctx->{-inbox};
my @q = map { (0, $_) } @$rootset;
my ($rootset, $ctx) = @_;
my $ibx = $ctx->{-inbox};
my @q = map { (0, $_) } @$rootset;
- unshift @q, map { ($cl, $_) } @{$node->{children}};
- $smsg = $ibx->smsg_mime($node) and last;
+ unshift @q, map { ($cl, $_) } @{$smsg->{children}};
+ $eml = $ibx->smsg_eml($smsg) and last;
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
$ctx->{-title_html} = ascii_html($smsg->{subject});
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
$ctx->{-title_html} = ascii_html($smsg->{subject});
- $ctx->{-html_tip} = thread_index_entry($ctx, $level, $smsg);
+ $ctx->{-html_tip} = thread_eml_entry($ctx, $level, $smsg, $eml);
return stream_thread($rootset, $ctx) unless $ctx->{flat};
# flat display: lazy load the full message from smsg
return stream_thread($rootset, $ctx) unless $ctx->{flat};
# flat display: lazy load the full message from smsg
- $ctx->{-html_tip} = '<pre>'.index_entry($smsg, $ctx, scalar @$msgs);
+ $ctx->{-html_tip} = '<pre>'.eml_entry($ctx, $smsg, $eml, scalar @$msgs);
}
sub thread_html_i { # PublicInbox::WwwStream::getline callback
my ($nr, $ctx) = @_;
my $msgs = $ctx->{msgs} or return;
while (my $smsg = shift @$msgs) {
}
sub thread_html_i { # PublicInbox::WwwStream::getline callback
my ($nr, $ctx) = @_;
my $msgs = $ctx->{msgs} or return;
while (my $smsg = shift @$msgs) {
- $ctx->{-inbox}->smsg_mime($smsg) or next;
- return index_entry($smsg, $ctx, scalar @$msgs);
+ my $eml = $ctx->{-inbox}->smsg_eml($smsg) or next;
+ return eml_entry($ctx, $smsg, $eml, scalar @$msgs);
+sub submsg_hdr ($$) {
+ my ($ctx, $eml) = @_;
+ my $obfs_ibx = $ctx->{-obfs_ibx};
+ my $rv = $ctx->{obuf};
+ $$rv .= "\n";
+ for my $h (qw(From To Cc Subject Date Message-ID X-Alt-Message-ID)) {
+ my @v = $eml->header($h);
+ for my $v (@v) {
+ obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
+ $v = ascii_html($v);
+ $$rv .= "$h: $v\n";
+ }
+ }
+}
+
sub attach_link ($$$$;$) {
my ($ctx, $ct, $p, $fn, $err) = @_;
my ($part, $depth, $idx) = @$p;
sub attach_link ($$$$;$) {
my ($ctx, $ct, $p, $fn, $err) = @_;
my ($part, $depth, $idx) = @$p;
- my $nl = substr($idx, -2) eq '.1' ? '' : "\n"; # like join("\n", ...)
+
+ # Eml iteration clobbers multipart ->{bdy}, so do not offer
+ # downloads for 0-byte multipart attachments
+ return unless $part->{bdy};
+
+ my $nl = $idx eq '1' ? '' : "\n"; # like join("\n", ...)
my $size = bytes::length($part->body);
# hide attributes normally, unless we want to aid users in
my $size = bytes::length($part->body);
# hide attributes normally, unless we want to aid users in
# $p - from each_part: [ Email::MIME-like, depth, $idx ]
my ($part, $depth, $idx) = @$p;
my $ct = $part->content_type || 'text/plain';
# $p - from each_part: [ Email::MIME-like, depth, $idx ]
my ($part, $depth, $idx) = @$p;
my $ct = $part->content_type || 'text/plain';
my ($s, $err) = msg_part_text($part, $ct);
return attach_link($ctx, $ct, $p, $fn) unless defined $s;
my ($s, $err) = msg_part_text($part, $ct);
return attach_link($ctx, $ct, $p, $fn) unless defined $s;
# makes no difference to browsers, and don't screw up filename
# link generation in diffs with the extra '%0D'
$s =~ s/\r\n/\n/sg;
# makes no difference to browsers, and don't screw up filename
# link generation in diffs with the extra '%0D'
$s =~ s/\r\n/\n/sg;
# badly-encoded message with $err? tell the world about it!
attach_link($ctx, $ct, $p, $fn, $err);
$$rv .= "\n";
}
# badly-encoded message with $err? tell the world about it!
attach_link($ctx, $ct, $p, $fn, $err);
$$rv .= "\n";
}
if (@$msgs) {
walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic);
}
if (@$msgs) {
walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic);
}