package PublicInbox::View;
use strict;
use warnings;
+use bytes (); # only for bytes::length
use PublicInbox::MsgTime qw(msg_datestamp);
use PublicInbox::Hval qw/ascii_html obfuscate_addrs/;
use PublicInbox::Linkify;
use PublicInbox::Address;
use PublicInbox::WwwStream;
use PublicInbox::Reply;
+use PublicInbox::ViewDiff qw(flush_diff);
require POSIX;
use Time::Local qw(timegm);
-
+use PublicInbox::SearchMsg qw(subject_normalized);
use constant COLS => 72;
use constant INDENT => ' ';
use constant TCHILD => '` ';
my ($ctx, $mime, $more, $smsg) = @_;
my $hdr = $mime->header_obj;
my $ibx = $ctx->{-inbox};
- my $obfs_ibx = $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
+ $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
my $tip = _msg_html_prepare($hdr, $ctx, $more, 0);
my $end = 2;
PublicInbox::WwwStream->response($ctx, 200, sub {
if ($nr == 1) {
# $more cannot be true w/o $smsg being defined:
my $upfx = $more ? '../'.mid_escape($smsg->mid).'/' : '';
- $tip . multipart_text_as_html($mime, $upfx, $obfs_ibx) .
+ $tip . multipart_text_as_html($mime, $upfx, $ctx) .
'</pre><hr>'
} elsif ($more && @$more) {
++$end;
my $ibx = $ctx->{-inbox};
my ($first, $more);
my $smsg;
- if (my $srch = $ibx->search) {
+ if (my $over = $ibx->over) {
my ($id, $prev);
- $smsg = $srch->next_by_mid($mid, \$id, \$prev);
+ $smsg = $over->next_by_mid($mid, \$id, \$prev);
$first = $ibx->msg_by_smsg($smsg) if $smsg;
if ($first) {
- my $next = $srch->next_by_mid($mid, \$id, \$prev);
+ my $next = $over->next_by_mid($mid, \$id, \$prev);
$more = [ $id, $prev, $next ] if $next;
}
return unless $first;
my $str = eval {
my ($id, $prev, $smsg) = @$more;
my $mid = $ctx->{mid};
- $smsg = $ctx->{-inbox}->smsg_mime($smsg);
- my $next = $ctx->{srch}->next_by_mid($mid, \$id, \$prev);
+ my $ibx = $ctx->{-inbox};
+ $smsg = $ibx->smsg_mime($smsg);
+ my $next = $ibx->over->next_by_mid($mid, \$id, \$prev);
@$more = $next ? ($id, $prev, $next) : ();
if ($smsg) {
my $mime = $smsg->{mime};
my $upfx = '../' . mid_escape($smsg->mid) . '/';
_msg_html_prepare($mime->header_obj, $ctx, $more, $nr) .
- multipart_text_as_html($mime, $upfx,
- $ctx->{-obfs_ibx}) .
+ multipart_text_as_html($mime, $upfx, $ctx) .
'</pre><hr>'
} else {
'';
# this is already inside a <pre>
sub index_entry {
my ($smsg, $ctx, $more) = @_;
- my $srch = $ctx->{srch};
my $subj = $smsg->subject;
my $mid_raw = $smsg->mid;
my $id = id_compress($mid_raw, 1);
my $irt;
my $obfs_ibx = $ctx->{-obfs_ibx};
+ $subj = '(no subject)' if $subj eq '';
my $rv = "<a\nhref=#e$id\nid=m$id>*</a> ";
$subj = '<b>'.ascii_html($subj).'</b>';
obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
$rv .= "\n";
# scan through all parts, looking for displayable text
- msg_iter($mime, sub { $rv .= add_text_body($mhref, $obfs_ibx, $_[0]) });
+ my $ibx = $ctx->{-inbox};
+ msg_iter($mime, sub { $rv .= add_text_body($mhref, $ctx, $_[0]) });
# add the footer
$rv .= "\n<a\nhref=#$id_m\nid=e$id>^</a> ".
sub stream_thread ($$) {
my ($rootset, $ctx) = @_;
- my $inbox = $ctx->{-inbox};
+ my $ibx = $ctx->{-inbox};
my @q = map { (0, $_) } @$rootset;
my $level;
my $smsg;
my $node = shift @q or next;
my $cl = $level + 1;
unshift @q, map { ($cl, $_) } @{$node->{children}};
- $smsg = $inbox->smsg_mime($node->{smsg}) and last;
+ $smsg = $ibx->smsg_mime($node->{smsg}) and last;
}
return missing_thread($ctx) unless $smsg;
- $ctx->{-obfs_ibx} = $inbox->{obfuscate} ? $inbox : undef;
+ $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
$ctx->{-title_html} = ascii_html($smsg->subject);
$ctx->{-html_tip} = thread_index_entry($ctx, $level, $smsg);
$smsg = undef;
my $node = shift @q or next;
my $cl = $level + 1;
unshift @q, map { ($cl, $_) } @{$node->{children}};
- if ($smsg = $inbox->smsg_mime($node->{smsg})) {
+ if ($smsg = $ibx->smsg_mime($node->{smsg})) {
return thread_index_entry($ctx, $level, $smsg);
} else {
return ghost_index_entry($ctx, $level, $node);
sub thread_html {
my ($ctx) = @_;
my $mid = $ctx->{mid};
- my $srch = $ctx->{srch};
- my ($nr, $msgs) = $srch->get_thread($mid);
+ my $ibx = $ctx->{-inbox};
+ my ($nr, $msgs) = $ibx->over->get_thread($mid);
return missing_thread($ctx) if $nr == 0;
my $skel = '<hr><pre>';
$skel .= $nr == 1 ? 'only message in thread' : 'end of thread';
$ctx->{prev_level} = 0;
$ctx->{root_anchor} = anchor_for($mid);
$ctx->{mapping} = {};
- $ctx->{s_nr} = "$nr+ messages in thread";
+ $ctx->{s_nr} = ($nr > 1 ? "$nr+ messages" : 'only message')
+ .' in thread';
my $rootset = thread_results($ctx, $msgs);
# reduce hash lookups in pre_thread->skel_dump
- my $inbox = $ctx->{-inbox};
- $ctx->{-obfs_ibx} = $inbox->{obfuscate} ? $inbox : undef;
+ $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
walk_thread($rootset, $ctx, *pre_thread);
$skel .= '</pre>';
# flat display: lazy load the full message from smsg
my $smsg;
while (my $m = shift @$msgs) {
- $smsg = $inbox->smsg_mime($m) and last;
+ $smsg = $ibx->smsg_mime($m) and last;
}
return missing_thread($ctx) unless $smsg;
$ctx->{-title_html} = ascii_html($smsg->subject);
return unless $msgs;
$smsg = undef;
while (my $m = shift @$msgs) {
- $smsg = $inbox->smsg_mime($m) and last;
+ $smsg = $ibx->smsg_mime($m) and last;
}
return index_entry($smsg, $ctx, scalar @$msgs) if $smsg;
$msgs = undef;
}
sub multipart_text_as_html {
- my ($mime, $upfx, $obfs_ibx) = @_;
+ my ($mime, $upfx, $ctx) = @_;
my $rv = "";
# scan through all parts, looking for displayable text
- msg_iter($mime, sub { $rv .= add_text_body($upfx, $obfs_ibx, $_[0]) });
+ msg_iter($mime, sub { $rv .= add_text_body($upfx, $ctx, $_[0]) });
$rv;
}
# show everything in the full version with anchor from
# short version (see above)
- my $rv = $l->linkify_1(join('', @$quot));
- @$quot = ();
+ my $rv = $l->linkify_1($$quot);
# we use a <span> here to allow users to specify their own
# color for quoted text
$rv = $l->linkify_2(ascii_html($rv));
+ $$quot = undef;
$$s .= qq(<span\nclass="q">) . $rv . '</span>'
}
$desc = $fn unless defined $desc;
$desc = '' unless defined $desc;
my $sfn;
- if (defined $fn && $fn =~ /\A[[:alnum:]][\w\.-]+[[:alnum:]]\z/) {
+ if (defined $fn && $fn =~ /\A$PublicInbox::Hval::FN\z/o) {
$sfn = $fn;
} elsif ($ct eq 'text/plain') {
$sfn = 'a.txt';
}
sub add_text_body {
- my ($upfx, $obfs_ibx, $p) = @_;
+ my ($upfx, $ctx, $p) = @_;
+ my $ibx = $ctx->{-inbox};
+ my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
# $p - from msg_iter: [ Email::MIME, depth, @idx ]
- my ($part, $depth) = @$p; # attachment @idx is unused
+ my ($part, $depth, @idx) = @$p;
my $ct = $part->content_type || 'text/plain';
my $fn = $part->filename;
my ($s, $err) = msg_part_text($part, $ct);
return attach_link($upfx, $ct, $p, $fn) unless defined $s;
- my @lines = split(/^/m, $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;
+
+ # always support diff-highlighting, but we can't linkify hunk
+ # headers for solver unless some coderepo are configured:
+ my $diff;
+ if ($s =~ /^(?:diff|---|\+{3}) /ms) {
+ # diffstat anchors do not link across attachments or messages:
+ $idx[0] = $upfx . $idx[0] if $upfx ne '';
+ $ctx->{-apfx} = join('/', @idx);
+ $ctx->{-anchors} = {}; # attr => filename
+ $ctx->{-diff} = $diff = [];
+ delete $ctx->{-long_path};
+ my $spfx;
+ if ($ibx->{-repo_objs}) {
+ if (index($upfx, '//') >= 0) { # absolute URL (Atom feeds)
+ $spfx = $upfx;
+ $spfx =~ s!/([^/]*)/\z!/!;
+ } else {
+ my $n_slash = $upfx =~ tr!/!/!;
+ if ($n_slash == 0) {
+ $spfx = '../';
+ } elsif ($n_slash == 1) {
+ $spfx = '';
+ } else { # nslash == 2
+ $spfx = '../../';
+ }
+ }
+ }
+ $ctx->{-spfx} = $spfx;
+ };
+
+ # some editors don't put trailing newlines at the end:
+ $s .= "\n" unless $s =~ /\n\z/s;
+
+ # split off quoted and unquoted blocks:
+ my @sections = split(/((?:^>[^\n]*\n)+)/sm, $s);
$s = '';
if (defined($fn) || $depth > 0 || $err) {
# badly-encoded message with $err? tell the world about it!
$s .= attach_link($upfx, $ct, $p, $fn, $err);
$s .= "\n";
}
- my @quot;
my $l = PublicInbox::Linkify->new;
- foreach my $cur (@lines) {
- if ($cur !~ /^>/) {
- # show the previously buffered quote inline
- flush_quote(\$s, $l, \@quot) if @quot;
-
- # regular line, OK
+ foreach my $cur (@sections) {
+ if ($cur =~ /\A>/) {
+ flush_quote(\$s, $l, \$cur);
+ } elsif ($diff) {
+ @$diff = split(/^/m, $cur);
+ $cur = undef;
+ flush_diff(\$s, $ctx, $l);
+ } else {
+ # regular lines, OK
$l->linkify_1($cur);
$s .= $l->linkify_2(ascii_html($cur));
- } else {
- push @quot, $cur;
+ $cur = undef;
}
}
- if (@quot) { # ugh, top posted
- flush_quote(\$s, $l, \@quot);
- obfuscate_addrs($obfs_ibx, $s) if $obfs_ibx;
- $s;
- } else {
- obfuscate_addrs($obfs_ibx, $s) if $obfs_ibx;
- if ($s =~ /\n\z/s) { # common, last line ends with a newline
- $s;
- } else { # some editors don't do newlines...
- $s .= "\n";
- }
- }
+ obfuscate_addrs($obfs_ibx, $s) if $obfs_ibx;
+ $s;
}
sub _msg_html_prepare {
my ($hdr, $ctx, $more, $nr) = @_;
- my $srch = $ctx->{srch} if $ctx;
my $atom = '';
+ my $over = $ctx->{-inbox}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = '';
my $mids = mids($hdr);
} else {
$rv .= '<pre>';
}
- if ($srch) {
+ if ($over) {
$ctx->{-upfx} = '../';
}
my @title;
if (defined($v = $hdr->header('Subject')) && ($v ne '')) {
$v = ascii_html($v);
obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
- if ($srch) {
+ if ($over) {
$rv .= qq(Subject: <a\nhref="#r"\nid=t>$v</a>\n);
} else {
$rv .= "Subject: $v\n";
}
$title[0] = $v;
} else { # dummy anchor for thread skeleton at bottom of page
- $rv .= qq(<a\nhref="#r"\nid=t></a>) if $srch;
+ $rv .= qq(<a\nhref="#r"\nid=t></a>) if $over;
$title[0] = '(no subject)';
}
if (defined($v = $hdr->header('Date'))) {
$rv .= "(<a\nhref=\"raw\">raw</a>)\n";
}
}
- $rv .= _parent_headers($hdr, $srch);
+ $rv .= _parent_headers($hdr, $over);
$rv .= "\n";
}
sub thread_skel {
my ($dst, $ctx, $hdr, $tpfx) = @_;
- my $srch = $ctx->{srch};
my $mid = mids($hdr)->[0];
- my ($nr, $msgs) = $srch->get_thread($mid);
+ my $ibx = $ctx->{-inbox};
+ my ($nr, $msgs) = $ibx->over->get_thread($mid);
my $expand = qq(expand[<a\nhref="${tpfx}T/#u">flat</a>) .
qq(|<a\nhref="${tpfx}t/#u">nested</a>] ) .
qq(<a\nhref="${tpfx}t.mbox.gz">mbox.gz</a> ) .
my $subj = $hdr->header('Subject');
defined $subj or $subj = '';
- $ctx->{prev_subj} = [ split(/ /, $srch->subject_normalized($subj)) ];
+ $subj = '(no subject)' if $subj eq '';
+ $ctx->{prev_subj} = [ split(/ /, subject_normalized($subj)) ];
$ctx->{cur} = $mid;
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
$ctx->{dst} = $dst;
# reduce hash lookups in skel_dump
- my $ibx = $ctx->{-inbox};
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
walk_thread(thread_results($ctx, $msgs), $ctx, *skel_dump);
}
sub _parent_headers {
- my ($hdr, $srch) = @_;
+ my ($hdr, $over) = @_;
my $rv = '';
my $refs = references($hdr);
# do not display References: if search is present,
# we show the thread skeleton at the bottom, instead.
- return $rv if $srch;
+ return $rv if $over;
if (@$refs) {
- @$refs = map { linkify_ref_nosrch($_) } @$refs;
+ @$refs = map { linkify_ref_no_over($_) } @$refs;
$rv .= 'References: '. join("\n\t", @$refs) . "\n";
}
$rv;
sub html_footer {
my ($hdr, $standalone, $ctx, $rhref) = @_;
- my $srch = $ctx->{srch} if $ctx;
+ my $ibx = $ctx->{-inbox} if $ctx;
my $upfx = '../';
my $tpfx = '';
my $idx = $standalone ? " <a\nhref=\"$upfx\">index</a>" : '';
my $irt = '';
- if ($idx && $srch) {
+ if ($idx && $ibx->over) {
$idx .= "\n";
thread_skel(\$idx, $ctx, $hdr, $tpfx);
my ($next, $prev);
$irt .= $idx;
}
-sub linkify_ref_nosrch {
+sub linkify_ref_no_over {
my $v = PublicInbox::Hval->new_msgid($_[0]);
my $html = $v->as_html;
my $href = $v->{href};
PublicInbox::ExtMsg::ext_msg($ctx);
}
-sub _msg_date {
- my ($hdr) = @_;
- fmt_ts(msg_datestamp($hdr));
-}
-
sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
sub dedupe_subject {
# Subject is never undef, this mail was loaded from
# our Xapian which would've resulted in '' if it were
# really missing (and Filter rejects empty subjects)
- my @subj = split(/ /, $ctx->{srch}->subject_normalized($smsg->subject));
+ my @subj = split(/ /, subject_normalized($smsg->subject));
# remove common suffixes from the subject if it matches the previous,
# so we do not show redundant text at the end.
# returns 200 if done, 404 if not
sub acc_topic {
my ($ctx, $level, $node) = @_;
- my $srch = $ctx->{srch};
my $mid = $node->{id};
my $x = $node->{smsg} || $ctx->{-inbox}->smsg_by_mid($mid);
my ($subj, $ds);
my $topic;
if ($x) {
$subj = $x->subject;
- $subj = $srch->subject_normalized($subj);
+ $subj = subject_normalized($subj);
+ $subj = '(no subject)' if $subj eq '';
$ds = $x->ds;
if ($level == 0) {
$topic = [ $ds, 1, { $subj => $mid }, $subj ];
my @out;
my $ibx = $ctx->{-inbox};
my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
- my $srch = $ctx->{srch};
# sort by recency, this allows new posts to "bump" old topics...
foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) {
my $level = $ex[$i];
my $subj = $ex[$i + 1];
$mid = delete $seen->{$subj};
- my @subj = split(/ /, $srch->subject_normalized($subj));
+ my @subj = split(/ /, subject_normalized($subj));
my @next_prev = @subj; # full copy
my $omit = dedupe_subject($prev_subj, \@subj, ' "');
$prev_subj = \@next_prev;
# Xapian uses '..' but '-' is perhaps friendier to URL linkifiers
# if only $after exists "YYYYMMDD.." because "." could be skipped
# if interpreted as an end-of-sentence
- $t =~ s/\A(\d{8,14})-// and $after = str2ts($1);
- $t =~ /\A(\d{8,14})\z/ and $before = str2ts($1);
+ $t =~ s/\A([0-9]{8,14})-// and $after = str2ts($1);
+ $t =~ /\A([0-9]{8,14})\z/ and $before = str2ts($1);
my $ibx = $ctx->{-inbox};
my $msgs = $ibx->recent($opts, $after, $before);