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

Resolved merge conflict

Browse source
This commit is contained in:
Griatch 2015-03-09 16:04:01 +01:00
parent 1fdd83f7a7
commit 7fdece962c
2 changed files with 93 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/utils/text2html.py
View file

@ -16,7 +16,7 @@ from ansi import *
class TextToHTMLparser(object): class TextToHTMLparser(object):
""" """
This class describes a parser for converting from ansi to html. This class describes a parser for converting from ANSI to html.
""" """
tabstop = 4 tabstop = 4
@ -145,7 +145,7 @@ class TextToHTMLparser(object):
def parse(self, text, strip_ansi=False): def parse(self, text, strip_ansi=False):
""" """
Main access function, converts a text containing Main access function, converts a text containing
ansi codes into html statements. ANSI codes into html statements.
""" """
# parse everything to ansi first # parse everything to ansi first
text = parse_ansi(text, strip_ansi=strip_ansi, xterm256=False, mxp=True) text = parse_ansi(text, strip_ansi=strip_ansi, xterm256=False, mxp=True)
@ -173,6 +173,6 @@ HTML_PARSER = TextToHTMLparser()
def parse_html(string, strip_ansi=False, parser=HTML_PARSER): def parse_html(string, strip_ansi=False, parser=HTML_PARSER):
""" """
Parses a string, replace ansi markup with html Parses a string, replace ANSI markup with html
""" """
return parser.parse(string, strip_ansi=strip_ansi) return parser.parse(string, strip_ansi=strip_ansi)

167
evennia/utils/utils.py
View file

