From fcf11d4a0dd860a80e9a459a343e5291a0fb54a9 Mon Sep 17 00:00:00 2001 From: sherl Date: Fri, 13 Jun 2025 12:12:10 +0200 Subject: [PATCH] Revert "chore: prepare for rescraping" This reverts commit fce1b6989347ee908095ed6c70ebebb6620b817b. --- FlaskWebProject/FlaskWebProject/fs_scraper.py | 26 +++---------------- .../FlaskWebProject/lewy_api_v1.py | 6 +---- FlaskWebProject/FlaskWebProject/lewy_db.py | 13 +++++----- .../FlaskWebProject/lewy_routes.py | 13 +++++----- 4 files changed, 18 insertions(+), 40 deletions(-) diff --git a/FlaskWebProject/FlaskWebProject/fs_scraper.py b/FlaskWebProject/FlaskWebProject/fs_scraper.py index d3ecae8..20b1e04 100644 --- a/FlaskWebProject/FlaskWebProject/fs_scraper.py +++ b/FlaskWebProject/FlaskWebProject/fs_scraper.py @@ -177,25 +177,7 @@ class scraper: stats = safe_traverse(match, ["stats"], default="") zewnetrzne_id_meczu = safe_traverse(match, ["eventEncodedId"], default="") - wygrana_str = safe_traverse(match, ["winLoseShort"], default="R").upper() - klub_zawodnika = "undefined" - # Zwycięstwo klubu zawodnika - if wygrana_str == "Z": - if safe_traverse(match, ["homeScore"], default=0) > safe_traverse(match, ["awayScore"], default=0): - klub_zawodnika = home_club_id - else: - klub_zawodnika = away_club_id - # Przegrana klubu zawodnika - elif wygrana_str == "P": - if safe_traverse(match, ["homeScore"], default=0) > safe_traverse(match, ["awayScore"], default=0): - klub_zawodnika = away_club_id - else: - klub_zawodnika = home_club_id - - #klub_z = getDb().simple_select_all("kluby", id_klubu=klub_zawodnika) - if stats != False: # gdy sportowiec był aktywny w meczu - safe_traverse(stats, ["596", "value"], default=None) # print("todo :)") self.db.simple_insert_one("sportowcy_w_meczach", id_zawodnika = id_zawodnika, @@ -211,8 +193,7 @@ class scraper: zolte_kartki = int("0" + safe_traverse(stats, ["599", "value"], default="0")), czerwone_kartki = int("0" + safe_traverse(stats, ["600", "value"], default="0")), wygrana = {"Z": 1, "R": 0, "P": -1}.get(safe_traverse(match, ["winLoseShort"], default=""), 0), - wynik = safe_traverse(match, ["rating"], default=0) or 0, - klub_id = klub_zawodnika + wynik = safe_traverse(match, ["rating"], default=0) or 0 ) # # analogicznie zinkrementuj statystyki_sportowcow: @@ -255,9 +236,8 @@ class scraper: zolte_kartki = int("0" + safe_traverse(stats, ["599", "value"], default="0")), czerwone_kartki = int("0" + safe_traverse(stats, ["600", "value"], default="0")), wygrana = {"Z": 1, "R": 0, "P": -1}.get(safe_traverse(match, ["winLoseShort"], default=""), 0), - wynik = safe_traverse(match, ["rating"], default=0) or 0, - klub_id = klub_zawodnika - ) + wynik = safe_traverse(match, ["rating"], default=0) or 0 + ) # TODO: Zaktualizuj statystyki sportowca diff --git a/FlaskWebProject/FlaskWebProject/lewy_api_v1.py b/FlaskWebProject/FlaskWebProject/lewy_api_v1.py index 2457e2a..011e220 100644 --- a/FlaskWebProject/FlaskWebProject/lewy_api_v1.py +++ b/FlaskWebProject/FlaskWebProject/lewy_api_v1.py @@ -262,10 +262,6 @@ def lookup(data, request): return debugger_halt(r = request) case 'matches': return get_matches(r = request) - case 'player_stats': - return player_stats(r = request) - case 'robert_stats': - return robert_stats(r = request) case _: increment_bad_requests() - return not_implemented(data) \ No newline at end of file + return not_implemented(data) diff --git a/FlaskWebProject/FlaskWebProject/lewy_db.py b/FlaskWebProject/FlaskWebProject/lewy_db.py index 5039479..6f4b567 100644 --- a/FlaskWebProject/FlaskWebProject/lewy_db.py +++ b/FlaskWebProject/FlaskWebProject/lewy_db.py @@ -1,7 +1,7 @@ from datetime import datetime from flask_sqlalchemy import SQLAlchemy from functools import wraps -from sqlalchemy import ForeignKey, select, insert, update, extract, func +from sqlalchemy import ForeignKey, select, insert, update, extract from sqlalchemy.orm import Mapped, mapped_column, DeclarativeBase, Session, relationship from typing import List import time @@ -105,8 +105,6 @@ class baza(): czerwone_kartki: Mapped[ int] = mapped_column() wygrana: Mapped[ int] = mapped_column() wynik: Mapped[ float] = mapped_column() - klub_id: Mapped[ int] = mapped_column(ForeignKey(f"{tnp}kluby.id_klubu")) - klub: Mapped[ "kluby"] = relationship() def __repr__(self): return f"<{self.zawodnik.imie} {self.zawodnik.nazwisko} w meczu {self.mecz.gospodarze.skrocona_nazwa} vs. {self.mecz.goscie.skrocona_nazwa}>" @@ -203,12 +201,12 @@ class baza(): with self.app.app_context(): self.session = Session(self.db.engine) - def exit_gracefully(fun): - @wraps(fun) + def exit_gracefully(func): + @wraps(func) def wrapper(self, *args, **kwargs): return_val = None try: - return_val = fun(self, *args, **kwargs) + return_val = func(self, *args, **kwargs) except: print(f"{c.FAIL}" f"Wystąpił błąd podczas wykonywania zapytania SQL:" @@ -556,6 +554,7 @@ class baza(): return query.all() @exit_gracefully +<<<<<<< HEAD def get_basic_stats(self, id_zawodnika = None, zewnetrzne_id_zawodnika = None): # Spróbuj otrzymać id zawodnika z zewnętrznego id. @@ -622,6 +621,8 @@ class baza(): return query.all()[0] @exit_gracefully +======= +>>>>>>> parent of fce1b69 (chore: prepare for rescraping) def sample_data_init(self, override_safety_check=False): """ Użycie: diff --git a/FlaskWebProject/FlaskWebProject/lewy_routes.py b/FlaskWebProject/FlaskWebProject/lewy_routes.py index 9a72e26..08354b7 100644 --- a/FlaskWebProject/FlaskWebProject/lewy_routes.py +++ b/FlaskWebProject/FlaskWebProject/lewy_routes.py @@ -88,13 +88,14 @@ def clubs(): return render_template('club.html', clubs=clubs, selected_club=selected_club) def representation(): + polska = robert_stats(id_klubu="polska")[2][0] nation_stats = { - 'goals': 85, - 'assists': 35, - 'matches': 158, - 'minutes_played': 12108, - 'yellow_card':10, - 'red_card': 0, + 'goals': polska["goals"], + 'assists': polska["assists"], + 'matches': polska["unique_items"], + 'minutes_played': polska["time_played"], + 'yellow_card':polska["yellow_cards"], + 'red_card': polska["red_cards"], 'wins':75, 'draws': 35, 'lost': 48