From 91937cbfe8153699d8f785616ec519440e4e2258 Mon Sep 17 00:00:00 2001 From: Mickey Nasriachi Date: Fri, 2 Jun 2017 16:17:45 +0100 Subject: [PATCH] Remove redundant code Some old logic that was moved out of the templates before, but doesn't seem to add any value. The 'latest' value isn't used and the 'aggregated' doesn't seem right - using existing 'releases' value do the job just fine. --- lib/MetaCPAN/Web/Controller/Author.pm | 40 +++++---------------------- root/author.html | 2 +- 2 files changed, 8 insertions(+), 34 deletions(-) diff --git a/lib/MetaCPAN/Web/Controller/Author.pm b/lib/MetaCPAN/Web/Controller/Author.pm index b61cb6bddb..fd2cec8d08 100644 --- a/lib/MetaCPAN/Web/Controller/Author.pm +++ b/lib/MetaCPAN/Web/Controller/Author.pm @@ -58,23 +58,20 @@ sub index : Chained('root') PathPart('') Args(0) { my $releases = [ map { $_->{fields} } @{ $data->{hits}->{hits} } ]; single_valued_arrayref_to_scalar($releases); + my $date = List::Util::max map { DateTime::Format::ISO8601->parse_datetime( $_->{date} ) } @$releases; $c->res->last_modified($date) if $date; - my ( $aggregated, $latest ) = @{ $self->_calc_aggregated($releases) }; - $c->stash( { - aggregated => $aggregated, - author => $author, - faves => $faves, - latest => $latest, - releases => $releases, - template => 'author.html', - took => $took, - total => $data->{hits}->{total}, + author => $author, + faves => $faves, + releases => $releases, + template => 'author.html', + took => $took, + total => $data->{hits}->{total}, } ); @@ -124,29 +121,6 @@ sub releases : Chained('root') PathPart Args(0) { $c->stash( { pageset => $pageset } ); } -sub _calc_aggregated { - my ( $self, $releases ) = @_; - - my @aggregated; - my $latest = $releases->[0]; - my $last; - - for my $rel ( @{$releases} ) { - my ( $canon_rel, $canon_lat ) = map { - DateTime::Format::ISO8601->parse_datetime($_) - ->strftime("%Y%m%d%H%M%S") - } ( $rel->{date}, $latest->{date} ); - $latest = $rel if $canon_rel > $canon_lat; - - next if $last and $last eq $rel->{distribution}; - $last = $rel->{distribution}; - next unless $rel->{name}; - push @aggregated, $rel; - } - - return [ \@aggregated, $latest ]; -} - __PACKAGE__->meta->make_immutable; 1; diff --git a/root/author.html b/root/author.html index 721eaf3999..c61be5a3f4 100644 --- a/root/author.html +++ b/root/author.html @@ -139,7 +139,7 @@
<% INCLUDE inc/author-pic.html author = author %>
<% IF releases.0 %> - <% INCLUDE inc/release-table.html releases = aggregated, header = 1, tablesorter = 1, table_id = "author_releases" %> + <% INCLUDE inc/release-table.html releases = releases, header = 1, tablesorter = 1, table_id = "author_releases" %> <% ELSE %>
Releases