Skip to content

Commit

Permalink
cleaned up fakeplayer.py
Browse files Browse the repository at this point in the history
  • Loading branch information
nfearnley committed May 21, 2024
1 parent 6e3bfec commit 143d5fb
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions sizebot/lib/fakeplayer.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def __init__(self, name: str, parser: Callable[[str], T], *, saveas: str | None
self.saveas = saveas or name


fakestats_list: list[FakePlayerStat] = [
_fakestats_list: list[FakePlayerStat] = [
FakePlayerStat("nickname", str),
FakePlayerStat("height", SV.parse),
FakePlayerStat("baseheight", SV.parse),
Expand All @@ -45,22 +45,22 @@ def __init__(self, name: str, parser: Callable[[str], T], *, saveas: str | None
FakePlayerStat("scale", parse_scale)
]

fakestats = {stat.name: stat for stat in fakestats_list}
_fakestats = {stat.name: stat for stat in _fakestats_list}


def parse_keyvalues(s: str) -> dict[str, Any]:
def _parse_keyvalues(s: str) -> dict[str, Any]:
# $key=value;key=value;key=value...
re_full = r"\$((?:\w+=[^;$=]+;?)+)"
m = re.match(re_full, s)
if m is None:
raise InvalidSizeValue(s, "FakePlayer")
full = m.group(1)
allkeyvalues = [parse_keyvalue(kv_str) for kv_str in full.split(";")]
allkeyvalues = [_parse_keyvalue(kv_str) for kv_str in full.split(";")]
keyvalues = {k: v for k, v in allkeyvalues if v is not None}
return keyvalues


def parse_keyvalue(kv_str: str) -> tuple[str, Any]:
def _parse_keyvalue(kv_str: str) -> tuple[str, Any]:
# key=value
re_keyvalue = r"(\w+)=([^;$=]+)"
m = re.match(re_keyvalue, kv_str)
Expand All @@ -70,9 +70,9 @@ def parse_keyvalue(kv_str: str) -> tuple[str, Any]:
# Special exception for shoesize where we _actually_ set footlength
if key != "shoesize":
key = get_mapped_stat(key)
if key not in fakestats:
if key not in _fakestats:
raise InvalidStat(key)
stat = fakestats[key]
stat = _fakestats[key]
savekey = stat.saveas
val = stat.parse(val_str)
return savekey, val
Expand Down Expand Up @@ -140,7 +140,7 @@ def __init__(
@classmethod
def parse(cls, s: str) -> FakePlayer:
# $key=value;key=value;key=value...
keyvalues = parse_keyvalues(s)
keyvalues = _parse_keyvalues(s)
player = FakePlayer(**keyvalues)
return player

Expand Down

0 comments on commit 143d5fb

Please sign in to comment.