From 3fc93a33c8268becd0b2a8c4a5a94d5856b281b8 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Mon, 14 Feb 2022 04:58:21 +0100 Subject: [PATCH] WebHost: check for duplicate names Generate: use Counter for duplicate names to make finding the dupes easier --- Generate.py | 4 ++-- WebHostLib/generate.py | 3 ++- worlds/factorio/requirements.txt | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Generate.py b/Generate.py index aa826a64..1ef8a067 100644 --- a/Generate.py +++ b/Generate.py @@ -14,7 +14,7 @@ ModuleUpdate.update() import Utils from worlds.alttp import Options as LttPOptions -from worlds.generic import PlandoItem, PlandoConnection +from worlds.generic import PlandoConnection from Utils import parse_yaml, version_tuple, __version__, tuplize_version, get_options from worlds.alttp.EntranceRandomizer import parse_arguments from Main import main as ERmain @@ -180,7 +180,7 @@ def main(args=None, callback=ERmain): erargs.name[player] = handle_name(erargs.name[player], player, name_counter) if len(set(erargs.name.values())) != len(erargs.name): - raise Exception(f"Names have to be unique. Names: {erargs.name}") + raise Exception(f"Names have to be unique. Names: {Counter(erargs.name.values())}") if args.yaml_output: import yaml diff --git a/WebHostLib/generate.py b/WebHostLib/generate.py index 58bd4441..7570710f 100644 --- a/WebHostLib/generate.py +++ b/WebHostLib/generate.py @@ -121,7 +121,8 @@ def gen_game(gen_options, meta: TypeOptional[Dict[str, object]] = None, owner=No if not erargs.name[player]: erargs.name[player] = os.path.splitext(os.path.split(playerfile)[-1])[0] erargs.name[player] = handle_name(erargs.name[player], player, name_counter) - + if len(set(erargs.name.values())) != len(erargs.name): + raise Exception(f"Names have to be unique. Names: {Counter(erargs.name.values())}") ERmain(erargs, seed, baked_server_options=meta) return upload_to_db(target.name, sid, owner, race) diff --git a/worlds/factorio/requirements.txt b/worlds/factorio/requirements.txt index 5f0daad4..ce5a8304 100644 --- a/worlds/factorio/requirements.txt +++ b/worlds/factorio/requirements.txt @@ -1,2 +1 @@ factorio-rcon-py>=1.2.1 -schema>=0.7.4