previous season ladders indicated after active results

[sc2-widget] / getsc2clan

diff --git a/getsc2clan b/getsc2clan
index 94ca435551adcd62807fca213ea08464c60938ae..c3730517d6a7219a3d3e4447e8bfa475b465c515 100755 (executable)
--- a/getsc2clan
+++ b/getsc2clan
@@ -6,7 +6,7 @@ use utf8;
 use Data::Dump qw( pp );
 use LWP::Authen::OAuth2;
 use JSON qw( decode_json );
 use Data::Dump qw( pp );
 use LWP::Authen::OAuth2;
 use JSON qw( decode_json );

-use List::MoreUtils qw( all part nsort_by );
+use List::MoreUtils qw( all part sort_by nsort_by );

 
 if (@ARGV and all { m[/] } @ARGV) {
        say pp blizget($_) for @ARGV;
 
 if (@ARGV and all { m[/] } @ARGV) {
        say pp blizget($_) for @ARGV;


@@ -40,13 +40,19 @@ sub blizget {
 my @ladderdata = map {
        blizget(legacy => profile => 2 => 1 => $_ => 'ladders')
 } @{$profiles};
 my @ladderdata = map {
        blizget(legacy => profile => 2 => 1 => $_ => 'ladders')
 } @{$profiles};

-my %ladders = (
-       map { $_->{ladder}->[0]->{ladderId} => $_ } # unique
-       grep { $_->{ladder}->[0]->{division} }
-       map { $_->{previousSeason}->@*, $_->{currentSeason}->@* }
-       @ladderdata
-);
+
+# merge relevant ladder data of all users
+my %ladders;
+for my $season (qw[ currentSeason previousSeason ]) {
+       for my $row (map { $_->{$season}->@* } @ladderdata) {
+               $row->{ladder}->[0]->{division} or next;
+               $row->{season} = $season;
+               $ladders{ $row->{ladder}->[0]->{ladderId} } //= $row;
+       }
+}
+

 my @ladders = (
 my @ladders = (

+       sort_by { $_->{season} } # season

        nsort_by {
                -($_->{ladder}->[0]->{wins} + $_->{ladder}->[0]->{losses})
        } # activity desc
        nsort_by {
                -($_->{ladder}->[0]->{wins} + $_->{ladder}->[0]->{losses})
        } # activity desc


@@ -72,6 +78,7 @@ say JSON->new->canonical->pretty->encode({
                members  => [map { $memberidx{$_->{id}} } $_->{characters}->@*],
                wins     => $_->{ladder}->[0]->{wins},
                losses   => $_->{ladder}->[0]->{losses},
                members  => [map { $memberidx{$_->{id}} } $_->{characters}->@*],
                wins     => $_->{ladder}->[0]->{wins},
                losses   => $_->{ladder}->[0]->{losses},

+               (season  => -1) x ($_->{season} eq 'previousSeason'),

        }} @ladders],
        members  => [map {
                blizget(metadata => profile => 2 => 1 => $_->{id})
        }} @ladders],
        members  => [map {
                blizget(metadata => profile => 2 => 1 => $_->{id})