vrubelroman/ChessCalcNextTour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Парсер: поддержка латиницы (международные турниры) + таблица: колонки Рейт и Доп1
All checks were successful
CI/CD Pipeline / build-and-deploy (push) Successful in 8s
Details

Browse source
This commit is contained in:
vrubel 2026-06-19 14:51:15 +00:00
parent 7f627beeec
commit 22a0e27763
2 changed files with 43 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
bots/client_bot.py
View file

@ -78,10 +78,12 @@ def format_pairings(pairings_data: dict, tournament_name: str) -> str:
pairings = pairings_data['pairings']
rnd = pairings_data['round']
w_board, w_name, w_pts = 2, 17, 4
border = '+'.join('-' * w for w in [w_board, w_name, w_pts])
w_board, w_name, w_rating, w_pts, w_tb1 = 2, 17, 4, 4, 5
border = '+'.join('-' * w for w in [w_board, w_name, w_rating, w_pts, w_tb1])
header = f'{_pad_col("#", w_board)}|{_pad_col("Игрок", w_name)}|{_pad_col("О", w_pts)}'
header = (f'{_pad_col("#", w_board)}|{_pad_col("Игрок", w_name)}|'
f'{_pad_col("Рейт", w_rating)}|{_pad_col("О", w_pts)}|'
f'{_pad_col("Доп1", w_tb1)}')
table_header = f'```\n{header}\n{border}\n'
source = pairings_data.get('source', 'algorithm')
@ -90,14 +92,20 @@ def format_pairings(pairings_data: dict, tournament_name: str) -> str:
return {
'title': f'📋 *Тур {rnd}* — пары',
'rows': _build_table_rows(pairings, w_board, w_name, w_pts, border),
'rows': _build_table_rows(pairings, w_board, w_name, w_rating, w_pts, w_tb1, border),
'table_header': table_header,
'footer': footer,
}
def _build_table_rows(pairings: list, w_board: int, w_name: int, w_pts: int,
border: str) -> list:
def _build_table_rows(pairings: list, w_board: int, w_name: int, w_rating: int,
w_pts: int, w_tb1: int, border: str) -> list:
def _rating_str(p):
return str(p.rating) if p.rating else ''
def _tb1_str(p):
return f"{p.tb[0]:.1f}" if p.tb else ''
rows = []
board = 1
for pi, pairing in enumerate(pairings):
@ -109,12 +117,16 @@ def _build_table_rows(pairings: list, w_board: int, w_name: int, w_pts: int,
rows.append(
f'{_pad_col(str(board), w_board)}|'
f'{_pad_col(p1.name, w_name)}|'
f'{_pad_col(f"{p1.points:.1f}", w_pts)}'
f'{_pad_col(_rating_str(p1), w_rating)}|'
f'{_pad_col(f"{p1.points:.1f}", w_pts)}|'
f'{_pad_col(_tb1_str(p1), w_tb1)}'
)
rows.append(
f'{_pad_col("", w_board)}|'
f'{_pad_col("— BYE —", w_name)}|'
f'{_pad_col("", w_pts)}'
f'{_pad_col("", w_rating)}|'
f'{_pad_col("", w_pts)}|'
f'{_pad_col("", w_tb1)}'
)
board += 1
if pi + 1 < len(pairings):
@ -129,12 +141,16 @@ def _build_table_rows(pairings: list, w_board: int, w_name: int, w_pts: int,
rows.append(
f'{_pad_col(str(board), w_board)}|'
f'{_pad_col(white.name, w_name)}|'
f'{_pad_col(f"{white.points:.1f}", w_pts)}'
f'{_pad_col(_rating_str(white), w_rating)}|'
f'{_pad_col(f"{white.points:.1f}", w_pts)}|'
f'{_pad_col(_tb1_str(white), w_tb1)}'
)
rows.append(
f'{_pad_col("", w_board)}|'
f'{_pad_col(black.name, w_name)}|'
f'{_pad_col(f"{black.points:.1f}", w_pts)}'
f'{_pad_col(_rating_str(black), w_rating)}|'
f'{_pad_col(f"{black.points:.1f}", w_pts)}|'
f'{_pad_col(_tb1_str(black), w_tb1)}'
)
board += 1