improve error messages of failed password include

[sc2-widget] / getsc2clan

diff --git a/getsc2clan b/getsc2clan
index 6e98d60808e5864c9574be47e20dc8182fbccba1..1fbdd02ee3ada748cd8ac69992f2f408d11cfa89 100755 (executable)
--- a/getsc2clan
+++ b/getsc2clan
@@ -6,21 +6,31 @@ use utf8;
 use Data::Dump qw( pp );
 use LWP::Authen::OAuth2;
 use JSON qw( decode_json );
-use List::MoreUtils qw( all part );
+use List::MoreUtils qw( all part sort_by nsort_by );
+
+if (@ARGV and all { m[/] } @ARGV) {
+       say pp blizget($_) for @ARGV;
+       exit;
+}
 
 my ($profiles, $clanmatches) = part { /\D/ } @ARGV;  # separate numbers
-@{$profiles}
+$profiles && @{$profiles}
        or die "Usage: $0 <profile id>... [<clan name>...]\n";
-my ($clanmatch) = map { $_ && qr/\A(?:$_)\z/i } join '|', @{$clanmatches};
-
-my %auth = do './.blizzard.passwd.pl' or die "no auth setup: $!\n";
-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 )],
-);
-$bliz->request_tokens(grant_type => 'client_credentials');
+my ($clanmatch) = map { $_ && qr/\A(?:$_)\z/i } join '|', @{$clanmatches || []};
 
 sub blizget {
+       state $bliz = do {
+               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 )],
+               );
+               $bliz->request_tokens(grant_type => 'client_credentials');
+               $bliz;
+       };
+
        my $args = join('/', @_);
        my $res = $bliz->get("https://eu.api.blizzard.com/sc2/$args");
        $res->is_success or die $res->status_line;
@@ -32,16 +42,23 @@ sub blizget {
 my @ladderdata = map {
        blizget(legacy => profile => 2 => 1 => $_ => 'ladders')
 } @{$profiles};
-my %ladders = (
-       map { $_->{ladder}->[0]->{ladderId} => $_ } # unique
-       grep { $_->{ladder}->[0]->{division} }
-       map { $_->{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 = (
-       sort {
-               $b->{ladder}->[0]->{wins}+$b->{ladder}->[0]->{losses} <=>
-               $a->{ladder}->[0]->{wins}+$a->{ladder}->[0]->{losses}
+       sort_by { $_->{season} } # season
+       nsort_by {
+               -($_->{ladder}->[0]->{wins} + $_->{ladder}->[0]->{losses})
        } # activity desc
+       nsort_by { $_->{ladder}->[0]->{ladderId} } # stable order
        grep {
                !$clanmatch or
                all { $_->{clanName} =~ $clanmatch } $_->{characters}->@*
@@ -63,6 +80,7 @@ say JSON->new->canonical->pretty->encode({
                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})