From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <normalperson@yhbt.net>
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN: 
X-Spam-Status: No, score=-3.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00,
 T_RP_MATCHES_RCVD,URIBL_BLOCKED shortcircuit=no autolearn=unavailable
 version=3.3.2
X-Original-To: meta@public-inbox.org
Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net
 (Postfix) with ESMTP id 087751FD24 for <meta@public-inbox.org>; Wed,  2 Sep
 2015 06:59:42 +0000 (UTC)
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/7] view: optional flat view for recent messages
Date: Wed,  2 Sep 2015 06:59:34 +0000
Message-Id: <1441177179-16628-3-git-send-email-e@80x24.org>
In-Reply-To: <1441177179-16628-1-git-send-email-e@80x24.org>
References: <1441177179-16628-1-git-send-email-e@80x24.org>
List-Id: <meta@public-inbox.org>

For still-active threads, it will likely be easier to follow
them chronologically, especially if we have links to parent
messages.
---
 lib/PublicInbox/View.pm | 67 ++++++++++++++++++++++++++++++++++---------------
 lib/PublicInbox/WWW.pm  |  3 +++
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 1eb12a9..a3df319 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -81,7 +81,8 @@ sub index_entry {
 		$anchor = $seen->{$anchor_idx};
 	}
 	if ($srch) {
-		$subj = "<a\nhref=\"${path}$href/t/#u\">$subj</a>";
+		my $t = $ctx->{flat} ? 'T' : 't';
+		$subj = "<a\nhref=\"${path}$href/$t/#u\">$subj</a>";
 	}
 	if ($root_anchor && $root_anchor eq $id) {
 		$subj = "<u\nid=\"u\">$subj</u>";
@@ -103,7 +104,9 @@ sub index_entry {
 
 	my ($fhref, $more_ref);
 	my $mhref = "${path}$href/";
-	if ($level > 0) {
+
+	# show full messages at level == 0 in threaded view
+	if ($level > 0 || ($ctx->{flat} && $root_anchor ne $id)) {
 		$fhref = "${path}$href/f/";
 		$more_ref = \$more;
 	}
@@ -126,6 +129,15 @@ sub index_entry {
 		}
 		$rv .= " <a\nhref=\"$anchor\">parent</a>";
 	}
+	if ($srch) {
+		if ($ctx->{flat}) {
+			$rv .= " [<a\nhref=\"${path}$href/t/#u\">threaded</a>" .
+				"|<b>flat</b>]";
+		} else {
+			$rv .= " [<b>threaded</b>|" .
+				"<a\nhref=\"${path}$href/T/#u\">flat</a>]";
+		}
+	}
 
 	$fh->write($rv .= '</pre></td></tr></table>');
 }
@@ -144,19 +156,24 @@ sub emit_thread_html {
 	my $msgs = load_results($res);
 	my $nr = scalar @$msgs;
 	return missing_thread($cb) if $nr == 0;
+	my $flat = $ctx->{flat};
 	my $orig_cb = $cb;
-	my $th = thread_results($msgs);
 	my $state = {
 		ctx => $ctx,
 		seen => {},
 		root_anchor => anchor_for($mid),
 		anchor_idx => 0,
 	};
-	{
-		require PublicInbox::GitCatFile;
-		my $git = PublicInbox::GitCatFile->new($ctx->{git_dir});
+
+	require PublicInbox::GitCatFile;
+	my $git = PublicInbox::GitCatFile->new($ctx->{git_dir});
+	if ($flat) {
+		__thread_entry(\$cb, $git, $state, $_, 0) for (@$msgs);
+	} else {
+		my $th = thread_results($msgs);
 		thread_entry(\$cb, $git, $state, $_, 0) for $th->rootset;
 	}
+	$git = undef;
 	Email::Address->purge_cache;
 
 	# there could be a race due to a message being deleted in git
@@ -166,10 +183,15 @@ sub emit_thread_html {
 	my $final_anchor = $state->{anchor_idx};
 	my $next = "<a\nid=\"s$final_anchor\">";
 	$next .= $final_anchor == 1 ? 'only message in' : 'end of';
-	$next .= " thread</a>, back to <a\nhref=\"../../\">index</a>\n";
-	$next .= "download thread: <a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
-	$next .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>\n\n";
-	$cb->write("<hr />" . PRE_WRAP . $next . $foot .
+	$next .= " thread</a>, back to <a\nhref=\"../../\">index</a>";
+	if ($flat) {
+		$next .= " [<a\nhref=\"../t/#u\">threaded</a>|<b>flat</b>]";
+	} else {
+		$next .= " [<b>threaded</b>|<a\nhref=\"../T/#u\">flat</a>]";
+	}
+	$next .= "\ndownload thread: <a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
+	$next .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>";
+	$cb->write("<hr />" . PRE_WRAP . $next . "\n\n". $foot .
 		   "</pre></body></html>");
 	$cb->close;
 }
@@ -549,20 +571,25 @@ sub thread_html_head {
 	$$cb->write("<html><head><title>$s</title></head><body>");
 }
 
+sub __thread_entry {
+	my ($cb, $git, $state, $mime, $level) = @_;
+
+	# lazy load the full message from mini_mime:
+	my $path = mid2path(mid_clean($mime->header('Message-ID')));
+	$mime = eval { Email::MIME->new($git->cat_file("HEAD:$path")) };
+	if ($mime) {
+		if ($state->{anchor_idx} == 0) {
+			thread_html_head($cb, $mime);
+		}
+		index_entry($$cb, $mime, $level, $state);
+	}
+}
+
 sub thread_entry {
 	my ($cb, $git, $state, $node, $level) = @_;
 	return unless $node;
 	if (my $mime = $node->message) {
-
-		# lazy load the full message from mini_mime:
-		my $path = mid2path(mid_clean($mime->header('Message-ID')));
-		$mime = eval { Email::MIME->new($git->cat_file("HEAD:$path")) };
-		if ($mime) {
-			if ($state->{anchor_idx} == 0) {
-				thread_html_head($cb, $mime);
-			}
-			index_entry($$cb, $mime, $level, $state);
-		}
+		__thread_entry($cb, $git, $state, $mime, $level);
 	}
 	thread_entry($cb, $git, $state, $node->child, $level + 1);
 	thread_entry($cb, $git, $state, $node->next, $level);
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index d666a1b..9ae7f7b 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -46,6 +46,9 @@ sub run {
 		invalid_list_mid(\%ctx, $1, $2) || get_thread_mbox(\%ctx, $sfx);
 	} elsif ($path_info =~ m!$LISTNAME_RE/$MID_RE/t\.atom\z!o) {
 		invalid_list_mid(\%ctx, $1, $2) || get_thread_atom(\%ctx);
+	} elsif ($path_info =~ m!$LISTNAME_RE/$MID_RE/T/\z!o) {
+		$ctx{flat} = 1;
+		invalid_list_mid(\%ctx, $1, $2) || get_thread(\%ctx);
 
 	# single-message pages
 	} elsif ($path_info =~ m!$LISTNAME_RE/$MID_RE/\z!o) {
-- 
EW