X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=52d37a9ff690dbb32cc501ef0867137e0bc3b9fb;hb=5ca29b7f2789517f0a41f1482509f504b8b601e1;hp=9846fa4779c6286611bae99301cd68b39b4c5e15;hpb=a66a2eddda8ffbb7679f4ef80dba7c7d377cda84;p=public-inbox.git
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 9846fa47..52d37a9f 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -20,6 +20,7 @@ use PublicInbox::WwwStream qw(html_oneshot);
use PublicInbox::Reply;
use PublicInbox::ViewDiff qw(flush_diff);
use PublicInbox::Eml;
+use POSIX qw(strftime);
use Time::Local qw(timegm);
use PublicInbox::Smsg qw(subject_normalized);
use PublicInbox::ContentHash qw(content_hash);
@@ -37,14 +38,12 @@ sub msg_page_i {
: $ctx->gone('over');
$ctx->{mhref} = ($ctx->{nr} || $ctx->{smsg}) ?
"../${\mid_href($smsg->{mid})}/" : '';
- my $obuf = $ctx->{obuf} = _msg_page_prepare_obuf($eml, $ctx);
- if (length($$obuf)) {
- multipart_text_as_html($eml, $ctx);
- $$obuf .= '';
+ if (_msg_page_prepare($eml, $ctx)) {
+ $eml->each_part(\&add_text_body, $ctx, 1);
+ $ctx->zmore('');
}
- delete $ctx->{obuf};
- $$obuf .= html_footer($ctx, $ctx->{first_hdr}) if !$ctx->{smsg};
- $$obuf;
+ html_footer($ctx, $ctx->{first_hdr}) if !$ctx->{smsg};
+ delete($ctx->{obuf}) // \'';
} else { # called by WwwStream::async_next or getline
$ctx->{smsg}; # may be undef
}
@@ -57,14 +56,12 @@ sub no_over_html ($) {
my $eml = PublicInbox::Eml->new($bref);
$ctx->{mhref} = '';
PublicInbox::WwwStream::init($ctx);
- my $obuf = $ctx->{obuf} = _msg_page_prepare_obuf($eml, $ctx);
- if (length($$obuf)) {
- multipart_text_as_html($eml, $ctx);
- $$obuf .= '';
+ if (_msg_page_prepare($eml, $ctx)) { # sets {-title_html}
+ $eml->each_part(\&add_text_body, $ctx, 1);
+ $ctx->zmore('');
}
- delete $ctx->{obuf};
- eval { $$obuf .= html_footer($ctx, $eml) };
- html_oneshot($ctx, 200, $$obuf);
+ html_footer($ctx, $eml);
+ $ctx->html_done;
}
# public functions: (unstable)
@@ -83,7 +80,7 @@ sub msg_page {
# allow user to easily browse the range around this message if
# they have ->over
$ctx->{-t_max} = $smsg->{ts};
- PublicInbox::WwwStream::aresponse($ctx, 200, \&msg_page_i);
+ PublicInbox::WwwStream::aresponse($ctx, \&msg_page_i);
}
# /$INBOX/$MESSAGE_ID/#R
@@ -247,13 +244,13 @@ sub eml_entry {
# scan through all parts, looking for displayable text
$ctx->{mhref} = $mhref;
- $ctx->{end_id} = "e$id";
+ $ctx->{changed_href} = "#e$id"; # for diffstat "files? changed,"
$ctx->{obuf} = \$rv;
- $eml->each_part(\&add_text_body, $ctx, 1);
- delete $ctx->{obuf};
+ $eml->each_part(\&add_text_body, $ctx, 1); # expensive
+ $ctx->zmore; # TODO: remove once add_text_body is updated
# add the footer
- $rv .= "\n^ ".
+ $rv = "\n^ ".
"permalink" .
" raw" .
" reply";
@@ -305,8 +302,7 @@ sub _th_index_lite {
my $rv = '';
my $mapping = $ctx->{mapping} or return $rv;
my $pad = ' ';
- my $mid_map = $mapping->{$mid_raw};
- defined $mid_map or
+ my $mid_map = $mapping->{$mid_raw} //
return 'public-inbox BUG: '.ascii_html($mid_raw).' not mapped';
my ($attr, $node, $idx, $level) = @$mid_map;
my $children = $node->{children};
@@ -338,10 +334,10 @@ sub _th_index_lite {
}
my $s_s = nr_to_s($nr_s, 'sibling', 'siblings');
my $s_c = nr_to_s($nr_c, 'reply', 'replies');
- $attr =~ s!\n\z!\n!s;
+ chop $attr; # remove "\n"
$attr =~ s! (?:" )?!!s; # no point in dup subject
$attr =~ s!]+>([^<]+)!$1!s; # no point linking to self
- $rv .= "@ $attr";
+ $rv .= "@ $attr\n";
if ($nr_c) {
my $cmid = $children->[0] ? $children->[0]->{mid} : undef;
$rv .= $pad . _skel_hdr($mapping, $cmid);
@@ -391,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 ($$) {
@@ -435,7 +432,7 @@ 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);
+ PublicInbox::WwwStream::aresponse($ctx, \&stream_thread_i);
}
# /$INBOX/$MSGID/t/ and /$INBOX/$MSGID/T/
@@ -486,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
@@ -508,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 ($$$$;$) {
@@ -538,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
@@ -554,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
@@ -582,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";
}
@@ -637,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
@@ -658,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 () {
@@ -777,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;
@@ -790,45 +774,11 @@ 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 $upfx = '../';
- my $skel;
- my $rv = '
';
- my $related;
+ my ($related, $skel);
my $qry = delete $ctx->{-qry};
if ($qry && $ctx->{ibx}->isrch) {
my $q = ''; # search for either ancestor or descendent patches
@@ -849,7 +799,7 @@ action=$upfx
href=#t>this message:
\t(help)