X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=60fc1df17f9e5e242d55a7f05a00ca2e7943c07e;hb=dfef0d2c34fbf21d665c40b5ad5069e9113c35c8;hp=f811f4f0e3f9d61ea1665b687a386013ae2a8cbe;hpb=35ac61764499c272d2760de2b2a432be412ecede;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index f811f4f0..60fc1df1 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -6,10 +6,10 @@ package PublicInbox::View; use strict; use warnings; -use PublicInbox::MsgTime qw(msg_timestamp); +use PublicInbox::MsgTime qw(msg_datestamp); use PublicInbox::Hval qw/ascii_html obfuscate_addrs/; use PublicInbox::Linkify; -use PublicInbox::MID qw/mid_clean id_compress mid_mime mid_escape/; +use PublicInbox::MID qw/id_compress mid_escape mids references/; use PublicInbox::MsgIter; use PublicInbox::Address; use PublicInbox::WwwStream; @@ -21,18 +21,25 @@ use constant TCHILD => '` '; sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD }; # public functions: (unstable) + sub msg_html { - my ($ctx, $mime) = @_; + my ($ctx, $mime, $more, $smsg) = @_; my $hdr = $mime->header_obj; my $ibx = $ctx->{-inbox}; - my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef; - my $tip = _msg_html_prepare($hdr, $ctx, $obfs_ibx); + my $obfs_ibx = $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 { my ($nr, undef) = @_; if ($nr == 1) { - $tip . multipart_text_as_html($mime, '', $obfs_ibx) . + # $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) . '
Error looking up additional messages'; + } + $str; +} + # /$INBOX/$MESSAGE_ID/#R sub msg_reply { my ($ctx, $hdr) = @_; @@ -105,14 +170,8 @@ EOF sub in_reply_to { my ($hdr) = @_; - my %mid = map { $_ => 1 } $hdr->header_raw('Message-ID'); - my @refs = (($hdr->header_raw('References') || '') =~ /<([^>]+)>/g); - push(@refs, (($hdr->header_raw('In-Reply-To') || '') =~ /<([^>]+)>/g)); - while (defined(my $irt = pop @refs)) { - next if $mid{"<$irt>"}; - return $irt; - } - undef; + my $refs = references($hdr); + $refs->[-1]; } sub _hdr_names_html ($$) { @@ -129,12 +188,10 @@ sub nr_to_s ($$$) { # this is already inside a
sub index_entry { - my ($mime, $ctx, $more) = @_; + my ($smsg, $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 $subj = $smsg->subject; + my $mid_raw = $smsg->mid; my $id = id_compress($mid_raw, 1); my $id_m = 'm'.$id; @@ -149,6 +206,8 @@ sub index_entry { $rv .= $subj . "\n"; $rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx); my @tocc; + my $mime = $smsg->{mime}; + my $hdr = $mime->header_obj; foreach my $f (qw(To Cc)) { my $dst = _hdr_names_html($hdr, $f); if ($dst ne '') { @@ -158,7 +217,7 @@ sub index_entry { } my $from = _hdr_names_html($hdr, 'From'); obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx; - $rv .= "From: $from @ "._msg_date($hdr)." UTC"; + $rv .= "From: $from @ ".fmt_ts($smsg->ds)." UTC"; my $upfx = $ctx->{-upfx}; my $mhref = $upfx . mid_escape($mid_raw) . '/'; $rv .= qq{ (permalink / }; @@ -301,30 +360,30 @@ sub pre_thread { } sub thread_index_entry { - my ($ctx, $level, $mime) = @_; + my ($ctx, $level, $smsg) = @_; my ($beg, $end) = thread_adj_level($ctx, $level); - $beg . '' . index_entry($mime, $ctx, 0) . '' . $end; + $beg . '' . index_entry($smsg, $ctx, 0) . '' . $end; } sub stream_thread ($$) { my ($rootset, $ctx) = @_; my $inbox = $ctx->{-inbox}; - my $mime; my @q = map { (0, $_) } @$rootset; my $level; + my $smsg; while (@q) { $level = shift @q; my $node = shift @q or next; my $cl = $level + 1; unshift @q, map { ($cl, $_) } @{$node->{children}}; - $mime = $inbox->msg_by_smsg($node->{smsg}) and last; + $smsg = $inbox->smsg_mime($node->{smsg}) and last; } - return missing_thread($ctx) unless $mime; + return missing_thread($ctx) unless $smsg; $ctx->{-obfs_ibx} = $inbox->{obfuscate} ? $inbox : undef; - $mime = PublicInbox::MIME->new($mime); - $ctx->{-title_html} = ascii_html($mime->header('Subject')); - $ctx->{-html_tip} = thread_index_entry($ctx, $level, $mime); + $ctx->{-title_html} = ascii_html($smsg->subject); + $ctx->{-html_tip} = thread_index_entry($ctx, $level, $smsg); + $smsg = undef; PublicInbox::WwwStream->response($ctx, 200, sub { return unless $ctx; while (@q) { @@ -332,10 +391,8 @@ sub stream_thread ($$) { my $node = shift @q or next; my $cl = $level + 1; unshift @q, map { ($cl, $_) } @{$node->{children}}; - my $mid = $node->{id}; - if ($mime = $inbox->msg_by_smsg($node->{smsg})) { - $mime = PublicInbox::MIME->new($mime); - return thread_index_entry($ctx, $level, $mime); + if ($smsg = $inbox->smsg_mime($node->{smsg})) { + return thread_index_entry($ctx, $level, $smsg); } else { return ghost_index_entry($ctx, $level, $node); } @@ -372,7 +429,7 @@ sub thread_html { $ctx->{mapping} = {}; $ctx->{s_nr} = "$nr+ messages in thread"; - my $rootset = thread_results($msgs, $srch); + my $rootset = thread_results($ctx, $msgs); # reduce hash lookups in pre_thread->skel_dump my $inbox = $ctx->{-inbox}; @@ -383,24 +440,21 @@ sub thread_html { return stream_thread($rootset, $ctx) unless $ctx->{flat}; # flat display: lazy load the full message from smsg - my $mime; - while ($mime = shift @$msgs) { - $mime = $inbox->msg_by_smsg($mime) and last; + my $smsg; + while (my $m = shift @$msgs) { + $smsg = $inbox->smsg_mime($m) and last; } - return missing_thread($ctx) unless $mime; - $mime = PublicInbox::MIME->new($mime); - $ctx->{-title_html} = ascii_html($mime->header('Subject')); - $ctx->{-html_tip} = ''.index_entry($mime, $ctx, scalar @$msgs); - $mime = undef; + return missing_thread($ctx) unless $smsg; + $ctx->{-title_html} = ascii_html($smsg->subject); + $ctx->{-html_tip} = ''.index_entry($smsg, $ctx, scalar @$msgs); + $smsg = undef; PublicInbox::WwwStream->response($ctx, 200, sub { return unless $msgs; - while ($mime = shift @$msgs) { - $mime = $inbox->msg_by_smsg($mime) and last; - } - if ($mime) { - $mime = PublicInbox::MIME->new($mime); - return index_entry($mime, $ctx, scalar @$msgs); + $smsg = undef; + while (my $m = shift @$msgs) { + $smsg = $inbox->smsg_mime($m) and last; } + return index_entry($smsg, $ctx, scalar @$msgs) if $smsg; $msgs = undef; $skel; }); @@ -529,17 +583,26 @@ sub add_text_body { } sub _msg_html_prepare { - my ($hdr, $ctx, $obfs_ibx) = @_; + my ($hdr, $ctx, $more, $nr) = @_; my $srch = $ctx->{srch} if $ctx; my $atom = ''; - my $rv = ""; # anchor for body start - + my $obfs_ibx = $ctx->{-obfs_ibx}; + my $rv = ''; + my $mids = mids($hdr); + my $multiple = scalar(@$mids) > 1; # zero, one, infinity + if ($nr == 0) { + if ($more) { + $rv .= +"WARNING: multiple messages refer to this Message-ID\n"; + } + $rv .= ""; # anchor for body start + } else { + $rv .= ''; + } if ($srch) { $ctx->{-upfx} = '../'; } my @title; - my $mid = mid_clean($hdr->header_raw('Message-ID')); - $mid = PublicInbox::Hval->new_msgid($mid); foreach my $h (qw(From To Cc Subject Date)) { my $v = $hdr->header($h); defined($v) && ($v ne '') or next; @@ -564,8 +627,20 @@ sub _msg_html_prepare { } $title[0] ||= '(no subject)'; $ctx->{-title_html} = join(' - ', @title); - $rv .= 'Message-ID: <' . $mid->as_html . '> '; - $rv .= "(raw)\n"; + foreach (@$mids) { + my $mid = PublicInbox::Hval->new_msgid($_) ; + my $mhtml = $mid->as_html; + if ($multiple) { + my $href = $mid->{href}; + $rv .= "Message-ID: "; + $rv .= ""; + $rv .= "<$mhtml> "; + $rv .= "(raw)\n"; + } else { + $rv .= "Message-ID: <$mhtml> "; + $rv .= "(raw)\n"; + } + } $rv .= _parent_headers($hdr, $srch); $rv .= "\n"; } @@ -573,7 +648,7 @@ sub _msg_html_prepare { sub thread_skel { my ($dst, $ctx, $hdr, $tpfx) = @_; my $srch = $ctx->{srch}; - my $mid = mid_clean($hdr->header_raw('Message-ID')); + my $mid = mids($hdr)->[0]; my $sres = $srch->get_thread($mid); my $nr = $sres->{total}; my $expand = qq(expand[flat) . @@ -610,7 +685,7 @@ sub thread_skel { # reduce hash lookups in skel_dump my $ibx = $ctx->{-inbox}; $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef; - walk_thread(thread_results($sres, $srch), $ctx, *skel_dump); + walk_thread(thread_results($ctx, $sres), $ctx, *skel_dump); $ctx->{parent_msg} = $parent; } @@ -733,9 +808,9 @@ sub load_results { } sub thread_results { - my ($msgs, $srch) = @_; + my ($ctx, $msgs) = @_; require PublicInbox::SearchThread; - PublicInbox::SearchThread::thread($msgs, *sort_ts, $srch); + PublicInbox::SearchThread::thread($msgs, *sort_ds, $ctx->{-inbox}); } sub missing_thread { @@ -746,7 +821,7 @@ sub missing_thread { sub _msg_date { my ($hdr) = @_; - fmt_ts(msg_timestamp($hdr)); + fmt_ts(msg_datestamp($hdr)); } sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) } @@ -782,7 +857,7 @@ sub skel_dump { my $obfs_ibx = $ctx->{-obfs_ibx}; obfuscate_addrs($obfs_ibx, $f) if $obfs_ibx; - my $d = fmt_ts($smsg->{ts}) . ' ' . indent_for($level) . th_pfx($level); + my $d = fmt_ts($smsg->{ds}) . ' ' . indent_for($level) . th_pfx($level); my $attr = $f; $ctx->{first_level} ||= $level; @@ -863,10 +938,10 @@ sub _skel_ghost { $$dst .= $d; } -sub sort_ts { +sub sort_ds { [ sort { - (eval { $a->topmost->{smsg}->ts } || 0) <=> - (eval { $b->topmost->{smsg}->ts } || 0) + (eval { $a->topmost->{smsg}->ds } || 0) <=> + (eval { $b->topmost->{smsg}->ds } || 0) } @{$_[0]} ]; } @@ -876,22 +951,22 @@ sub acc_topic { my ($ctx, $level, $node) = @_; my $srch = $ctx->{srch}; my $mid = $node->{id}; - my $x = $node->{smsg} || $srch->lookup_mail($mid); - my ($subj, $ts); + 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); - $ts = $x->ts; + $ds = $x->ds; if ($level == 0) { - $topic = [ $ts, 1, { $subj => $mid }, $subj ]; + $topic = [ $ds, 1, { $subj => $mid }, $subj ]; $ctx->{-cur_topic} = $topic; push @{$ctx->{order}}, $topic; return; } $topic = $ctx->{-cur_topic}; # should never be undef - $topic->[0] = $ts if $ts > $topic->[0]; + $topic->[0] = $ds if $ds > $topic->[0]; $topic->[1]++; my $seen = $topic->[2]; if (scalar(@$topic) == 3) { # parent was a ghost @@ -910,7 +985,7 @@ sub acc_topic { sub dump_topics { my ($ctx) = @_; - my $order = delete $ctx->{order}; # [ ts, subj1, subj2, subj3, ... ] + my $order = delete $ctx->{order}; # [ ds, subj1, subj2, subj3, ... ] if (!@$order) { $ctx->{-html_tip} = '[No topics in range]'; return 404; @@ -923,14 +998,14 @@ sub dump_topics { # sort by recency, this allows new posts to "bump" old topics... foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) { - my ($ts, $n, $seen, $top, @ex) = @$topic; + my ($ds, $n, $seen, $top, @ex) = @$topic; @$topic = (); next unless defined $top; # ghost topic my $mid = delete $seen->{$top}; my $href = mid_escape($mid); my $prev_subj = [ split(/ /, $top) ]; $top = PublicInbox::Hval->new($top)->as_html; - $ts = fmt_ts($ts); + $ds = fmt_ts($ds); # $n isn't the total number of posts on the topic, # just the number of posts in the current results window @@ -946,7 +1021,7 @@ sub dump_topics { my $mbox = qq(mbox.gz); my $atom = qq(Atom); my $s = "$top\n" . - " $ts UTC $n - $mbox / $atom\n"; + " $ds UTC $n - $mbox / $atom\n"; for (my $i = 0; $i < scalar(@ex); $i += 2) { my $level = $ex[$i]; my $subj = $ex[$i + 1]; @@ -994,17 +1069,31 @@ sub index_nav { # callback for WwwStream sub index_topics { my ($ctx) = @_; my ($off) = (($ctx->{qp}->{o} || '0') =~ /(\d+)/); - my $opts = { offset => $off, limit => 200 }; + my $lim = 200; + my $opts = { offset => $off, limit => $lim }; $ctx->{order} = []; my $srch = $ctx->{srch}; - my $sres = $srch->query('', $opts); + + my $qs = ''; + # this complicated bit cuts loading time by over 400ms on my system: + if ($off == 0) { + my ($min, $max) = $ctx->{-inbox}->mm->minmax; + my $n = $max - $lim; + $n = $min if $n < $min; + for (; $qs eq '' && $n >= $min; --$n) { + my $smsg = $srch->lookup_article($n) or next; + $qs = POSIX::strftime('d:%Y%m%d..', gmtime($smsg->ts)); + } + } + + my $sres = $srch->query($qs, $opts); my $nr = scalar @{$sres->{msgs}}; if ($nr) { $sres = load_results($srch, $sres); - walk_thread(thread_results($sres, $srch), $ctx, *acc_topic); + walk_thread(thread_results($ctx, $sres), $ctx, *acc_topic); } - $ctx->{-next_o} = $off+ $nr; + $ctx->{-next_o} = $off + $nr; $ctx->{-cur_o} = $off; PublicInbox::WwwStream->response($ctx, dump_topics($ctx), *index_nav); }