@ $attr";
+ $rv .= "@ $attr \n";
if ($nr_c) {
my $cmid = $children->[0] ? $children->[0]->{mid} : undef;
$rv .= $pad . _skel_hdr($mapping, $cmid);
@@ -386,7 +387,8 @@ sub pre_thread { # walk_thread callback
sub thread_eml_entry {
my ($ctx, $eml) = @_;
my ($beg, $end) = thread_adj_level($ctx, $ctx->{level});
- $beg . '' . eml_entry($ctx, $eml) . ' ' . $end;
+ $ctx->zmore($beg.'');
+ eml_entry($ctx, $eml) . ' ' . $end;
}
sub next_in_queue ($$) {
@@ -429,8 +431,8 @@ sub stream_thread_i { # PublicInbox::WwwStream::getline callback
sub stream_thread ($$) {
my ($rootset, $ctx) = @_;
- $ctx->{-queue} = [ map { (0, $_) } @$rootset ];
- PublicInbox::WwwStream::aresponse($ctx, 200, \&stream_thread_i);
+ @{$ctx->{-queue}} = map { (0, $_) } @$rootset;
+ PublicInbox::WwwStream::aresponse($ctx, \&stream_thread_i);
}
# /$INBOX/$MSGID/t/ and /$INBOX/$MSGID/T/
@@ -481,7 +483,7 @@ EOF
# flat display: lazy load the full message from smsg
$ctx->{msgs} = $msgs;
$ctx->{-html_tip} = '';
- PublicInbox::WwwStream::aresponse($ctx, 200, \&thread_html_i);
+ PublicInbox::WwwStream::aresponse($ctx, \&thread_html_i);
}
sub thread_html_i { # PublicInbox::WwwStream::getline callback
@@ -503,26 +505,14 @@ sub thread_html_i { # PublicInbox::WwwStream::getline callback
}
}
-sub multipart_text_as_html {
- # ($mime, $ctx) = @_; # each_part may do "$_[0] = undef"
-
- # scan through all parts, looking for displayable text
- $_[0]->each_part(\&add_text_body, $_[1], 1);
-}
-
sub submsg_hdr ($$) {
my ($ctx, $eml) = @_;
- my $obfs_ibx = $ctx->{-obfs_ibx};
- my $rv = $ctx->{obuf};
- $$rv .= "\n";
+ my $s = "\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";
- }
+ $s .= "$h: $_\n" for $eml->header($h);
}
+ obfuscate_addrs($ctx->{-obfs_ibx}, $s) if $ctx->{-obfs_ibx};
+ ascii_html($s);
}
sub attach_link ($$$$;$) {
@@ -533,7 +523,6 @@ sub attach_link ($$$$;$) {
# downloads for 0-byte multipart attachments
return unless $part->{bdy};
- my $nl = $idx eq '1' ? '' : "\n"; # like join("\n", ...)
my $size = length($part->body);
delete $part->{bdy}; # save memory
@@ -549,23 +538,17 @@ sub attach_link ($$$$;$) {
} else {
$sfn = 'a.bin';
}
- my $rv = $ctx->{obuf};
- $$rv .= qq($nl{mhref}$idx-$sfn">);
- if ($err) {
- $$rv .= <{mhref}$idx-$sfn">);
+ $rv .= <header('Content-Description') // $fn // '';
- $desc = ascii_html($desc);
- $$rv .= ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]";
- $$rv .= " \n";
-
- submsg_hdr($ctx, $part) if $part->{is_submsg};
-
- undef;
+ $rv .= ascii_html($desc)." --]\n[-- " if $desc ne '';
+ $rv .= "Type: $ct, Size: $size bytes --]\n";
+ $rv .= submsg_hdr($ctx, $part) if $part->{is_submsg};
+ $rv;
}
sub add_text_body { # callback for each_part
@@ -577,12 +560,11 @@ sub add_text_body { # callback for each_part
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($ctx, $ct, $p, $fn) unless defined $s;
-
my $rv = $ctx->{obuf};
+ my ($s, $err) = msg_part_text($part, $ct);
+ $s // return $$rv .= (attach_link($ctx, $ct, $p, $fn) // '');
if ($part->{is_submsg}) {
- submsg_hdr($ctx, $part);
+ $$rv .= submsg_hdr($ctx, $part);
$$rv .= "\n";
}
@@ -632,7 +614,7 @@ sub add_text_body { # callback for each_part
undef $s; # free memory
if (defined($fn) || ($depth > 0 && !$part->{is_submsg}) || $err) {
# badly-encoded message with $err? tell the world about it!
- attach_link($ctx, $ct, $p, $fn, $err);
+ $$rv .= attach_link($ctx, $ct, $p, $fn, $err);
$$rv .= "\n";
}
delete $part->{bdy}; # save memory
@@ -653,89 +635,97 @@ sub add_text_body { # callback for each_part
}
}
-sub _msg_page_prepare_obuf {
+sub _msg_page_prepare {
my ($eml, $ctx) = @_;
- my $over = $ctx->{ibx}->over;
- my $obfs_ibx = $ctx->{-obfs_ibx};
- my $rv = '';
+ my $have_over = !!$ctx->{ibx}->over;
my $mids = mids_for_index($eml);
my $nr = $ctx->{nr}++;
if ($nr) { # unlikely
if ($ctx->{chash} eq content_hash($eml)) {
warn "W: BUG? @$mids not deduplicated properly\n";
- return \$rv;
+ return;
}
- $rv .=
-"WARNING: multiple messages have this Message-ID\n ";
- $rv .= '';
+ $ctx->{-html_tip} =
+"WARNING: multiple messages have this Message-ID\n ";
} else {
$ctx->{first_hdr} = $eml->header_obj;
$ctx->{chash} = content_hash($eml) if $ctx->{smsg}; # reused MID
- $rv .= ""; # anchor for body start
+ $ctx->{-html_tip} = ""; # anchor for body start
}
- $ctx->{-upfx} = '../' if $over;
+ $ctx->{-upfx} = '../';
my @title; # (Subject[0], From[0])
+ my $hbuf = '';
for my $v ($eml->header('From')) {
my @n = PublicInbox::Address::names($v);
- $v = ascii_html($v);
- $title[1] //= ascii_html(join(', ', @n));
- if ($obfs_ibx) {
- obfuscate_addrs($obfs_ibx, $v);
- obfuscate_addrs($obfs_ibx, $title[1]);
- }
- $rv .= "From: $v\n" if $v ne '';
+ $title[1] //= join(', ', @n);
+ $hbuf .= "From: $v\n" if $v ne '';
}
- foreach my $h (qw(To Cc)) {
+ for my $h (qw(To Cc)) {
for my $v ($eml->header($h)) {
fold_addresses($v);
- $v = ascii_html($v);
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
- $rv .= "$h: $v\n" if $v ne '';
+ $hbuf .= "$h: $v\n" if $v ne '';
}
}
my @subj = $eml->header('Subject');
- if (@subj) {
- my $v = ascii_html(shift @subj);
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
- $rv .= 'Subject: ';
- $rv .= $over ? qq($v \n) : "$v\n";
- $title[0] = $v;
- for $v (@subj) { # multi-Subject message :<
- $v = ascii_html($v);
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
- $rv .= "Subject: $v\n";
- }
- } else { # dummy anchor for thread skeleton at bottom of page
- $rv .= qq( ) if $over;
- $title[0] = '(no subject)';
- }
- for my $v ($eml->header('Date')) {
- $v = ascii_html($v);
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; # possible :P
- $rv .= qq{Date: $v\t[thread overview] \n};
+ $hbuf .= "Subject: $_\n" for @subj;
+ $title[0] = $subj[0] // '(no subject)';
+ $hbuf .= "Date: $_\n" for $eml->header('Date');
+ $hbuf = ascii_html($hbuf);
+ $ctx->{-title_html} = ascii_html(join(' - ', @title));
+ if (my $obfs_ibx = $ctx->{-obfs_ibx}) {
+ obfuscate_addrs($obfs_ibx, $hbuf);
+ obfuscate_addrs($obfs_ibx, $ctx->{-title_html});
}
- if (!$nr) { # first (and only) message, common case
- $ctx->{-title_html} = join(' - ', @title);
- $rv = $ctx->html_top . $rv;
+
+ # [thread overview] link is typically added after Date,
+ # but added after Subject, or even nothing.
+ if ($have_over) {
+ chop $hbuf; # drop "\n", or noop if $rv eq ''
+ $hbuf .= qq{\t[thread overview] \n};
+ $hbuf =~ s!^Subject:\x20(.*?)(\n[A-Z]|\z)
+ !Subject: $1 $2!msx or
+ $hbuf .= qq( );
}
if (scalar(@$mids) == 1) { # common case
- my $mhtml = ascii_html($mids->[0]);
- $rv .= "Message-ID: <$mhtml> ";
- $rv .= "(raw )\n";
+ my $x = ascii_html($mids->[0]);
+ $hbuf .= qq[Message-ID: <$x> (raw )\n];
+ }
+ if (!$nr) { # first (and only) message, common case
+ $ctx->zmore($ctx->html_top, $hbuf);
} else {
+ delete $ctx->{-title_html};
+ $ctx->zmore($ctx->{-html_tip}, $hbuf);
+ }
+ $ctx->{-linkify} //= PublicInbox::Linkify->new;
+ $hbuf = '';
+ if (scalar(@$mids) != 1) { # unlikely, but it happens :<
# X-Alt-Message-ID can happen if a message is injected from
# public-inbox-nntpd because of multiple Message-ID headers.
- my $lnk = PublicInbox::Linkify->new;
- my $s = '';
for my $h (qw(Message-ID X-Alt-Message-ID)) {
- $s .= "$h: $_\n" for ($eml->header_raw($h));
+ $hbuf .= "$h: $_\n" for ($eml->header_raw($h));
}
- $lnk->linkify_mids('..', \$s, 1);
- $rv .= $s;
+ $ctx->{-linkify}->linkify_mids('..', \$hbuf, 1); # escapes HTML
+ $ctx->zmore($hbuf);
+ $hbuf = '';
}
- $rv .= _parent_headers($eml, $over);
- $rv .= "\n";
- \$rv;
+ my @irt = $eml->header_raw('In-Reply-To');
+ my $refs;
+ if (!@irt) {
+ $refs = references($eml);
+ $irt[0] = pop(@$refs) if scalar @$refs;
+ }
+ $hbuf .= "In-Reply-To: $_\n" for @irt;
+
+ # do not display References: if search is present,
+ # we show the thread skeleton at the bottom, instead.
+ if (!$have_over) {
+ $refs //= references($eml);
+ $hbuf .= 'References: <'.join(">\n\t<", @$refs).">\n" if @$refs;
+ }
+ $ctx->{-linkify}->linkify_mids('..', \$hbuf); # escapes HTML
+ $ctx->zmore($hbuf .= "\n");
+ ${$ctx->{obuf}} = ''; # TODO remove
+ 1;
}
sub SKEL_EXPAND () {
@@ -772,7 +762,6 @@ sub thread_skel ($$$) {
# when multiple Subject: headers are present, so we follow suit:
my $subj = $hdr->header('Subject') // '';
$subj = '(no subject)' if $subj eq '';
- $ctx->{prev_subj} = [ split(/ /, subject_normalized($subj)) ];
$ctx->{cur} = $mid;
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
@@ -785,50 +774,40 @@ sub thread_skel ($$$) {
$ctx->{parent_msg} = $parent;
}
-sub _parent_headers {
- my ($hdr, $over) = @_;
- my $rv = '';
- my @irt = $hdr->header_raw('In-Reply-To');
- my $refs;
- if (@irt) {
- my $lnk = PublicInbox::Linkify->new;
- $rv .= "In-Reply-To: $_\n" for @irt;
- $lnk->linkify_mids('..', \$rv);
- } else {
- $refs = references($hdr);
- my $irt = pop @$refs;
- if (defined $irt) {
- my $html = ascii_html($irt);
- my $href = mid_href($irt);
- $rv .= "In-Reply-To: <";
- $rv .= "$html >\n";
- }
- }
-
- # do not display References: if search is present,
- # we show the thread skeleton at the bottom, instead.
- return $rv if $over;
-
- $refs //= references($hdr);
- if (@$refs) {
- @$refs = map { linkify_ref_no_over($_) } @$refs;
- $rv .= 'References: '. join("\n\t", @$refs) . "\n";
- }
- $rv;
-}
-
-# returns a string buffer
+# appends to obuf
sub html_footer {
my ($ctx, $hdr) = @_;
- my $ibx = $ctx->{ibx};
my $upfx = '../';
- my $skel;
- my $rv = '';
- if ($ibx->over) {
+ my ($related, $skel);
+ my $qry = delete $ctx->{-qry};
+ if ($qry && $ctx->{ibx}->isrch) {
+ my $q = ''; # search for either ancestor or descendent patches
+ for (@{$qry->{dfpre}}, @{$qry->{dfpost}}) {
+ chop if length > 7; # include 1 abbrev "older" patches
+ $q .= "dfblob:$_ ";
+ }
+ chop $q; # omit trailing SP
+ local $Text::Wrap::columns = COLS;
+ local $Text::Wrap::huge = 'overflow';
+ $q = wrap('', '', $q);
+ my $rows = ($q =~ tr/\n/\n/) + 1;
+ $q = ascii_html($q);
+ $related = <find likely ancestor, descendant, or conflicting patches for this message :
+
+ \t(help )
+EOM
+ }
+ if ($ctx->{ibx}->over) {
my $t = ts2str($ctx->{-t_max});
my $t_fmt = fmt_ts($ctx->{-t_max});
- $skel .= <\t";
+ $skel = <~$t_fmt UTC|newest ]
EOF
@@ -862,21 +841,15 @@ EOF
} elsif ($u) { # unlikely
$parent = " parent ";
}
- $rv .= "$next $prev$parent ";
+ ${$ctx->{obuf}} .= "$next $prev$parent ";
} else { # unindexed inboxes w/o over
+ ${$ctx->{obuf}} .= '';
$skel = qq( latest );
}
- $rv .= qq(reply );
- $rv .= $skel;
- $rv .= ' ';
- $rv .= msg_reply($ctx, $hdr);
-}
-
-sub linkify_ref_no_over {
- my ($mid) = @_;
- my $href = mid_href($mid);
- my $html = ascii_html($mid);
- "<$html >";
+ ${$ctx->{obuf}} .= qq(reply );
+ # $skel may be big for big threads, don't append it to obuf
+ $skel .= ' ' . ($related // '');
+ $ctx->zmore($skel .= msg_reply($ctx, $hdr)); # flushes obuf
}
sub ghost_parent {
@@ -1131,9 +1104,10 @@ sub dump_topics {
}
my @out;
- my $ibx = $ctx->{ibx};
- my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
-
+ my $obfs_ibx = $ctx->{ibx}->{obfuscate} ? $ctx->{ibx} : undef;
+ if (my $note = delete $ctx->{t_note}) {
+ push @out, $note; # "messages from ... to ..."
+ }
# sort by recency, this allows new posts to "bump" old topics...
foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) {
my ($ds, $n, $seen, $top_subj, @extra) = @$topic;
@@ -1158,9 +1132,9 @@ sub dump_topics {
my $s = "$top_subj \n" .
" $ds UTC $n\n";
- for (my $i = 0; $i < scalar(@extra); $i += 2) {
- my $level = $extra[$i];
- my $subj = $extra[$i + 1]; # already normalized
+ while (@extra) {
+ my $level = shift @extra;
+ my $subj = shift @extra; # already normalized
$mid = delete $seen->{$subj};
my @subj = split(/ /, $subj);
my @next_prev = @subj; # full copy
@@ -1192,7 +1166,7 @@ sub pagination_footer ($$) {
$next = $next ? "$next | " : ' | ';
$prev .= qq[ | latest ];
}
- "page: $next$prev ";
+ ($next || $prev) ? "page: $next$prev " : '';
}
sub paginate_recent ($$) {
@@ -1207,23 +1181,30 @@ sub paginate_recent ($$) {
$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->{ibx};
- my $msgs = $ibx->recent($opts, $after, $before);
- my $nr = scalar @$msgs;
- if ($nr < $lim && defined($after)) {
+ my $msgs = $ctx->{ibx}->over->recent($opts, $after, $before);
+ if (defined($after) && scalar(@$msgs) < $lim) {
$after = $before = undef;
- $msgs = $ibx->recent($opts);
- $nr = scalar @$msgs;
+ $msgs = $ctx->{ibx}->over->recent($opts);
}
- my $more = $nr == $lim;
+ my $more = scalar(@$msgs) == $lim;
my ($newest, $oldest);
- if ($nr) {
+ if (@$msgs) {
$newest = $msgs->[0]->{ts};
$oldest = $msgs->[-1]->{ts};
# if we only had $after, our SQL query in ->recent ordered
if ($newest < $oldest) {
($oldest, $newest) = ($newest, $oldest);
- $more = 0 if defined($after) && $after < $oldest;
+ $more = undef if defined($after) && $after < $oldest;
+ }
+ if (defined($after // $before)) {
+ my $n = strftime('%Y-%m-%d %H:%M:%S', gmtime($newest));
+ my $o = strftime('%Y-%m-%d %H:%M:%S', gmtime($oldest));
+ $ctx->{t_note} = <more...]
+EOM
+ my $s = ts2str($newest);
+ $ctx->{prev_page} = qq[] .
+ 'prev (newer) ';
}
}
if (defined($oldest) && $more) {
@@ -1231,11 +1212,6 @@ sub paginate_recent ($$) {
$ctx->{next_page} = qq[] .
'next (older) ';
}
- if (defined($newest) && (defined($before) || defined($after))) {
- my $s = ts2str($newest);
- $ctx->{prev_page} = qq[] .
- 'prev (newer) ';
- }
$msgs;
}
@@ -1243,11 +1219,8 @@ sub paginate_recent ($$) {
sub index_topics {
my ($ctx) = @_;
my $msgs = paginate_recent($ctx, 200); # 200 is our window
- if (@$msgs) {
- walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic);
- }
- html_oneshot($ctx, dump_topics($ctx), \pagination_footer($ctx, '.'));
-
+ walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic) if @$msgs;
+ html_oneshot($ctx, dump_topics($ctx), pagination_footer($ctx, '.'));
}
sub thread_adj_level {