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

Use readonly-search for prototypes

Browse source
This commit is contained in:
Griatch 2018-03-03 16:24:17 +01:00
parent a7eed91d90
commit 8c4ceea4cd
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
evennia/utils/olc/olc_storage.py
View file

@ -159,7 +159,7 @@ def search_readonly_prototype(key=None, tags=None):
prototype metadata, prototype metadata,
""" """
matches = [] matches = {}
if tags: if tags:
# use tags to limit selection # use tags to limit selection
tagset = set(tags) tagset = set(tags)
@ -171,11 +171,12 @@ def search_readonly_prototype(key=None, tags=None):
if key: if key:
if key in matches: if key in matches:
# exact match # exact match
return matches[key] return [matches[key]]
else: else:
# fuzzy matching # fuzzy matching
return [metaproto for pkey, metaproto in matches.items() if key in pkey] return [metaproto for pkey, metaproto in matches.items() if key in pkey]
return matches else:
return [match for match in matches.values()]
def search_prototype(key=None, tags=None): def search_prototype(key=None, tags=None):
@ -223,10 +224,7 @@ def get_prototype_list(caller, key=None, tags=None, show_non_use=False, show_non
""" """
# handle read-only prototypes separately # handle read-only prototypes separately
if key and key in _READONLY_PROTOTYPES: readonly_prototypes = search_readonly_prototype(key, tags)
readonly_prototypes = _READONLY_PROTOTYPES[key]
else:
readonly_prototypes = _READONLY_PROTOTYPES.values()
# get use-permissions of readonly attributes (edit is always False) # get use-permissions of readonly attributes (edit is always False)
readonly_prototypes = [ readonly_prototypes = [
@ -239,9 +237,6 @@ def get_prototype_list(caller, key=None, tags=None, show_non_use=False, show_non
# next, handle db-stored prototypes # next, handle db-stored prototypes
prototypes = search_persistent_prototype(key, tags) prototypes = search_persistent_prototype(key, tags)
if not prototypes:
return None
# gather access permissions as (key, desc, tags, can_use, can_edit) # gather access permissions as (key, desc, tags, can_use, can_edit)
prototypes = [(prototype.key, prototype.desc, prototypes = [(prototype.key, prototype.desc,
"{}/{}".format('Y' if prototype.access(caller, "use") else 'N', "{}/{}".format('Y' if prototype.access(caller, "use") else 'N',
@ -251,6 +246,9 @@ def get_prototype_list(caller, key=None, tags=None, show_non_use=False, show_non
prototypes = prototypes + readonly_prototypes prototypes = prototypes + readonly_prototypes
if not prototypes:
return None
if not show_non_use: if not show_non_use:
prototypes = [tup for tup in sorted(prototypes, key=lambda o: o[0]) if tup[2]] prototypes = [tup for tup in sorted(prototypes, key=lambda o: o[0]) if tup[2]]
if not show_non_edit: if not show_non_edit: