X-Git-Url: https://git.jacobcasper.com/?p=fflogs.git;a=blobdiff_plain;f=main.py;h=e5a170bebf1297b7ab258cfc13e1d6678bee96ac;hp=f2c7f9079bea4fef090ce952ebf6ca92f65d96b6;hb=HEAD;hpb=d918c26a9f1cf2f47385314fa96015b8afa79b5a

diff --git a/main.py b/main.py
index f2c7f90..e5a170b 100755
--- a/main.py
+++ b/main.py
@@ -53,27 +53,27 @@ params = {
         }
 result = client.execute(query, variable_values=params)
 encounter_ranks = [result['characterData']['character'][encounter_alias] for encounter_alias in encounter_aliases]
-ranks = [rank for encounter in encounter_ranks for rank in encounter['ranks']]
-pulls = [(rank['report']['code'], rank['report']['fightID']) for rank in ranks]
+reports = {rank['report']['code'] for encounter in encounter_ranks for rank in encounter['ranks']}
 query = gql(
         '''
-        query ($code: String!, $fightIds: [Int]!) {
+        query ($code: String!) {
           reportData {
             report (
               code: $code
             )
             {
               code
-              fights (
-                fightIDs: $fightIds
-              )
-              {
-                hasEcho
-                kill
-              }
+              rankings
             }
           }
         }
         '''
         )
-result = client.execute(query, variable_values={"code": pulls[0][0], "fightIds": pulls[0][1]})
+for code in reports:
+    result = client.execute(query, variable_values={"code": code})
+    for kill_rank in result['reportData']['report']['rankings']['data']:
+        tanks = kill_rank['roles']['tanks']['characters']
+        healers = kill_rank['roles']['healers']['characters']
+        dps = kill_rank['roles']['dps']['characters']
+        pull = kill_rank['fightID']
+        print(code,pull,','.join([str(char['id']) for char in tanks] + [str(char['id']) for char in healers] + [str(char['id']) for char in dps]), sep="|")