From 00feff6b56f0c8e01c4df558c615fddc3b6346aa Mon Sep 17 00:00:00 2001 From: CaitSith2 Date: Sat, 13 Mar 2021 15:15:12 -0800 Subject: [PATCH 1/2] Keep all "." in player name except ".yaml" --- Mystery.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mystery.py b/Mystery.py index c3c8ff44..9dc20024 100644 --- a/Mystery.py +++ b/Mystery.py @@ -188,7 +188,7 @@ def main(args=None, callback=ERmain): if path == args.weights: settings.name = f"Player{player}" elif not settings.name: - settings.name = os.path.split(path)[-1].split(".")[0] + settings.name = ".".join(os.path.split(path)[-1].split(".")[0:-1]) if "-" not in settings.shuffle and settings.shuffle != "vanilla": settings.shuffle += f"-{random.randint(0, 2 ** 64)}" @@ -214,7 +214,7 @@ def main(args=None, callback=ERmain): if path == args.weights: # if name came from the weights file, just use base player name erargs.name[player] = f"Player{player}" elif not erargs.name[player]: # if name was not specified, generate it from filename - erargs.name[player] = os.path.split(path)[-1].split(".")[0] + erargs.name[player] = ".".join(os.path.split(path)[-1].split(".")[0:-1]) new_name = [] name_counter[erargs.name[player]] += 1 for name in erargs.name[player].split("%%"): From 7000f572f6541f7a2fba581678886cd0e4861d4d Mon Sep 17 00:00:00 2001 From: CaitSith2 Date: Sat, 13 Mar 2021 15:26:21 -0800 Subject: [PATCH 2/2] use os.path.splitext() to remove ".yaml" from player name. --- Mystery.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mystery.py b/Mystery.py index 9dc20024..ef11fb82 100644 --- a/Mystery.py +++ b/Mystery.py @@ -188,7 +188,7 @@ def main(args=None, callback=ERmain): if path == args.weights: settings.name = f"Player{player}" elif not settings.name: - settings.name = ".".join(os.path.split(path)[-1].split(".")[0:-1]) + settings.name = os.path.splitext(os.path.split(path)[-1])[0] if "-" not in settings.shuffle and settings.shuffle != "vanilla": settings.shuffle += f"-{random.randint(0, 2 ** 64)}" @@ -214,7 +214,7 @@ def main(args=None, callback=ERmain): if path == args.weights: # if name came from the weights file, just use base player name erargs.name[player] = f"Player{player}" elif not erargs.name[player]: # if name was not specified, generate it from filename - erargs.name[player] = ".".join(os.path.split(path)[-1].split(".")[0:-1]) + erargs.name[player] = os.path.splitext(os.path.split(path)[-1])[0] new_name = [] name_counter[erargs.name[player]] += 1 for name in erargs.name[player].split("%%"):