$s

From 5f3cef806f38dfd7f44d203923051f2ce5f4499a Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 2 Sep 2015 02:37:18 +0000 Subject: view: optional flat view for recent messages 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 1eb12a92..a3df319e 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 = "$subj"; + my $t = $ctx->{flat} ? 'T' : 't'; + $subj = "$subj"; } if ($root_anchor && $root_anchor eq $id) { $subj = "$subj"; @@ -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 .= " parent"; } + if ($srch) { + if ($ctx->{flat}) { + $rv .= " [threaded" . + "|flat]"; + } else { + $rv .= " [threaded|" . + "flat]"; + } + } $fh->write($rv .= ''); } @@ -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 = ""; $next .= $final_anchor == 1 ? 'only message in' : 'end of'; - $next .= " thread, back to index\n"; - $next .= "download thread: mbox.gz"; - $next .= " / follow: Atom feed\n\n"; - $cb->write("

" . PRE_WRAP . $next . $foot . + $next .= " thread, back to index"; + if ($flat) { + $next .= " [threaded|flat]"; + } else { + $next .= " [threaded|flat]"; + } + $next .= "\ndownload thread: mbox.gz"; + $next .= " / follow: Atom feed"; + $cb->write("

" . PRE_WRAP . $next . "\n\n". $foot . ""); $cb->close; } @@ -549,20 +571,25 @@ sub thread_html_head { $$cb->write("$s"); } +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 d666a1b7..9ae7f7be 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) { -- cgit v1.2.3-24-ge0c7