number member index before ladder reorder

[sc2-widget] / getsc2clan

diff --git a/getsc2clan b/getsc2clan
index c3730517d6a7219a3d3e4447e8bfa475b465c515..cc38e4d9c1da9f84bd0c8cda0122421b61018fb9 100755 (executable)
--- a/getsc2clan
+++ b/getsc2clan
@@ -20,7 +20,9 @@ my ($clanmatch) = map { $_ && qr/\A(?:$_)\z/i } join '|', @{$clanmatches || []};
 
 sub blizget {
        state $bliz = do {
-               my %auth = do './.blizzard.passwd.pl' or die "no auth setup: $!\n";
+               my @authdata = do './.blizzard.passwd.pl' and not $@ || $!
+                       or die "No auth setup: ", $@ || $!, "\n";
+               my %auth = @authdata;
                my $bliz = LWP::Authen::OAuth2->new(%auth,
                        token_endpoint          => 'https://eu.battle.net/oauth/token',
                        request_required_params => [qw( client_id client_secret grant_type )],
@@ -52,10 +54,6 @@ for my $season (qw[ currentSeason previousSeason ]) {
 }
 
 my @ladders = (
-       sort_by { $_->{season} } # season
-       nsort_by {
-               -($_->{ladder}->[0]->{wins} + $_->{ladder}->[0]->{losses})
-       } # activity desc
        nsort_by { $_->{ladder}->[0]->{ladderId} } # stable order
        grep {
                !$clanmatch or
@@ -71,15 +69,23 @@ $memberidx{ $_->{id} } //= push(@members, $_) && $#members
 say JSON->new->canonical->pretty->encode({
        name     => $members[0]->{clanName},
        tag      => $members[0]->{clanTag},
-       ladders  => [map {{
-               league   => lc $_->{ladder}->[0]->{league},
-               division => $_->{ladder}->[0]->{ladderName},
-               rank     => $_->{ladder}->[0]->{rank},
-               members  => [map { $memberidx{$_->{id}} } $_->{characters}->@*],
-               wins     => $_->{ladder}->[0]->{wins},
-               losses   => $_->{ladder}->[0]->{losses},
-               (season  => -1) x ($_->{season} eq 'previousSeason'),
-       }} @ladders],
+       ladders  => [
+               map {{
+                       id       => $_->{ladder}->[0]->{ladderId},
+                       league   => lc $_->{ladder}->[0]->{league},
+                       division => $_->{ladder}->[0]->{ladderName},
+                       rank     => $_->{ladder}->[0]->{rank},
+                       members  => [map { $memberidx{$_->{id}} } $_->{characters}->@*],
+                       wins     => $_->{ladder}->[0]->{wins},
+                       losses   => $_->{ladder}->[0]->{losses},
+                       (season  => -1) x ($_->{season} eq 'previousSeason'),
+               }}
+               sort_by { $_->{season} } # season
+               nsort_by {
+                       -($_->{ladder}->[0]->{wins} + $_->{ladder}->[0]->{losses})
+               } # activity desc
+               @ladders
+       ],
        members  => [map {
                blizget(metadata => profile => 2 => 1 => $_->{id})
                # lacks mmr, fav race (available in new api)