X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=db2bd20f3a8e9b8920bb6042ffbeb4c51a97d122;hb=2c69f7bc34a2b12dc7f55e2bb24fa28565f24f03;hp=e6d30a850a8bb36e1c47149dad34ade5b7c4ef05;hpb=ffc2d86d39fd5f0e90bb486dd7c4a36dfbe5d764;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index e6d30a85..db2bd20f 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -12,7 +12,7 @@ use Encode::MIME::Header; use Plack::Util; use PublicInbox::Hval qw/ascii_html/; use PublicInbox::Linkify; -use PublicInbox::MID qw/mid_clean id_compress mid2path mid_mime/; +use PublicInbox::MID qw/mid_clean id_compress mid_mime/; use PublicInbox::MsgIter; use PublicInbox::Address; use PublicInbox::WwwStream; @@ -33,8 +33,13 @@ sub msg_html { $tip . multipart_text_as_html($mime, '') . '
' . html_footer($hdr, 1, $ctx) . - '' . msg_reply($ctx, $hdr); + # fake an EOF if generating the footer fails; + # we want to at least show the message if something + # here crashes: + eval { + '
' . html_footer($hdr, 1, $ctx) . + '' . msg_reply($ctx, $hdr) + }; } else { undef } @@ -79,137 +84,275 @@ sub in_reply_to { undef; } +sub _hdr_names ($$) { + my ($hdr, $field) = @_; + my $val = $hdr->header($field) or return ''; + ascii_html(join(', ', PublicInbox::Address::names($val))); +} + +sub nr_to_s ($$$) { + my ($nr, $singular, $plural) = @_; + return "0 $plural" if $nr == 0; + $nr == 1 ? "$nr $singular" : "$nr $plural"; +} + # this is already inside a
sub index_entry { - my ($mime, $level, $state) = @_; - my $midx = $state->{anchor_idx}++; - my $ctx = $state->{ctx}; + my ($mime, $ctx, $more) = @_; my $srch = $ctx->{srch}; my $hdr = $mime->header_obj; my $subj = $hdr->header('Subject'); my $mid_raw = mid_clean(mid_mime($mime)); - my $id = anchor_for($mid_raw); - my $seen = $state->{seen}; - $seen->{$id} = "#$id"; # save the anchor for children, later - + my $id = id_compress($mid_raw, 1); + my $id_m = 'm'.$id; my $mid = PublicInbox::Hval->new_msgid($mid_raw); - my $from = PublicInbox::Address::from_name($hdr->header('From')); - my $root_anchor = $state->{root_anchor} || ''; - my $path = $root_anchor ? '../../' : ''; - my $href = $mid->as_href; + my $root_anchor = $ctx->{root_anchor} || ''; my $irt = in_reply_to($hdr); - my $parent_anchor = $seen->{anchor_for($irt)} if defined $irt; - - $from = ascii_html($from); - $subj = ascii_html($subj); - $subj = "$subj"; - $subj = "$subj" if $root_anchor eq $id; - - my $ts = _msg_date($hdr); - my $rv = ""; - $rv .= "$subj\n"; - my $txt = "${path}$href/raw"; - my $fh = $state->{fh}; - $fh->write($rv .= "- $from @ $ts UTC (raw)\n\n"); - my $mhref = "${path}$href/"; + my $rv = ''.ascii_html($subj).''; + $rv = "$rv" if $root_anchor eq $id_m; + $rv .= "\n"; + $rv .= _th_index_lite($mid_raw, $irt, $id, $ctx); + my @tocc; + foreach my $f (qw(To Cc)) { + my $dst = _hdr_names($hdr, $f); + push @tocc, "$f: $dst" if $dst ne ''; + } + $rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC"; + my $upfx = $ctx->{-upfx}; + my $mhref = $upfx . $mid->as_href . '/'; + $rv .= qq{ (permalink / }; + $rv .= qq{raw)\n}; + $rv .= ' '.join('; +', @tocc) . "\n" if @tocc; + + my $mapping = $ctx->{mapping}; + if (!$mapping && $irt) { + my $mirt = PublicInbox::Hval->msgid($irt); + my $href = $upfx . $mirt->as_href . '/'; + my $html = $mirt->as_html; + $rv .= qq(In-Reply-To: <$html>\n) + } + $rv .= "\n"; # scan through all parts, looking for displayable text - msg_iter($mime, sub { index_walk($fh, $mhref, $_[0]) }); - $rv = "\n" . html_footer($hdr, 0, $ctx, "$path$href/#R"); - - if (defined $irt) { - unless (defined $parent_anchor) { - my $v = PublicInbox::Hval->new_msgid($irt, 1); - $v = $v->as_href; - $parent_anchor = "${path}$v/"; - } - $rv .= " parent"; - } - if (my $pct = $state->{pct}) { # used by SearchView.pm + msg_iter($mime, sub { $rv .= add_text_body($mhref, $_[0]) }); + + # add the footer + $rv .= "\n^ ". + "permalink" . + " / raw" . + " / reply"; + if (my $pct = $ctx->{pct}) { # used by SearchView.pm $rv .= " [relevance $pct->{$mid_raw}%]"; - } elsif ($srch) { + } elsif ($mapping) { my $threaded = 'threaded'; my $flat = 'flat'; my $end = ''; if ($ctx->{flat}) { $flat = "$flat"; - $end = "\n"; # for lynx } else { $threaded = "$threaded"; } - $rv .= " [$threaded"; - $rv .= "|$flat]$end"; + $rv .= " / [$flat"; + $rv .= "|$threaded]"; + $rv .= " / $ctx->{s_nr}"; } - $fh->write($rv .= ''); -} -sub thread_html { - my ($ctx, $foot, $srch) = @_; - # $_[0] in sub is the Plack callback - sub { emit_thread_html($_[0], $ctx, $foot, $srch) } + $rv .= $more ? "\n\n" : "\n"; } -# only private functions below. +sub pad_link ($$;$) { + my ($mid, $level, $s) = @_; + $s ||= '...'; + my $id = id_compress($mid, 1); + (' 'x19).indent_for($level).th_pfx($level)."($s)\n"; +} -sub emit_thread_html { - my ($res, $ctx, $foot, $srch) = @_; - my $mid = $ctx->{mid}; - my $flat = $ctx->{flat}; - my $msgs = load_results($srch->get_thread($mid, { asc => $flat })); - my $nr = scalar @$msgs; - return missing_thread($res, $ctx) if $nr == 0; - my $seen = {}; - my $state = { - res => $res, - ctx => $ctx, - seen => $seen, - root_anchor => anchor_for($mid), - anchor_idx => 0, - cur_level => 0, - }; - - require PublicInbox::Git; - $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir}); - if ($flat) { - pre_anchor_entry($seen, $_) for (@$msgs); - __thread_entry($state, $_, 0) for (@$msgs); - } else { - my $th = thread_results($msgs); - thread_entry($state, $_, 0) for $th->rootset; - if (my $max = $state->{cur_level}) { - $state->{fh}->write( - ('' x ($max - 1)) . ''); +sub _th_index_lite { + my ($mid_raw, $irt, $id, $ctx) = @_; + my $rv = ''; + my $mapping = $ctx->{mapping} or return $rv; + my $pad = ' '; + # map = [children, attr, node, idx, level] + my $map = $mapping->{$mid_raw}; + my $nr_c = scalar @{$map->[0]}; + my $nr_s = 0; + my $level = $map->[4]; + my $idx = $map->[3]; + if (defined $irt) { + my $irt_map = $mapping->{$irt}; + my $siblings = $irt_map->[0]; + $nr_s = scalar(@$siblings) - 1; + $rv .= $pad . $irt_map->[1]; + if ($idx > 0) { + my $prev = $siblings->[$idx - 1]; + my $pmid = $prev->messageid; + if ($idx > 2) { + my $s = ($idx - 1). ' preceding siblings ...'; + $rv .= pad_link($pmid, $level, $s); + } elsif ($idx == 2) { + my $ppmid = $siblings->[0]->messageid; + $rv .= $pad . $mapping->{$ppmid}->[1]; + } + $rv .= $pad . $mapping->{$pmid}->[1]; } } - - # there could be a race due to a message being deleted in git - # but still being in the Xapian index: - my $fh = delete $state->{fh} or return missing_thread($res, $ctx); - - my $final_anchor = $state->{anchor_idx}; - my $next = ""; - $next .= $final_anchor == 1 ? 'only message in' : 'end of'; - $next .= " thread, back to index"; - $next .= "\ndownload thread: "; - $next .= "mbox.gz"; - $next .= " / follow: Atom feed"; - $fh->write('' . $next . "\n\n". - $foot . '