combine data from previous season

[sc2-widget] / getsc2clan

diff --git a/getsc2clan b/getsc2clan
index 6f486f9e6d827ef1085342bb5073aca8abc76f57..94ca435551adcd62807fca213ea08464c60938ae 100755 (executable)
--- a/getsc2clan
+++ b/getsc2clan
@@ -8,19 +8,27 @@ use LWP::Authen::OAuth2;
 use JSON qw( decode_json );
 use List::MoreUtils qw( all part 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 %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');
+               $bliz;
+       };
+
        my $args = join('/', @_);
        my $res = $bliz->get("https://eu.api.blizzard.com/sc2/$args");
        $res->is_success or die $res->status_line;
@@ -35,12 +43,14 @@ my @ladderdata = map {
 my %ladders = (
        map { $_->{ladder}->[0]->{ladderId} => $_ } # unique
        grep { $_->{ladder}->[0]->{division} }
-       map { $_->{currentSeason}->@* } @ladderdata
+       map { $_->{previousSeason}->@*, $_->{currentSeason}->@* }
+       @ladderdata
 );
 my @ladders = (
        nsort_by {
                -($_->{ladder}->[0]->{wins} + $_->{ladder}->[0]->{losses})
        } # activity desc
+       nsort_by { $_->{ladder}->[0]->{ladderId} } # stable order
        grep {
                !$clanmatch or
                all { $_->{clanName} =~ $clanmatch } $_->{characters}->@*