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=-3.1 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, 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 E675D1F5DD for ; Thu, 20 Aug 2015 10:20:29 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/4] dead code cleanup Date: Thu, 20 Aug 2015 10:20:26 +0000 Message-Id: <1440066029-7400-1-git-send-email-e@80x24.org> List-Id: We may not be using subject_path after all. --- lib/PublicInbox/Thread.pm | 7 ------- lib/PublicInbox/View.pm | 46 +++++++++++++--------------------------------- lib/PublicInbox/WWW.pm | 18 ------------------ 3 files changed, 13 insertions(+), 58 deletions(-) diff --git a/lib/PublicInbox/Thread.pm b/lib/PublicInbox/Thread.pm index 92404fa..a3dedf5 100644 --- a/lib/PublicInbox/Thread.pm +++ b/lib/PublicInbox/Thread.pm @@ -24,13 +24,6 @@ sub sort_ts { } @_; } -sub rsort_ts { - sort { - (eval { $b->topmost->message->header('X-PI-TS') } || 0) <=> - (eval { $a->topmost->message->header('X-PI-TS') } || 0) - } @_; -} - package PublicInbox::Thread::Container; use strict; use warnings; diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 17af21f..e29922e 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -153,10 +153,7 @@ sub thread_html { my $msgs = load_results($res); my $nr = scalar @$msgs; return $rv if $nr == 0; - require PublicInbox::Thread; - my $th = PublicInbox::Thread->new(@$msgs); - $th->thread; - $th->order(*PublicInbox::Thread::sort_ts); + my $th = thread_results($msgs); my $state = [ $srch, { root_anchor => anchor_for($mid) }, undef, 0 ]; { require PublicInbox::GitCatFile; @@ -176,30 +173,6 @@ sub thread_html { $rv .= "
" . PRE_WRAP . $next . $foot . ""; } -sub subject_path_html { - my (undef, $ctx, $foot, $srch) = @_; - my $path = $ctx->{subject_path}; - my $res = $srch->get_subject_path($path); - my $rv = ''; - my $msgs = load_results($res); - my $nr = scalar @$msgs; - return $rv if $nr == 0; - require PublicInbox::Thread; - my $th = PublicInbox::Thread->new(@$msgs); - $th->thread; - $th->order(*PublicInbox::Thread::sort_ts); - my $state = [ $srch, { root_anchor => 'dummy' }, undef, 0 ]; - { - require PublicInbox::GitCatFile; - my $git = PublicInbox::GitCatFile->new($ctx->{git_dir}); - thread_entry(\$rv, $git, $state, $_, 0) for $th->rootset; - } - my $final_anchor = $state->[3]; - my $next = "end of thread\n"; - - $rv .= "
" . PRE_WRAP . $next . $foot . ""; -} - # only private functions below. sub index_walk { @@ -560,12 +533,10 @@ sub simple_dump { sub thread_followups { my ($dst, $root, $res) = @_; - my $msgs = load_results($res); - require PublicInbox::Thread; $root->header_set('X-PI-TS', '0'); - my $th = PublicInbox::Thread->new($root, @$msgs); - $th->thread; - $th->order(*PublicInbox::Thread::sort_ts); + my $msgs = load_results($res); + push @$msgs, $root; + my $th = thread_results($msgs); my $srch = $res->{srch}; my $subj = $srch->subject_path($root->header('Subject')); my %seen = ($subj => 1); @@ -618,4 +589,13 @@ sub msg_timestamp { defined($ts) ? $ts : 0; } +sub thread_results { + my ($msgs) = @_; + require PublicInbox::Thread; + my $th = PublicInbox::Thread->new(@$msgs); + $th->thread; + $th->order(*PublicInbox::Thread::sort_ts); + $th +} + 1; diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm index e7c28d7..b0c1348 100644 --- a/lib/PublicInbox/WWW.pm +++ b/lib/PublicInbox/WWW.pm @@ -53,11 +53,6 @@ sub run { } elsif ($path_info =~ m!$LISTNAME_RE/t/(\S+)\.html\z!o) { invalid_list_mid(\%ctx, $1, $2) || get_thread(\%ctx, $cgi); - # subject_path display - } elsif ($path_info =~ m!$LISTNAME_RE/s/(\S+)\.html\z!o) { - my $sp = $2; - invalid_list(\%ctx, $1) || get_subject_path(\%ctx, $cgi, $sp); - } elsif ($path_info =~ m!$LISTNAME_RE/f/\S+\.txt\z!o) { invalid_list_mid(\%ctx, $1, $2) || redirect_mid_txt(\%ctx, $cgi); @@ -202,19 +197,6 @@ sub get_thread { [ $body ] ]; } -# /$LISTNAME/s/$SUBJECT_PATH.html -sub get_subject_path { - my ($ctx, $cgi, $sp) = @_; - $ctx->{subject_path} = $sp; - my $srch = searcher($ctx) or return need_search($ctx); - require PublicInbox::View; - my $foot = footer($ctx); - my $body = PublicInbox::View->subject_path_html($ctx, $foot, $srch) or - return r404(); - [ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ], - [ $body ] ]; -} - sub self_url { my ($cgi) = @_; ref($cgi) eq 'CGI' ? $cgi->self_url : $cgi->uri->as_string; -- EW