Merge pull request #14 from Skyward-Brawlhalla/refactor2

Fix #3, #12, #13

api.py

@@ -12,12 +12,12 @@
 # METHODS
 
 
-def getClan():
+def fetch_clan():
     time.sleep(0.10)  # 0.10 might be possible
     return requests.get("https://api.brawlhalla.com/clan/" + using_clan + "/?api_key=" + get_keys(1))
 
 
-def getPlayerStats(brawlhalla_id):
+def fetch_player_ranked_stats(brawlhalla_id):
     time.sleep(10)
     return requests.get("https://api.brawlhalla.com/player/" +
                         str(brawlhalla_id) + "/ranked?api_key=" + get_keys(1))

get_members_2v2_elo.py

@@ -0,0 +1,92 @@
+import json
+import re
+import time
+from api import fetch_clan, fetch_player_ranked_stats
+
+
+def get_clan():
+    try:
+        clan = json.loads(fetch_clan().content)  # request
+    except:
+        clan = []
+    return clan
+
+
+def get_clan_members():
+    clan = get_clan()
+    try:
+        clan_members = clan['clan']
+
+        # test process with only 3 clan members
+        # with open('./test_data.json') as f:
+        #    clan_members = json.load(f)
+    except:
+        clan_members = []
+
+    # return values
+    return_values = []
+    return_values.append(clan_members)
+    return_values.append(clan)
+    return return_values
+
+
+def get_members_2v2_elo():
+    # get clan and clan members
+    return_values = get_clan_members()
+    clan_members = return_values[0]
+    clan = return_values[1]
+
+    clan_2v2_teamnames = []
+    clan_current_2v2_ratings = []
+    clan_peak_2v2_ratings = []
+
+    num = 0
+    for player in clan_members:
+        num += 1
+        try:
+            all_my_2v2_teams = json.loads(
+                fetch_player_ranked_stats(
+                    player["brawlhalla_id"]).content)["2v2"]  # request
+
+            # FIND BEST TEAM CURRENT ELO
+            bestCurrentTeam = "bestCurrentTeam is undefined"
+            bestCurrent = -1
+            bestPeak = -1
+
+            for team in all_my_2v2_teams:
+                rating = team["rating"]
+                peak = team["peak_rating"]
+                if rating > bestCurrent:
+                    bestCurrent = rating
+                    bestPeak = peak
+                    bestCurrentTeam = team["teamname"]
+
+            # ADD ALL VALUES TO ARRAYS
+            if bestCurrentTeam.startswith("bestCurrentTeam is undefined"):
+                bestCurrent = -1
+                bestPeak = -1
+                bestCurrentTeam = player["name"]
+            print(str(num) + ': ' + bestCurrentTeam)
+            print("current: " + str(bestCurrent))
+            print("peak: " + str(bestPeak))
+            print(' ')
+            clan_2v2_teamnames.append(bestCurrentTeam)
+            clan_current_2v2_ratings.append(bestCurrent)
+            clan_peak_2v2_ratings.append(bestPeak)
+
+        except:
+            currentResult = "**" + \
+                str(num) + ". " + player["name"] + \
+                "**: **current:**" + " -1" + " **peak:**" + " -1"
+
+            clan_2v2_teamnames.append(player["name"])
+            clan_current_2v2_ratings.append(-1)
+            clan_peak_2v2_ratings.append(-1)
+
+            print(currentResult)
+    return_values = []
+    return_values.append(clan_2v2_teamnames)
+    return_values.append(clan_current_2v2_ratings)
+    return_values.append(clan_peak_2v2_ratings)
+    return_values.append(clan)
+    return return_values