diff --git a/faceitstalker_docker/app/main.py b/faceitstalker_docker/app/main.py index f1a5989..aca7660 100644 --- a/faceitstalker_docker/app/main.py +++ b/faceitstalker_docker/app/main.py @@ -48,7 +48,7 @@ async def index(): data_dict[steamid]['steam_pic'] = steam_dict[steamid]['steam_pic'] - return render_template('steamids.html', data_dict = data_dict) + return render_template('steamids.html', data_dict = data_dict , steam_dict = steam_dict, faceit_dict = faceit_dict) else: return render_template('index.html') @@ -75,11 +75,12 @@ def steamid_to_64bit(steamid): async def loop_faceit_data(data_dict): faceit_dict = {} + req =requests.Session() for steamid in data_dict: faceit_dict[steamid] = {} url = "https://open.faceit.com/data/v4/players?game=csgo&game_player_id=" + str(data_dict[steamid]['steamid64']) headers = { 'accept': 'application/json', 'Authorization' : 'Bearer ab46a7ab-6ab8-4c00-a8ff-41c0ff71d562' } - faceit_response = requests.get(url, headers=headers) + faceit_response = req.get(url, headers=headers) faceit_response_json = faceit_response.json() @@ -94,11 +95,12 @@ async def loop_faceit_data(data_dict): return faceit_dict async def loop_steam_data(data_dict): - steam_dict = {} + steam_dict = {} + req =requests.Session() for steamid in data_dict: steam_dict[steamid] = {} steamurl ="https://steamcommunity.com/profiles/" + str(data_dict[steamid]['steamid64']) +"/?xml=1" - steam_req = requests.get(steamurl) + steam_req = req.get(steamurl) steamdict_funct = xmltodict.parse(steam_req.content) steam_dict[steamid]['steam_name'] = steamdict_funct['profile']['steamID'] diff --git a/faceitstalker_docker/app/templates/steamids.html b/faceitstalker_docker/app/templates/steamids.html index a0d96ee..756be2c 100644 --- a/faceitstalker_docker/app/templates/steamids.html +++ b/faceitstalker_docker/app/templates/steamids.html @@ -4,30 +4,30 @@
{%for steamid in data_dict%}
- Card image cap + Card image cap
-

{{data_dict[steamid]['steam_name']}}

+

{{steam_dict[steamid]['steam_name']}}

- {% if data_dict[steamid]['faceit_acc'] == 'true' %} - {% if data_dict[steamid]['faceit_level'] == 1 %} + {% if faceit_dict[steamid]['faceit_acc'] == 'true' %} + {% if faceit_dict[steamid]['faceit_level'] == 1 %} FaceIT Level 1 - {% elif data_dict[steamid]['faceit_level'] == 2 %} + {% elif faceit_dict[steamid]['faceit_level'] == 2 %} FaceIT Level 2 - {% elif data_dict[steamid]['faceit_level'] == 3 %} + {% elif faceit_dict[steamid]['faceit_level'] == 3 %} FaceIT Level 3 - {% elif data_dict[steamid]['faceit_level'] == 4 %} + {% elif faceit_dict[steamid]['faceit_level'] == 4 %} FaceIT Level 4 - {% elif data_dict[steamid]['faceit_level'] == 5 %} + {% elif faceit_dict[steamid]['faceit_level'] == 5 %} FaceIT Level 5 - {% elif data_dict[steamid]['faceit_level'] == 6 %} + {% elif faceit_dict[steamid]['faceit_level'] == 6 %} FaceIT Level 6 - {% elif data_dict[steamid]['faceit_level'] == 7 %} + {% elif faceit_dict[steamid]['faceit_level'] == 7 %} FaceIT Level 7 - {% elif data_dict[steamid]['faceit_level'] == 8 %} + {% elif faceit_dict[steamid]['faceit_level'] == 8 %} FaceIT Level 8 - {% elif data_dict[steamid]['faceit_level'] == 9 %} + {% elif faceit_dict[steamid]['faceit_level'] == 9 %} FaceIT Level 9 - {% elif data_dict[steamid]['faceit_level'] == 10 %} + {% elif faceit_dict[steamid]['faceit_level'] == 10 %} FaceIT Level 10 {% endif %} {% else %} @@ -37,14 +37,14 @@

{% if data_dict[steamid]['faceit_acc'] == 'true' %}
-

FaceIT ELO: {{data_dict[steamid]['faceit_elo']}}

+

FaceIT ELO: {{faceit_dict[steamid]['faceit_elo']}}

SteamID: {{data_dict[steamid]['steamid64']}}

{% endif %}