@ -87,7 +87,7 @@ def pad(text, width=78, align="c", fillchar=" "):
def crop(text, width=78, suffix="[...]"): def crop(text, width=78, suffix="[...]"):
""" """
Crop text to a certain width, adding suffix to show the line Crop text to a certain width, adding `suffix` to show that the line
continues. Cropping will be done so that the suffix will also fit continues. Cropping will be done so that the suffix will also fit
within the given width. If width is too small to fit both crop within the given width. If width is too small to fit both crop
and suffix, crop without the suffix. and suffix, crop without the suffix.
@ -120,15 +120,17 @@ def list_to_string(inlist, endsep="and", addquote=False):
""" """
This pretty-formats a list as string output, adding This pretty-formats a list as string output, adding
an optional alternative separator to the second to last entry. an optional alternative separator to the second to last entry.
If addquote is True, the outgoing strings will be surrounded by quotes. If `addquote` is `True`, the outgoing strings will be surrounded by quotes.
Examples: Examples:
```
no endsep: no endsep:
[1,2,3] -> '1, 2, 3' [1,2,3] -> '1, 2, 3'
with endsep=='and': with endsep=='and':
[1,2,3] -> '1, 2 and 3' [1,2,3] -> '1, 2 and 3'
with addquote and endsep with addquote and endsep
[1,2,3] -> '"1", "2" and "3"' [1,2,3] -> '"1", "2" and "3"'
```
""" """
if not endsep: if not endsep:
endsep = "," endsep = ","
@ -151,7 +153,7 @@ def wildcard_to_regexp(instring):
Converts a player-supplied string that may have wildcards in it to regular Converts a player-supplied string that may have wildcards in it to regular
expressions. This is useful for name matching. expressions. This is useful for name matching.
instring: (string) A string that may potentially contain wildcards (* or ?). instring: (string) A string that may potentially contain wildcards (`*` or `?`).
""" """
regexp_string = "" regexp_string = ""
@ -268,7 +270,7 @@ def time_format(seconds, style=0):
def datetime_format(dtobj): def datetime_format(dtobj):
""" """
Takes a datetime object instance (e.g. from django's DateTimeField) Takes a datetime object instance (e.g. from Django's `DateTimeField`)
and returns a string describing how long ago that date was. and returns a string describing how long ago that date was.
""" """
@ -320,7 +322,7 @@ def pypath_to_realpath(python_path, file_ending='.py'):
Returns: Returns:
abspaths (list of str): The two absolute paths created by prepending abspaths (list of str): The two absolute paths created by prepending
EVENNIA_DIR and GAME_DIR respectively. These are checked for `EVENNIA_DIR` and `GAME_DIR` respectively. These are checked for
existence before being returned, so this may be an empty list. existence before being returned, so this may be an empty list.
""" """
@ -338,11 +340,11 @@ def pypath_to_realpath(python_path, file_ending='.py'):
def dbref(dbref, reqhash=True): def dbref(dbref, reqhash=True):
""" """
Converts/checks if input is a valid dbref. If reqhash is set, Converts/checks if input is a valid dbref. If `reqhash` is set,
only input strings on the form '#N', where N is an integer is only input strings on the form '#N', where N is an integer is
accepted. Otherwise strings '#N', 'N' and integers N are all accepted. Otherwise strings '#N', 'N' and integers N are all
accepted. accepted.
Output is the integer part. Output is the integer part.
""" """
if reqhash: if reqhash:
num = (int(dbref.lstrip('#')) if (isinstance(dbref, basestring) and num = (int(dbref.lstrip('#')) if (isinstance(dbref, basestring) and
@ -359,9 +361,9 @@ def dbref(dbref, reqhash=True):
def dbid_to_obj(inp, objclass, raise_errors=True): def dbid_to_obj(inp, objclass, raise_errors=True):
""" """
Convert a #dbid to a valid object of objclass. objclass Convert a #dbid to a valid object of `objclass`. `objclass`
should be a valid object class to filter against (objclass.filter ...) should be a valid object class to filter against (`objclass.filter` ...)
If not raise_errors is set, this will swallow errors of non-existing If not `raise_errors` is set, this will swallow errors of non-existing
objects. objects.
""" """
dbid = dbref(inp) dbid = dbref(inp)
@ -388,7 +390,7 @@ def to_unicode(obj, encoding='utf-8', force_string=False):
one needs to encode it back to utf-8 before writing to disk or one needs to encode it back to utf-8 before writing to disk or
printing. Note that non-string objects are let through without printing. Note that non-string objects are let through without
conversion - this is important for e.g. Attributes. Use conversion - this is important for e.g. Attributes. Use
force_string to enforce conversion of objects to string. . `force_string` to enforce conversion of objects to string.
""" """
if force_string and not isinstance(obj, basestring): if force_string and not isinstance(obj, basestring):
@ -422,7 +424,7 @@ def to_str(obj, encoding='utf-8', force_string=False):
This encodes a unicode string back to byte-representation, This encodes a unicode string back to byte-representation,
for printing, writing to disk etc. Note that non-string for printing, writing to disk etc. Note that non-string
objects are let through without modification - this is objects are let through without modification - this is
required e.g. for Attributes. Use force_string to force required e.g. for Attributes. Use `force_string` to force
conversion of objects to strings. conversion of objects to strings.
""" """
@ -492,8 +494,8 @@ def validate_email_address(emailaddress):
def inherits_from(obj, parent): def inherits_from(obj, parent):
""" """
Takes an object and tries to determine if it inherits at any distance Takes an object and tries to determine if it inherits at any distance
from parent. What differs this function from e.g. isinstance() from parent. What differs this function from e.g. `isinstance()`
is that obj may be both an instance and a class, and parent is that `obj` may be both an instance and a class, and parent
may be an instance, a class, or the python path to a class (counting may be an instance, a class, or the python path to a class (counting
from the evennia root directory). from the evennia root directory).
""" """
@ -518,7 +520,7 @@ def inherits_from(obj, parent):
def server_services(): def server_services():
""" """
Lists all services active on the Server. Observe that Lists all services active on the Server. Observe that
since services are launced in memory, this function will since services are launched in memory, this function will
only return any results if called from inside the game. only return any results if called from inside the game.
""" """
from evennia.server.sessionhandler import SESSIONS from evennia.server.sessionhandler import SESSIONS
@ -534,7 +536,7 @@ def server_services():
def uses_database(name="sqlite3"): def uses_database(name="sqlite3"):
""" """
Checks if the game is currently using a given database. This is a Checks if the game is currently using a given database. This is a
shortcut to having to use the full backend name shortcut to having to use the full backend name.
name - one of 'sqlite3', 'mysql', 'postgresql_psycopg2' or 'oracle' name - one of 'sqlite3', 'mysql', 'postgresql_psycopg2' or 'oracle'
""" """
@ -551,12 +553,12 @@ def delay(delay=2, callback=None, retval=None):
Inputs: Inputs:
delay (int) - the delay in seconds delay (int) - the delay in seconds
callback (func() or func(retval)) - if given, will be called without callback (func() or func(retval)) - if given, will be called without
arguments or with retval after delay seconds arguments or with `retval` after delay seconds.
retval (any) - this will be returned by this function after a delay, retval (any) - this will be returned by this function after a delay,
or as input to callback or as input to callback.
Returns: Returns:
deferred that will fire with callback after delay seconds. Note that deferred that will fire with callback after `delay` seconds. Note that
if delay() is used in the commandhandler callback chain, the callback if `delay()` is used in the commandhandler callback chain, the callback
chain can be defined directly in the command body and don't need to be chain can be defined directly in the command body and don't need to be
specified here. specified here.
""" """
@ -571,7 +573,7 @@ _TYPECLASSMODELS = None
_OBJECTMODELS = None _OBJECTMODELS = None
def clean_object_caches(obj): def clean_object_caches(obj):
""" """
Clean all object caches on the given object Clean all object caches on the given object.
""" """
global _TYPECLASSMODELS, _OBJECTMODELS global _TYPECLASSMODELS, _OBJECTMODELS
if not _TYPECLASSMODELS: if not _TYPECLASSMODELS:
@ -607,7 +609,7 @@ def run_async(to_execute, *args, **kwargs):
Inputs: Inputs:
to_execute (callable) - if this is a callable, it will to_execute (callable) - if this is a callable, it will
be executed with *args and non-reserver *kwargs as be executed with *args and non-reserved *kwargs as
arguments. arguments.
The callable will be executed using ProcPool, or in The callable will be executed using ProcPool, or in
a thread if ProcPool is not available. a thread if ProcPool is not available.
@ -642,7 +644,7 @@ def run_async(to_execute, *args, **kwargs):
Also note that some databases, notably sqlite3, don't support access from Also note that some databases, notably sqlite3, don't support access from
multiple threads simultaneously, so if you do heavy database access from multiple threads simultaneously, so if you do heavy database access from
your to_execute under sqlite3 you will probably run very slow or even get your `to_execute` under sqlite3 you will probably run very slow or even get
tracebacks. tracebacks.
""" """
@ -733,7 +735,9 @@ def check_evennia_dependencies():
def has_parent(basepath, obj): def has_parent(basepath, obj):
"Checks if basepath is somewhere in objs parent tree." """
Checks if `basepath` is somewhere in `obj`s parent tree.
"""
try: try:
return any(cls for cls in obj.__class__.mro() return any(cls for cls in obj.__class__.mro()
if basepath == "%s.%s" % (cls.__module__, cls.__name__)) if basepath == "%s.%s" % (cls.__module__, cls.__name__))
@ -749,20 +753,20 @@ def mod_import(module):
Args: Args:
module - this can be either a Python path (dot-notation like module - this can be either a Python path (dot-notation like
evennia.objects.models), an absolute path `evennia.objects.models`), an absolute path
(e.g. /home/eve/evennia/evennia/objects.models.py) (e.g. `/home/eve/evennia/evennia/objects.models.py`)
or an already imported module object (e.g. models) or an already imported module object (e.g. `models`)
Returns: Returns:
an imported module. If the input argument was already a model, an imported module. If the input argument was already a model,
this is returned as-is, otherwise the path is parsed and imported. this is returned as-is, otherwise the path is parsed and imported.
Error: Error:
returns None. The error is also logged. returns `None`. The error is also logged.
""" """
def log_trace(errmsg=None): def log_trace(errmsg=None):
""" """
Log a traceback to the log. This should be called Log a traceback to the log. This should be called
from within an exception. errmsg is optional and from within an exception. `errmsg` is optional and
adds an extra line with added info. adds an extra line with added info.
""" """
from twisted.python import log from twisted.python import log
@ -836,21 +840,21 @@ def variable_from_module(module, variable=None, default=None):
""" """
Retrieve a variable or list of variables from a module. The variable(s) Retrieve a variable or list of variables from a module. The variable(s)
must be defined globally in the module. If no variable is given (or a must be defined globally in the module. If no variable is given (or a
list entry is None), all global variables are extracted from the module. list entry is `None`), all global variables are extracted from the module.
If module cannot be imported or given variable not found, default If `module` cannot be imported or a given `variable` not found, `default`
is returned. is returned.
Args: Args:
module (string or module)- python path, absolute path or a module module (string or module)- python path, absolute path or a module.
variable (string or iterable) - single variable name or iterable of variable (string or iterable) - single variable name or iterable of
variable names to extract variable names to extract.
default (string) - default value to use if a variable fails default (string) - default value to use if a variable fails
to be extracted. Ignored if variable is not given to be extracted. Ignored if `variable` is not given.
Returns: Returns:
a single value or a list of values depending on the type of a single value or a list of values depending on the type of
'variable' argument. Errors in lists are replaced by the `variable` argument. Errors in lists are replaced by the
'default' argument. `default` argument.
""" """
if not module: if not module:
@ -876,10 +880,10 @@ def variable_from_module(module, variable=None, default=None):
def string_from_module(module, variable=None, default=None): def string_from_module(module, variable=None, default=None):
""" """
This is a wrapper for variable_from_module that requires return This is a wrapper for `variable_from_module` that requires return
value to be a string to pass. It's primarily used by login screen. value to be a string to pass. It's primarily used by login screen.
if variable is not set, returns a list of all string variables in if `variable` is not set, returns a list of all string variables in
module `module`.
""" """
val = variable_from_module(module, variable=variable, default=default) val = variable_from_module(module, variable=variable, default=default)
if val: if val:
@ -892,21 +896,21 @@ def string_from_module(module, variable=None, default=None):
def random_string_from_module(module): def random_string_from_module(module):
""" """
Returns a random global string from a module Returns a random global string from a module.
""" """
return random.choice(string_from_module(module)) return random.choice(string_from_module(module))
def fuzzy_import_from_module(path, variable, default=None, defaultpaths=None): def fuzzy_import_from_module(path, variable, default=None, defaultpaths=None):
""" """
Import a variable based on a fuzzy path. First the literal Import a variable based on a fuzzy path. First the literal
path will be tried, then all given defaultdirs will be `path` will be tried, then all given `defaultpaths` will be
prepended to see a match is found. prepended to see a match is found.
path - full or partial python path path - full or partial python path.
variable - name of variable to import from module variable - name of variable to import from module.
defaultpaths - an iterable of python paths to attempt defaultpaths - an iterable of python paths to attempt
in order if importing directly from in order if importing directly from
path does not work. `path` doesn't work.
""" """
paths = [path] + make_iter(defaultpaths) paths = [path] + make_iter(defaultpaths)
for modpath in paths: for modpath in paths:
@ -925,8 +929,8 @@ def class_from_module(path, defaultpaths=None):
Return a class from a module, given the module's path. This is Return a class from a module, given the module's path. This is
primarily used to convert db_typeclass_path:s to classes. primarily used to convert db_typeclass_path:s to classes.
if a list of defaultpaths is given, try subsequent runs by if a list of `defaultpaths` is given, try subsequent runs by
prepending those paths to the given path. prepending those paths to the given `path`.
""" """
cls = None cls = None
if defaultpaths: if defaultpaths:
@ -972,7 +976,7 @@ object_from_module = class_from_module
def init_new_player(player): def init_new_player(player):
""" """
Helper method to call all hooks, set flags etc on a newly created Helper method to call all hooks, set flags etc on a newly created
player (and potentially their character, if it exists already) player (and potentially their character, if it exists already).
""" """
# the FIRST_LOGIN flags are necessary for the system to call # the FIRST_LOGIN flags are necessary for the system to call
# the relevant first-login hooks. # the relevant first-login hooks.
@ -984,8 +988,8 @@ def init_new_player(player):
def string_similarity(string1, string2): def string_similarity(string1, string2):
""" """
This implements a "cosine-similarity" algorithm as described for example in This implements a "cosine-similarity" algorithm as described for example in
Proceedings of the 22nd International Conference on Computation *Proceedings of the 22nd International Conference on Computation
Linguistics (Coling 2008), pages 593-600, Manchester, August 2008 Linguistics* (Coling 2008), pages 593-600, Manchester, August 2008.
The measure-vectors used is simply a "bag of words" type histogram The measure-vectors used is simply a "bag of words" type histogram
(but for letters). (but for letters).
@ -1006,18 +1010,18 @@ def string_similarity(string1, string2):
def string_suggestions(string, vocabulary, cutoff=0.6, maxnum=3): def string_suggestions(string, vocabulary, cutoff=0.6, maxnum=3):
""" """
Given a string and a vocabulary, return a match or a list of suggestions Given a `string` and a `vocabulary`, return a match or a list of suggestions
based on string similarity. based on string similarity.
Args: Args:
string (str)- a string to search for string (str)- a string to search for.
vocabulary (iterable) - a list of available strings vocabulary (iterable) - a list of available strings.
cutoff (int, 0-1) - limit the similarity matches (higher, the more cutoff (int, 0-1) - limit the similarity matches (higher, the more
exact is required) exact is required).
maxnum (int) - maximum number of suggestions to return maxnum (int) - maximum number of suggestions to return.
Returns: Returns:
list of suggestions from vocabulary (could be empty if there are list of suggestions from `vocabulary` (could be empty if there are
no matches) no matches).
""" """
return [tup[1] for tup in sorted([(string_similarity(string, sugg), sugg) return [tup[1] for tup in sorted([(string_similarity(string, sugg), sugg)
for sugg in vocabulary], for sugg in vocabulary],
@ -1027,19 +1031,19 @@ def string_suggestions(string, vocabulary, cutoff=0.6, maxnum=3):
def string_partial_matching(alternatives, inp, ret_index=True): def string_partial_matching(alternatives, inp, ret_index=True):
""" """
Partially matches a string based on a list of alternatives. Matching Partially matches a string based on a list of `alternatives`. Matching
is made from the start of each subword in each alternative. Case is not is made from the start of each subword in each alternative. Case is not
important. So e.g. "bi sh sw" or just "big" or "shiny" or "sw" will match important. So e.g. "bi sh sw" or just "big" or "shiny" or "sw" will match
"Big shiny sword". Scoring is done to allow to separate by most common "Big shiny sword". Scoring is done to allow to separate by most common
demoninator. You will get multiple matches returned if appropriate. demoninator. You will get multiple matches returned if appropriate.
Input: Input:
alternatives (list of str) - list of possible strings to match alternatives (list of str) - list of possible strings to match.
inp (str) - search criterion inp (str) - search criterion.
ret_index (bool) - return list of indices (from alternatives ret_index (bool) - return list of indices (from alternatives
array) or strings array) or strings.
Returns: Returns:
list of matching indices or strings, or an empty list list of matching indices or strings, or an empty list.
""" """
if not alternatives or not inp: if not alternatives or not inp:
@ -1075,23 +1079,24 @@ def string_partial_matching(alternatives, inp, ret_index=True):
def format_table(table, extra_space=1): def format_table(table, extra_space=1):
""" """
Note: evennia.utils.prettytable is more powerful than this, but this Note: `evennia.utils.prettytable` is more powerful than this, but this
function can be useful when the number of columns and rows are function can be useful when the number of columns and rows are
unknown and must be calculated on the fly. unknown and must be calculated on the fly.
Takes a table of collumns: [[val,val,val,...], [val,val,val,...], ...] Takes a table of columns: [[val,val,val,...], [val,val,val,...], ...]
where each val will be placed on a separate row in the column. All where each val will be placed on a separate row in the column. All
collumns must have the same number of rows (some positions may be columns must have the same number of rows (some positions may be
empty though). empty though).
The function formats the columns to be as wide as the widest member The function formats the columns to be as wide as the widest member
of each column. of each column.
extra_space defines how much extra padding should minimum be left between `extra_space` defines how much *minimum* extra padding should be left between
collumns. columns.
print the resulting list e.g. with print the resulting list e.g. with:
```python
for ir, row in enumarate(ftable): for ir, row in enumarate(ftable):
if ir == 0: if ir == 0:
# make first row white # make first row white
@ -1099,7 +1104,7 @@ def format_table(table, extra_space=1):
else: else:
string += "\n" + "".join(row) string += "\n" + "".join(row)
print string print string
```
""" """
if not table: if not table:
return [[]] return [[]]
@ -1114,13 +1119,14 @@ def format_table(table, extra_space=1):
def get_evennia_pids(): def get_evennia_pids():
""" """
Get the currently valid PIDs (Process IDs) of the Portal and Server Get the currently valid PIDs (Process IDs) of the Portal and Server
by trying to access an PID file. This can be used to determine if we by trying to access a PID file. This can be used to determine if we
are in a subprocess by something like are in a subprocess by something like:
self_pid = os.getpid()
server_pid, portal_pid = get_evennia_pids()
is_subprocess = self_pid not in (server_pid, portal_pid)
```python
self_pid = os.getpid()
server_pid, portal_pid = get_evennia_pids()
is_subprocess = self_pid not in (server_pid, portal_pid)
```
""" """
server_pidfile = os.path.join(settings.GAME_DIR, 'server.pid') server_pidfile = os.path.join(settings.GAME_DIR, 'server.pid')
portal_pidfile = os.path.join(settings.GAME_DIR, 'portal.pid') portal_pidfile = os.path.join(settings.GAME_DIR, 'portal.pid')
@ -1143,14 +1149,21 @@ def deepsize(obj, max_depth=4):
""" """
Get not only size of the given object, but also the Get not only size of the given object, but also the
size of objects referenced by the object, down to size of objects referenced by the object, down to
max_depth distance from the object. `max_depth` distance from the object.
Note that this measure is necessarily approximate Note that this measure is necessarily approximate
since some memory is shared between objects. The since some memory is shared between objects. The
max_depth of 4 is roughly tested to give reasonable `max_depth` of 4 is roughly tested to give reasonable
size information about database models and their handlers. size information about database models and their handlers.
Returns size in Bytes Args:
obj (object): the object to be measured.
max_depth (int, optional): maximum referential distance
from `obj` that `deepsize()` should cover for
measuring objects referenced by `obj`.
Returns:
size (int): deepsize of `obj` in Bytes.
""" """
def _recurse(o, dct, depth): def _recurse(o, dct, depth):
if max_depth >= 0 and depth > max_depth: if max_depth >= 0 and depth > max_depth: