From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-2.9 required=3.0 tests=ALL_TRUSTED,BAYES_00, T_FILL_THIS_FORM_SHORT 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 D70452024B; Mon, 20 Jul 2015 21:53:13 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Cc: Eric Wong Subject: [PATCH] feed: extract subroutines for threading Date: Mon, 20 Jul 2015 21:53:14 +0000 Message-Id: <1437429194-8111-1-git-send-email-e@80x24.org> List-Id: We'll be using this in the future for displaying per-thread views. --- lib/PublicInbox/Feed.pm | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 3c0ec86..f7c2f32 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -61,13 +61,7 @@ sub generate_html_index { my $git_dir = $args->{git_dir}; my $git = PublicInbox::GitCatFile->new($git_dir); my ($first, $last) = each_recent_blob($args, sub { - my $mime = do_cat_mail($git, $_[0]) or return 0; - - my $t = eval { str2time($mime->header('Date')) }; - defined($t) or $t = 0; - $mime->header_set('X-PI-Date', $t); - push @messages, $mime; - 1; + mime_load_for_sort($git, $_[0], \@messages); }); $git = undef; # destroy pipes. @@ -79,20 +73,11 @@ sub generate_html_index { '' . PRE_WRAP; # sort child messages in chronological order - $th->order(sub { - sort { - $a->topmost->message->header('X-PI-Date') <=> - $b->topmost->message->header('X-PI-Date') - } @_; - }); + $th->order(sub { mime_sort_children(@_) }); # except we sort top-level messages reverse chronologically my $state = [ time, {}, $first, 0 ]; - for (sort { (eval { $b->message->header('X-PI-Date') } || 0) <=> - (eval { $a->message->header('X-PI-Date') } || 0) - } $th->rootset) { - dump_msg($_, 0, \$html, $state); - } + for (mime_sort_roots($th)) { dump_msg($_, 0, \$html, $state) } Email::Address->purge_cache; my $footer = nav_footer($args->{cgi}, $last, $feed_opts, $state); @@ -308,4 +293,32 @@ sub do_cat_mail { $@ ? undef : $mime; } +sub mime_load_for_sort { + my ($git, $path, $messages) = @_; + my $mime = do_cat_mail($git, $path) or return 0; + + my $t = eval { str2time($mime->header('Date')) }; + defined($t) or $t = 0; + $mime->header_set('X-PI-Date', $t); + push @$messages, $mime; + 1; +} + +# children are chronological +sub mime_sort_children { + sort { + $a->topmost->message->header('X-PI-Date') <=> + $b->topmost->message->header('X-PI-Date') + } @_; +} + +# parents are reverse chronological +sub mime_sort_roots { + my ($th) = @_; + sort { + (eval { $b->message->header('X-PI-Date') } || 0) <=> + (eval { $a->message->header('X-PI-Date') } || 0) + } $th->rootset; +} + 1; -- EW