Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2720 from InspectorCaracal/sdesc_key_parse

Browse source 
`rpsystem` contrib: cache regex tuples by ID instead of key+aliases
This commit is contained in:
Griatch 2022-04-15 08:24:30 +02:00 • committed by GitHub
commit b3b87a5a1c
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/contrib/rpg/rpsystem/rpsystem.py
View file

@ -319,14 +319,15 @@ def regex_tuple_from_key_alias(obj):
""" """
global _REGEX_TUPLE_CACHE global _REGEX_TUPLE_CACHE
permutation_string = " ".join([obj.key] + obj.aliases.all()) permutation_string = " ".join([obj.key] + obj.aliases.all())
cache_key = f"{obj.id} {permutation_string}"
if permutation_string not in _REGEX_TUPLE_CACHE: if cache_key not in _REGEX_TUPLE_CACHE:
_REGEX_TUPLE_CACHE[permutation_string] = ( _REGEX_TUPLE_CACHE[cache_key] = (
re.compile(ordered_permutation_regex(permutation_string), _RE_FLAGS), re.compile(ordered_permutation_regex(permutation_string), _RE_FLAGS),
obj, obj,
obj.key, obj.key,
) )
return _REGEX_TUPLE_CACHE[permutation_string] return _REGEX_TUPLE_CACHE[cache_key]
def parse_language(speaker, emote): def parse_language(speaker, emote):