Reply instructions:
+
+You may reply publically to this message via plain-text email
+using any one of the following methods:
+
+* Save the following mbox file, import it into your mail client,
+ and reply-to-all from there: mbox
+
+ Avoid top-posting and favor interleaved quoting:
+ $p_url
+$info
+* Reply to all the recipients using the --to, --cc,
+ and --in-reply-to switches of git-send-email(1):
- "".
- "You may reply publically to this message via\n".
- "plain-text email using any one of the following methods:\n\n" .
- "* Save the following mbox file, import it into your mail client,\n" .
- " and reply-to-all from there: mbox\n\n" .
- "* Reply to all the recipients using the --to, --cc,\n" .
- " and --in-reply-to switches of git-send-email(1):\n\n" .
- " git send-email \\\n " .
- join(" \\\n ", @$arg ). "\n\n" .
- qq( $se_url\n\n) .
- "* If your mail client supports setting the In-Reply-To" .
- " header\n via mailto: links, try the " .
- qq(mailto: link\n) .
- '
';
+ git send-email$arg
+
+ $se_url
+
+* If your mail client supports setting the In-Reply-To header
+ via mailto: links, try the mailto: link
+EOF
}
sub in_reply_to {
@@ -97,112 +117,206 @@ sub nr_to_s ($$$) {
# this is already inside a
sub index_entry {
- my ($mime, $state, $more) = @_;
- 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 = id_compress($mid_raw);
+ my $id = id_compress($mid_raw, 1);
my $id_m = 'm'.$id;
my $mid = PublicInbox::Hval->new_msgid($mid_raw);
- my $root_anchor = $state->{root_anchor} || '';
+ my $root_anchor = $ctx->{root_anchor} || '';
my $irt = in_reply_to($hdr);
- my $rv = ''.ascii_html($subj).'';
- $rv = "$rv" if $root_anchor eq $id_m;
- $rv .= "\n";
- $rv .= _th_index_lite($mid_raw, $irt, $id, $state);
+ my $rv = "* ";
+ $subj = ''.ascii_html($subj).'';
+ $subj = "$subj" if $root_anchor eq $id_m;
+ $rv .= $subj . "\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\n";
+ $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->new_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
- my $href = $mid->as_href;
- my $mhref = $ctx->{-upfx}.$href.'/';
msg_iter($mime, sub { $rv .= add_text_body($mhref, $_[0]) });
# add the footer
$rv .= "\n^ ".
"permalink" .
- " / raw" .
- " / reply";
- if (my $pct = $state->{pct}) { # used by SearchView.pm
- $rv .= " [relevance $pct->{$mid_raw}%]";
+ " raw" .
+ " reply";
+ if (my $pct = $ctx->{pct}) { # used by SearchView.pm
+ $rv .= "\t[relevance $pct->{$mid_raw}%]";
+ } elsif ($mapping) {
+ my $threaded = 'threaded';
+ my $flat = 'flat';
+ my $end = '';
+ if ($ctx->{flat}) {
+ $flat = "$flat";
+ } else {
+ $threaded = "$threaded";
+ }
+ $rv .= "\t[$flat";
+ $rv .= "|$threaded]";
+ $rv .= " $ctx->{s_nr}";
}
+
$rv .= $more ? "\n\n" : "\n";
}
+sub pad_link ($$;$) {
+ my ($mid, $level, $s) = @_;
+ $s ||= '...';
+ my $id = id_compress($mid, 1);
+ (' 'x19).indent_for($level).th_pfx($level)."($s)\n";
+}
+
sub _th_index_lite {
- my ($mid_raw, $irt, $id, $state) = @_;
+ my ($mid_raw, $irt, $id, $ctx) = @_;
my $rv = '';
- my $mapping = $state->{mapping} or return $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;
- $nr_s = 0 if $nr_s < 0;
$rv .= $pad . $irt_map->[1];
- my $idx = $map->[3];
if ($idx > 0) {
my $prev = $siblings->[$idx - 1];
- $rv .= $pad . $mapping->{$prev->messageid}->[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];
}
}
my $s_s = nr_to_s($nr_s, 'sibling', 'siblings');
my $s_c = nr_to_s($nr_c, 'reply', 'replies');
my $this = $map->[1];
$this =~ s!\n\z!\n!s;
- $this =~ s! !!s; # no point in duplicating subject
+ $this =~ s! !!s; # no point in duplicating subject
+ $this =~ s!]+>([^<]+)!$1!s; # no point linking to self
$rv .= "@ $this";
my $node = $map->[2];
if (my $child = $node->child) {
- $rv .= $pad . $mapping->{$child->messageid}->[1];
+ my $cmid = $child->messageid;
+ $rv .= $pad . $mapping->{$cmid}->[1];
+ if ($nr_c > 2) {
+ my $s = ($nr_c - 1). ' more replies';
+ $rv .= pad_link($cmid, $level + 1, $s);
+ } elsif (my $cn = $child->next) {
+ $rv .= $pad . $mapping->{$cn->messageid}->[1];
+ }
}
if (my $next = $node->next) {
- $rv .= $pad . $mapping->{$next->messageid}->[1];
+ my $nmid = $next->messageid;
+ $rv .= $pad . $mapping->{$nmid}->[1];
+ my $nnext = $nr_s - $idx;
+ if ($nnext > 2) {
+ my $s = ($nnext - 1).' subsequent siblings';
+ $rv .= pad_link($nmid, $level, $s);
+ } elsif (my $nn = $next->next) {
+ $rv .= $pad . $mapping->{$nn->messageid}->[1];
+ }
}
- $rv .= ".\t\t\t";
- $rv .= "($s_s, $s_c / ";
- my $upfx = $state->{ctx}->{-upfx};
- $rv .= qq{permalink / };
- $rv .= qq{raw)\n};
+ $rv .= $pad ."$s_s, $s_c; $ctx->{s_nr}\n";
}
sub walk_thread {
- my ($th, $state, $cb) = @_;
+ my ($th, $ctx, $cb) = @_;
my @q = map { (0, $_) } $th->rootset;
while (@q) {
my $level = shift @q;
my $node = shift @q or next;
- $cb->($state, $level, $node);
+ $cb->($ctx, $level, $node);
unshift @q, $level+1, $node->child, $level, $node->next;
}
}
sub pre_thread {
- my ($state, $level, $node) = @_;
- my $mapping = $state->{mapping};
+ my ($ctx, $level, $node) = @_;
+ my $mapping = $ctx->{mapping};
my $idx = -1;
if (my $parent = $node->parent) {
my $m = $mapping->{$parent->messageid}->[0];
$idx = scalar @$m;
push @$m, $node;
}
- $mapping->{$node->messageid} = [ [], '', $node, $idx ];
- skel_dump($state, $level, $node);
+ $mapping->{$node->messageid} = [ [], '', $node, $idx, $level ];
+ skel_dump($ctx, $level, $node);
+}
+
+sub thread_index_entry {
+ my ($ctx, $level, $mime) = @_;
+ my ($beg, $end) = thread_adj_level($ctx, $level);
+ $beg . '' . index_entry($mime, $ctx, 0) . '
' . $end;
+}
+
+sub stream_thread ($$) {
+ my ($th, $ctx) = @_;
+ my $inbox = $ctx->{-inbox};
+ my $mime;
+ my @q = map { (0, $_) } $th->rootset;
+ my $level;
+ while (@q) {
+ $level = shift @q;
+ my $node = shift @q or next;
+ unshift @q, $level+1, $node->child, $level, $node->next;
+ $mime = $inbox->msg_by_mid($node->messageid) and last;
+ }
+ return missing_thread($ctx) unless $mime;
+
+ $mime = Email::MIME->new($mime);
+ $ctx->{-title_html} = ascii_html($mime->header('Subject'));
+ $ctx->{-html_tip} = thread_index_entry($ctx, $level, $mime);
+ PublicInbox::WwwStream->response($ctx, 200, sub {
+ return unless $ctx;
+ while (@q) {
+ $level = shift @q;
+ my $node = shift @q or next;
+ unshift @q, $level+1, $node->child, $level, $node->next;
+ my $mid = $node->messageid;
+ if ($mime = $inbox->msg_by_mid($mid)) {
+ $mime = Email::MIME->new($mime);
+ return thread_index_entry($ctx, $level, $mime);
+ } else {
+ return ghost_index_entry($ctx, $level, $mid);
+ }
+ }
+ my $ret = join('', thread_adj_level($ctx, 0));
+ $ret .= ${$ctx->{dst}}; # skel
+ $ctx = undef;
+ $ret;
+ });
}
sub thread_html {
@@ -212,38 +326,41 @@ sub thread_html {
my $msgs = load_results($sres);
my $nr = $sres->{total};
return missing_thread($ctx) if $nr == 0;
- my $skel = '
';
+ my $skel = '
';
$skel .= $nr == 1 ? 'only message in thread' : 'end of thread';
- $skel .= ", back to index";
- $skel .= "\n$nr+ messages in thread: (download: ";
- $skel .= "mbox.gz";
+ $skel .= ", back to index\n\n";
+ $skel .= "Thread overview: ";
+ $skel .= $nr == 1 ? '(only message)' : "$nr+ messages";
+ $skel .= " (download: mbox.gz";
$skel .= " / follow: Atom feed)\n";
- my $state = {
- ctx => $ctx,
- cur_level => 0,
- dst => \$skel,
- mapping => {}, # mid -> [ reply count, from@date, node ];
- prev_attr => '',
- prev_level => 0,
- root_anchor => anchor_for($mid),
- seen => {},
- srch => $ctx->{srch},
- };
-
- walk_thread(thread_results($msgs), $state, *pre_thread);
-
- # lazy load the full message from mini_mime:
+ $skel .= "-- links below jump to the message on this page --\n";
+ $ctx->{-upfx} = '../../';
+ $ctx->{cur_level} = 0;
+ $ctx->{dst} = \$skel;
+ $ctx->{prev_attr} = '';
+ $ctx->{prev_level} = 0;
+ $ctx->{root_anchor} = anchor_for($mid);
+ $ctx->{seen} = {};
+ $ctx->{mapping} = {};
+ $ctx->{s_nr} = "$nr+ messages in thread";
+
+ my $th = thread_results($msgs);
+ walk_thread($th, $ctx, *pre_thread);
+ $skel .= '
';
+ return stream_thread($th, $ctx) unless $ctx->{flat};
+
+ # flat display: lazy load the full message from mini_mime:
my $inbox = $ctx->{-inbox};
my $mime;
while ($mime = shift @$msgs) {
$mime = $inbox->msg_by_mid(mid_clean(mid_mime($mime))) and last;
}
+ return missing_thread($ctx) unless $mime;
$mime = Email::MIME->new($mime);
- $ctx->{-upfx} = '../../';
$ctx->{-title_html} = ascii_html($mime->header('Subject'));
- $ctx->{-html_tip} = ''.index_entry($mime, $state, scalar @$msgs);
+ $ctx->{-html_tip} = ''.index_entry($mime, $ctx, scalar @$msgs);
$mime = undef;
- my $body = PublicInbox::WwwStream->new($ctx, sub {
+ PublicInbox::WwwStream->response($ctx, 200, sub {
return unless $msgs;
while ($mime = shift @$msgs) {
$mid = mid_clean(mid_mime($mime));
@@ -251,12 +368,11 @@ sub thread_html {
}
if ($mime) {
$mime = Email::MIME->new($mime);
- return index_entry($mime, $state, scalar @$msgs);
+ return index_entry($mime, $ctx, scalar @$msgs);
}
$msgs = undef;
- $skel .= '';
+ ''.$skel;
});
- [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ];
}
sub multipart_text_as_html {
@@ -406,11 +522,12 @@ sub thread_skel {
my $mid = mid_clean($hdr->header_raw('Message-ID'));
my $sres = $srch->get_thread($mid);
my $nr = $sres->{total};
- my $expand = qq(expand ) .
+ my $expand = qq(expand ) .
qq(/ mbox.gz ) .
qq(/ Atom feed);
my $parent = in_reply_to($hdr);
+ $$dst .= "\nThread overview: ";
if ($nr <= 1) {
if (defined $parent) {
$$dst .= "($expand)\n ";
@@ -427,16 +544,12 @@ sub thread_skel {
$$dst .= qq! / [top])\n!;
my $subj = $srch->subject_path($hdr->header('Subject'));
- my $state = {
- seen => { $subj => 1 },
- srch => $srch,
- cur => $mid,
- prev_attr => '',
- prev_level => 0,
- dst => $dst,
- };
- walk_thread(thread_results(load_results($sres)), $state, *skel_dump);
- $ctx->{next_msg} = $state->{next_msg};
+ $ctx->{seen} = { $subj => 1 };
+ $ctx->{cur} = $mid;
+ $ctx->{prev_attr} = '';
+ $ctx->{prev_level} = 0;
+ $ctx->{dst} = $dst;
+ walk_thread(thread_results(load_results($sres)), $ctx, *skel_dump);
$ctx->{parent_msg} = $parent;
}
@@ -446,7 +559,7 @@ sub _parent_headers {
my $irt = in_reply_to($hdr);
if (defined $irt) {
- my $v = PublicInbox::Hval->new_msgid($irt, 1);
+ my $v = PublicInbox::Hval->new_msgid($irt);
my $html = $v->as_html;
my $href = $v->as_href;
$rv .= "In-Reply-To: <";
@@ -532,21 +645,35 @@ sub html_footer {
if ($idx && $srch) {
$idx .= "\n";
thread_skel(\$idx, $ctx, $hdr, $tpfx);
- my $p = $ctx->{parent_msg};
- my $next = $ctx->{next_msg};
- if ($p) {
- $p = PublicInbox::Hval->new_msgid($p);
- $p = $p->as_href;
- $irt = "parent ";
- } else {
- $irt = ' ' x length('parent ');
+ my ($next, $prev);
+ my $parent = ' ';
+ $next = $prev = ' ';
+
+ if (my $n = $ctx->{next_msg}) {
+ $n = PublicInbox::Hval->new_msgid($n)->as_href;
+ $next = "next";
}
- if ($next) {
- my $n = PublicInbox::Hval->new_msgid($next)->as_href;
- $irt .= "next ";
- } else {
- $irt .= ' ' x length('next ');
+ my $u;
+ my $par = $ctx->{parent_msg};
+ if ($par) {
+ $u = PublicInbox::Hval->new_msgid($par)->as_href;
+ $u = "$upfx$u/";
}
+ if (my $p = $ctx->{prev_msg}) {
+ $prev = PublicInbox::Hval->new_msgid($p)->as_href;
+ if ($p && $par && $p eq $par) {
+ $prev = "prev parent';
+ $parent = '';
+ } else {
+ $prev = "prev';
+ $parent = " parent" if $u;
+ }
+ } elsif ($u) { # unlikely
+ $parent = " parent";
+ }
+ $irt = "$next $prev$parent ";
} else {
$irt = '';
}
@@ -556,7 +683,7 @@ sub html_footer {
}
sub linkify_ref_nosrch {
- my $v = PublicInbox::Hval->new_msgid($_[0], 1);
+ my $v = PublicInbox::Hval->new_msgid($_[0]);
my $html = $v->as_html;
my $href = $v->as_href;
"<$html>";
@@ -619,50 +746,49 @@ sub _msg_date {
sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
sub _skel_header {
- my ($state, $hdr, $level) = @_;
+ my ($ctx, $hdr, $level) = @_;
- my $dst = $state->{dst};
- my $cur = $state->{cur};
+ my $dst = $ctx->{dst};
+ my $cur = $ctx->{cur};
my $mid = mid_clean($hdr->header_raw('Message-ID'));
my $f = ascii_html($hdr->header('X-PI-From'));
my $d = _msg_date($hdr) . ' ' . indent_for($level) . th_pfx($level);
my $attr = $f;
- $state->{first_level} ||= $level;
+ $ctx->{first_level} ||= $level;
- if ($attr ne $state->{prev_attr} || $state->{prev_level} > $level) {
- $state->{prev_attr} = $attr;
- } else {
- $attr = '';
+ if ($attr ne $ctx->{prev_attr} || $ctx->{prev_level} > $level) {
+ $ctx->{prev_attr} = $attr;
}
- $state->{prev_level} = $level;
+ $ctx->{prev_level} = $level;
if ($cur) {
if ($cur eq $mid) {
- delete $state->{cur};
- $$dst .= $d;
- $$dst .= "".
+ delete $ctx->{cur};
+ $$dst .= "$d".
"$attr [this message]\n";
return;
+ } else {
+ $ctx->{prev_msg} = $mid;
}
} else {
- $state->{next_msg} ||= $mid;
+ $ctx->{next_msg} ||= $mid;
}
# 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 $s = $hdr->header('Subject');
- my $h = $state->{srch}->subject_path($s);
- if ($state->{seen}->{$h}) {
+ my $h = $ctx->{srch}->subject_path($s);
+ if ($ctx->{seen}->{$h}) {
$s = undef;
} else {
- $state->{seen}->{$h} = 1;
+ $ctx->{seen}->{$h} = 1;
$s = PublicInbox::Hval->new($s);
$s = $s->as_html;
}
my $m = PublicInbox::Hval->new_msgid($mid);
my $id = '';
- my $mapping = $state->{mapping};
+ my $mapping = $ctx->{mapping};
my $end = defined($s) ? "$s $f\n" : "$f\n";
if ($mapping) {
my $map = $mapping->{$mid};
@@ -671,19 +797,19 @@ sub _skel_header {
$map->[1] = "$d$end";
$id = "\nid=r".$id;
} else {
- $m = $state->{ctx}->{-upfx}.$m->as_href.'/';
+ $m = $ctx->{-upfx}.$m->as_href.'/';
}
$$dst .= $d . "" . $end;
}
sub skel_dump {
- my ($state, $level, $node) = @_;
+ my ($ctx, $level, $node) = @_;
if (my $mime = $node->message) {
- _skel_header($state, $mime->header_obj, $level);
+ _skel_header($ctx, $mime->header_obj, $level);
} else {
my $mid = $node->messageid;
- my $dst = $state->{dst};
- my $mapping = $state->{mapping};
+ my $dst = $ctx->{dst};
+ my $mapping = $ctx->{mapping};
my $map = $mapping->{$mid} if $mapping;
if ($mid eq 'subject dummy') {
my $ncp = "\t[no common parent]\n";
@@ -691,10 +817,10 @@ sub skel_dump {
$$dst .= $ncp;
return;
}
- my $d = $state->{pct} ? ' [irrelevant] ' # search result
- : ' [not found] ';
+ my $d = $ctx->{pct} ? ' [irrelevant] ' # search result
+ : ' [not found] ';
$d .= indent_for($level) . th_pfx($level);
- my $upfx = $state->{ctx}->{-upfx};
+ my $upfx = $ctx->{-upfx};
my $m = PublicInbox::Hval->new_msgid($mid);
my $href = $upfx . $m->as_href . '/';
my $html = $m->as_html;
@@ -724,102 +850,163 @@ sub _tryload_ghost ($$) {
}
# accumulate recent topics if search is supported
-# returns 1 if done, undef if not
-sub add_topic {
- my ($state, $level, $node) = @_;
- my $srch = $state->{srch};
+# returns 200 if done, 404 if not
+sub acc_topic {
+ my ($ctx, $level, $node) = @_;
+ my $srch = $ctx->{srch};
my $mid = $node->messageid;
my $x = $node->message || _tryload_ghost($srch, $mid);
my ($subj, $ts);
+ my $topic;
if ($x) {
$x = $x->header_obj;
- $subj = $x->header('Subject');
+ $subj = $x->header('Subject') || '';
$subj = $srch->subject_normalized($subj);
$ts = $x->header('X-PI-TS');
- } else { # ghost message, do not bump level
- $ts = -666;
- $subj = "<$mid>";
- }
- if (++$state->{subjs}->{$subj} == 1) {
- push @{$state->{order}}, [ $level, $subj ];
- }
- my $exist = $state->{latest}->{$subj};
- if (!$exist || $exist->[1] < $ts) {
- $state->{latest}->{$subj} = [ $mid, $ts ];
- }
-}
-
-sub emit_topics {
- my ($state) = @_;
- my $order = $state->{order};
- my $subjs = $state->{subjs};
- my $latest = $state->{latest};
- my $fh = $state->{fh};
- return $fh->write("\n[No topics in range]
") unless scalar @$order;
- my $pfx;
- my $prev = 0;
- my $prev_attr = '';
- my $cur;
- my @recent;
- while (defined(my $info = shift @$order)) {
- my ($level, $subj) = @$info;
- my $n = delete $subjs->{$subj};
- my ($mid, $ts) = @{delete $latest->{$subj}};
- $mid = PublicInbox::Hval->new_msgid($mid)->as_href;
- $pfx = indent_for($level);
- my $nl = $level == $prev ? "\n" : '';
- if ($nl && $cur) {
- push @recent, $cur;
- $cur = undef;
+ if ($level == 0) {
+ $topic = [ $ts, 1, { $subj => $mid }, $subj ];
+ $ctx->{-cur_topic} = $topic;
+ push @{$ctx->{order}}, $topic;
+ return;
}
- $cur ||= [ $ts, '' ];
- $cur->[0] = $ts if $ts > $cur->[0];
- $cur->[1] .= $nl . $pfx . th_pfx($level);
- if ($ts == -666) { # ghost
- $cur->[1] .= ghost_parent('', $mid) . "\n";
- next; # child will have mbox / atom link
+
+ $topic = $ctx->{-cur_topic}; # should never be undef
+ $topic->[0] = $ts if $ts > $topic->[0];
+ $topic->[1]++;
+ my $seen = $topic->[2];
+ if (scalar(@$topic) == 3) { # parent was a ghost
+ push @$topic, $subj;
+ } elsif (!$seen->{$subj}) {
+ push @$topic, $level, $subj;
}
+ $seen->{$subj} = $mid; # latest for subject
+ } else { # ghost message
+ return if $level != 0; # ignore child ghosts
+ $topic = [ -666, 0, {} ];
+ $ctx->{-cur_topic} = $topic;
+ push @{$ctx->{order}}, $topic;
+ }
+}
- $subj = PublicInbox::Hval->new($subj)->as_html;
- $cur->[1] .= "$subj\n";
+sub dump_topics {
+ my ($ctx) = @_;
+ my $order = delete $ctx->{order}; # [ ts, subj1, subj2, subj3, ... ]
+ if (!@$order) {
+ $ctx->{-html_tip} = '[No topics in range]
';
+ return 404;
+ }
+
+ my @out;
+
+ # 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;
+ @$topic = ();
+ next unless defined $top; # ghost topic
+ my $mid = delete $seen->{$top};
+ my $href = PublicInbox::Hval->new_msgid($mid)->as_href;
+ $top = PublicInbox::Hval->new($top)->as_html;
$ts = fmt_ts($ts);
- my $attr = " $ts UTC";
# $n isn't the total number of posts on the topic,
# just the number of posts in the current results window
- $n = $n == 1 ? '' : " ($n+ messages)";
-
- if ($level == 0 || $attr ne $prev_attr) {
- my $mbox = qq(mbox.gz);
- my $atom = qq(Atom);
- $pfx .= INDENT if $level > 0;
- $cur->[1] .= $pfx . $attr . $n . " - $mbox / $atom\n";
- $prev_attr = $attr;
+ my $anchor;
+ if ($n == 1) {
+ $n = '';
+ $anchor = '#u'; # top of only message
+ } else {
+ $n = " ($n+ messages)";
+ $anchor = '#t'; # thread skeleton
+ }
+
+ my $mbox = qq(mbox.gz);
+ my $atom = qq(Atom);
+ my $s = "$top\n" .
+ " $ts UTC $n - $mbox / $atom\n";
+ for (my $i = 0; $i < scalar(@ex); $i += 2) {
+ my $level = $ex[$i];
+ my $sub = $ex[$i + 1];
+ $mid = delete $seen->{$sub};
+ $sub = PublicInbox::Hval->new($sub)->as_html;
+ $href = PublicInbox::Hval->new_msgid($mid)->as_href;
+ $s .= indent_for($level) . TCHILD;
+ $s .= "$sub\n";
}
+ push @out, $s;
}
- push @recent, $cur if $cur;
- @recent = map { $_->[1] } sort { $b->[0] <=> $a->[0] } @recent;
- $fh->write(join('', @recent) . '');
-}
-
-sub emit_index_topics {
- my ($state) = @_;
- my ($off) = (($state->{ctx}->{cgi}->param('o') || '0') =~ /(\d+)/);
- $state->{order} = [];
- $state->{subjs} = {};
- $state->{latest} = {};
- my $max = 25;
- my %opts = ( offset => $off, limit => $max * 4 );
- while (scalar @{$state->{order}} < $max) {
- my $sres = $state->{srch}->query('', \%opts);
- my $nr = scalar @{$sres->{msgs}} or last;
+ $ctx->{-html_tip} = '' . join("\n", @out) . '';
+ 200;
+}
+
+sub index_nav { # callback for WwwStream
+ my (undef, $ctx) = @_;
+ delete $ctx->{qp} or return;
+ my ($next, $prev);
+ $next = $prev = ' ';
+ my $latest = '';
+
+ my $next_o = $ctx->{-next_o};
+ if ($next_o) {
+ $next = qq!next!;
+ }
+ if (my $cur_o = $ctx->{-cur_o}) {
+ $latest = qq! latest!;
+
+ my $o = $cur_o - ($next_o - $cur_o);
+ if ($o > 0) {
+ $prev = qq!prev!;
+ } elsif ($o == 0) {
+ $prev = qq!prev!;
+ }
+ }
+ "
page: $next $prev$latest
";
+}
+
+sub index_topics {
+ my ($ctx) = @_;
+ my ($off) = (($ctx->{qp}->{o} || '0') =~ /(\d+)/);
+ my $opts = { offset => $off, limit => 200 };
+
+ $ctx->{order} = [];
+ my $sres = $ctx->{srch}->query('', $opts);
+ my $nr = scalar @{$sres->{msgs}};
+ if ($nr) {
$sres = load_results($sres);
- walk_thread(thread_results($sres), $state, *add_topic);
- $opts{offset} += $nr;
+ walk_thread(thread_results($sres), $ctx, *acc_topic);
+ }
+ $ctx->{-next_o} = $off+ $nr;
+ $ctx->{-cur_o} = $off;
+ PublicInbox::WwwStream->response($ctx, dump_topics($ctx), *index_nav);
+}
+
+sub thread_adj_level {
+ my ($ctx, $level) = @_;
+
+ my $max = $ctx->{cur_level};
+ if ($level <= 0) {
+ return ('', '') if $max == 0; # flat output
+
+ # reset existing lists
+ my $beg = $max > 1 ? ('' x ($max - 1)) : '';
+ $ctx->{cur_level} = 0;
+ ("$beg", '');
+ } elsif ($level == $max) { # continue existing list
+ qw( );
+ } elsif ($level < $max) {
+ my $beg = $max > 1 ? ('' x ($max - $level)) : '';
+ $ctx->{cur_level} = $level;
+ ("$beg", '');
+ } else { # ($level > $max) # start a new level
+ $ctx->{cur_level} = $level;
+ my $beg = ($max ? '' : '') . '- ';
+ ($beg, '
');
}
+}
- emit_topics($state);
- $opts{offset};
+sub ghost_index_entry {
+ my ($ctx, $level, $mid) = @_;
+ my ($beg, $end) = thread_adj_level($ctx, $level);
+ $beg . '
'. ghost_parent($ctx->{-upfx}, $mid) . '' . $end;
}
1;