Hanabi/Py-Hanabi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix check for num_players in download routine

Browse source
This commit is contained in:
Maximilian Keßler 2023-07-05 16:31:10 +02:00
parent b9068eebe4
commit 3c2c73d00b
Signed by: max
GPG key ID: BCC5A619923C0BA5
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
hanabi/live/download_data.py
View file

@ -16,6 +16,7 @@ from hanabi import logger
class GameExportError(ValueError): class GameExportError(ValueError):
def __init__(self, game_id, msg): def __init__(self, game_id, msg):
super().__init__("When exporting game {}: {}".format(game_id, msg)) super().__init__("When exporting game {}: {}".format(game_id, msg))
pass pass
@ -29,27 +30,29 @@ class GameExportInvalidResponseTypeError(GameExportError):
super().__init__(game_id, "Invalid response type (expected json, got {})".format( super().__init__(game_id, "Invalid response type (expected json, got {})".format(
response_type, game_id response_type, game_id
)) ))
pass pass
class GameExportInvalidFormatError(GameExportError): class GameExportInvalidFormatError(GameExportError):
def __init__(self, game_id, msg): def __init__(self, game_id, msg):
super().__init__("Invalid response format: {}".format(game_id), msg) super().__init__(game_id, "Invalid response format: {}".format(msg))
class GameExportInvalidNumberOfPlayersError(GameExportInvalidFormatError): class GameExportInvalidNumberOfPlayersError(GameExportInvalidFormatError):
def __init__(self, game_id, expected, received): def __init__(self, game_id, expected, received):
super().__init__(game_id, "Received invalid list of players: Expected {}, got {}".format(expected, received)) super().__init__(game_id, "Received invalid list of players: Expected {}, got {}".format(expected, received))
pass pass
# #
def detailed_export_game( def detailed_export_game(
game_id: int, game_id: int
score: Optional[int] = None, , score: Optional[int] = None
num_players: Optional[int] = None, , num_players: Optional[int] = None
var_id: Optional[int] = None, , var_id: Optional[int] = None
seed_exists: bool = False , seed_exists: bool = False
) -> None: ) -> None:
""" """
Downloads full details of game from hanab.live, inserts seed and game into DB Downloads full details of game from hanab.live, inserts seed and game into DB
@ -167,7 +170,7 @@ def detailed_export_game(
logger.debug("Imported game {}".format(game_id)) logger.debug("Imported game {}".format(game_id))
def process_game_row(game: Dict, var_id, export_all_games: bool = False): def _process_game_row(game: Dict, var_id, export_all_games: bool = False):
game_id = game.get('id', None) game_id = game.get('id', None)
seed = game.get('seed', None) seed = game.get('seed', None)
num_players = game.get('num_players', None) num_players = game.get('num_players', None)
@ -194,7 +197,7 @@ def process_game_row(game: Dict, var_id, export_all_games: bool = False):
# Sometimes, seed is not present in the database yet, then we will have to query the full game details # Sometimes, seed is not present in the database yet, then we will have to query the full game details
# (including the seed) to export it accordingly # (including the seed) to export it accordingly
database.cur.execute("ROLLBACK TO seed_insert") database.cur.execute("ROLLBACK TO seed_insert")
detailed_export_game(game_id, score, var_id) detailed_export_game(game_id, score=score, num_players=num_players, var_id=var_id)
database.cur.execute("RELEASE seed_insert") database.cur.execute("RELEASE seed_insert")
logger.debug("Imported game {}".format(game_id)) logger.debug("Imported game {}".format(game_id))
@ -246,7 +249,7 @@ def download_games(var_id, export_all_games: bool = False):
if not (page == last_page or len(rows) == page_size): if not (page == last_page or len(rows) == page_size):
logger.warn('WARN: received unexpected row count ({}) on page {}'.format(len(rows), page)) logger.warn('WARN: received unexpected row count ({}) on page {}'.format(len(rows), page))
for row in rows: for row in rows:
process_game_row(row, var_id, export_all_games) _process_game_row(row, var_id, export_all_games)
bar() bar()
database.cur.execute( database.cur.execute(
"INSERT INTO variant_game_downloads (variant_id, last_game_id) VALUES" "INSERT INTO variant_game_downloads (variant_id, last_game_id) VALUES"