From 61e9030f5a9abd92b529342ce040d2fe4a868e15 Mon Sep 17 00:00:00 2001 From: vercah Date: Tue, 11 Feb 2025 18:02:22 +0100 Subject: [PATCH 1/2] create auth with utf.8 --- src/__init__.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/__init__.py b/src/__init__.py index e88977c..4bdbc76 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -7,6 +7,7 @@ import os import json import glob +import base64 from src.teams import Team, getTeamCoefficientAverage, getTeamPoints @@ -23,10 +24,7 @@ def download(): print(f"Downloading teams data for event {eventId}") - req = requests.get( - f'https://db.fykos.cz/api/events/{eventId}/teams', - auth=(username, password) - ) + req = get_teams(eventId, username, password) print("Saving") @@ -35,6 +33,19 @@ def download(): print("Download complete") +def get_teams(eventId, username, password): + credentials = f"{username}:{password}".encode("utf-8") + encoded_credentials = base64.b64encode(credentials).decode("utf-8") + headers = { + "Authorization": f"Basic {encoded_credentials}" + } + + req = requests.get( + f'https://db.fykos.cz/api/events/{eventId}/teams', + headers=headers + ) + return req + def process(): # load teams From ccbf6622448d6f4d1d9ff5b639c9f959f0fa5b35 Mon Sep 17 00:00:00 2001 From: vercah Date: Tue, 11 Feb 2025 18:34:22 +0100 Subject: [PATCH 2/2] typos and formatting --- README.md | 2 +- src/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 71ab8bb..c24ecc0 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ kterém jsou data o týmech uloženy. > [!WARNING] > Data musí být stažena předtím, než spadne FKSDB, jinak se k datům nepůjde > dostat. Pro je vhodné stáhnout data dopředu a pokud to situace umožní, tak -> je na soutěží jen aktualizovat. +> je na soutěži jen aktualizovat. ### Spuštění Script najde všechny `.csv` soubory ve složce `in`. Pokud není v této složce diff --git a/src/__init__.py b/src/__init__.py index 0439e11..13af0f2 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -48,7 +48,7 @@ def get_teams(eventId, username, password): def printTeamTable(teams): - titleString = f"│ N │{"Nátev týmu":32}│{"ID":^5}│Kat.│Body│Poř. glob.|Poř. v kat.|" + titleString = "│ N │{:32}│{:^5}│Kat.│Body│Poř. glob.|Poř. v kat.|".format("Název týmu", "ID") print("—"*len(titleString)) print(titleString) print("—"*len(titleString))