From 973d6c912f0cb134f7f828c759af24d77688c2de Mon Sep 17 00:00:00 2001 From: Jylpah Date: Thu, 22 Oct 2020 23:51:38 +0300 Subject: [PATCH] get_map(): renamed, get_tank_name(): add back --- blitzutils.py | 10 ++++++++++ upload_wotb_replays.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/blitzutils.py b/blitzutils.py index 1cf8940..1b3e13d 100755 --- a/blitzutils.py +++ b/blitzutils.py @@ -885,6 +885,16 @@ class WG: return cls.maps.keys() + @classmethod + def get_tank_name(cls, tank_str: str) -> str: + """Return tank name from short tank string in replays""" + try: + return cls.tanks["userStr"][tank_str] + except: + error('Tank ' + tank_str + ' not found') + return tank_str + + @classmethod def get_tank_user_strs(cls) -> str: return cls.tanks["userStr"].keys() diff --git a/upload_wotb_replays.py b/upload_wotb_replays.py index bcd07e3..3128c24 100755 --- a/upload_wotb_replays.py +++ b/upload_wotb_replays.py @@ -287,7 +287,7 @@ def getTitle(replayfile: str, title: str, i : int) -> str: metadata_json = json.load(meta) #player = metadata_json['playerName'] tank = wg.get_tank_name(metadata_json['playerVehicleName']) - map_name = wg.get_map_name(metadata_json['mapName']) + map_name = wg.get_map(metadata_json['mapName']) bu.debug('Tank: ' + tank + ' Map: ' + map_name) except Exception as err: bu.error(exception = err)