From fb5dcc2eff1e5ff32684cc9fb1eec352b638d0aa Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 14 Apr 2019 21:06:43 +0200
Subject: [PATCH] Remove validator container, allow direct setting of options

---
 evennia/__init__.py             |  8 ++--
 evennia/utils/containers.py     | 10 -----
 evennia/utils/optionclasses.py  | 55 ++++++++++++++++--------
 evennia/utils/optionhandler.py  | 21 +++++++++
 evennia/utils/validatorfuncs.py | 75 ++++++++++++++++++---------------
 5 files changed, 102 insertions(+), 67 deletions(-)

diff --git a/evennia/__init__.py b/evennia/__init__.py
index b903dafc2a..966002ae35 100644
--- a/evennia/__init__.py
+++ b/evennia/__init__.py
@@ -109,10 +109,9 @@ TASK_HANDLER = None
 TICKER_HANDLER = None
 MONITOR_HANDLER = None
 CHANNEL_HANDLER = None
-GLOBAL_SCRIPTS = None
 
 # Containers
-VALIDATOR_FUNCTIONS = None
+GLOBAL_SCRIPTS = None
 OPTION_CLASSES = None
 
 
@@ -161,8 +160,8 @@ def _init():
     global create_message, create_help_entry
     global settings, lockfuncs, logger, utils, gametime, ansi, spawn, managers
     global contrib, TICKER_HANDLER, MONITOR_HANDLER, SESSION_HANDLER
-    global CHANNEL_HANDLER, TASK_HANDLER, GLOBAL_SCRIPTS
-    global VALIDATOR_FUNCS, OPTION_CLASSES
+    global CHANNEL_HANDLER, TASK_HANDLER 
+    global GLOBAL_SCRIPTS, OPTION_CLASSES
     global EvMenu, EvTable, EvForm, EvMore, EvEditor
     global ANSIString
 
@@ -226,7 +225,6 @@ def _init():
 
     # containers
     from .utils.containers import GLOBAL_SCRIPTS
-    from .utils.containers import VALIDATOR_FUNCS
     from .utils.containers import OPTION_CLASSES
 
     # initialize the doc string
diff --git a/evennia/utils/containers.py b/evennia/utils/containers.py
index 1aa440d63b..5ee08d1604 100644
--- a/evennia/utils/containers.py
+++ b/evennia/utils/containers.py
@@ -76,15 +76,6 @@ class Container(object):
         return list(self.loaded_data.values())
 
 
-class ValidatorContainer(Container):
-    """
-    Loads and stores the final list of VALIDATOR FUNCTIONS.
-
-    Can access these as properties or dictionary-contents.
-    """
-    storage_modules = settings.VALIDATOR_FUNC_MODULES
-
-
 class OptionContainer(Container):
     """
     Loads and stores the final list of OPTION CLASSES.
@@ -203,5 +194,4 @@ class GlobalScriptContainer(Container):
 # Create all singletons
 
 GLOBAL_SCRIPTS = GlobalScriptContainer()
-VALIDATOR_FUNCS = ValidatorContainer()
 OPTION_CLASSES = OptionContainer()
diff --git a/evennia/utils/optionclasses.py b/evennia/utils/optionclasses.py
index 82b9c8619e..ded346c9cb 100644
--- a/evennia/utils/optionclasses.py
+++ b/evennia/utils/optionclasses.py
@@ -2,8 +2,8 @@ import datetime
 from evennia import logger
 from evennia.utils.ansi import strip_ansi
 from evennia.utils.validatorfuncs import _TZ_DICT
-from evennia.utils.containers import VALIDATOR_FUNCS
 from evennia.utils.utils import crop
+from evennia.utils import validatorfuncs
 
 
 class BaseOption(object):
@@ -20,8 +20,6 @@ class BaseOption(object):
         validator_key (str): The key of the Validator this uses.
 
     """
-    validator_key = ''
-
     def __str__(self):
         return "<Option {key}: {value}>".format(
             key=self.key, value=crop(str(self.value), width=10))
@@ -99,7 +97,6 @@ class BaseOption(object):
         loadfunc = self.handler.loadfunc
         load_kwargs = self.handler.load_kwargs
 
-        print("load", self.key, loadfunc, load_kwargs)
         try:
             self.value_storage = self.deserialize(
                 loadfunc(self.key, default=self.default_value, **load_kwargs))
@@ -124,7 +121,6 @@ class BaseOption(object):
         value = self.serialize()
         save_kwargs = {**self.handler.save_kwargs, **kwargs}
         savefunc = self.handler.savefunc
-        print("save:", self.key, value, savefunc, save_kwargs)
         savefunc(self.key, value=value, **save_kwargs)
 
     def deserialize(self, save_data):
@@ -164,12 +160,13 @@ class BaseOption(object):
                 This is necessary because of other settings which may affect the
                 check, such as an Account's timezone affecting how their datetime
                 entries are processed.
-
         Returns:
             any (any): The results of the validation.
+        Raises:
+            ValidationError: If input value failed validation.
 
         """
-        return VALIDATOR_FUNCS.get(self.validator_key)(value, thing_name=self.key, **kwargs)
+        return validatorfuncs.text(value, option_key=self.key, **kwargs)
 
     def display(self, **kwargs):
         """
@@ -191,7 +188,6 @@ class BaseOption(object):
 
 
 class Text(BaseOption):
-    validator_key = 'text'
 
     def deserialize(self, save_data):
         got_data = str(save_data)
@@ -201,7 +197,9 @@ class Text(BaseOption):
 
 
 class Email(BaseOption):
-    validator_key = 'email'
+
+    def validate(self, value, **kwargs):
+        return validatorfuncs.email(value, option_key=self.key, **kwargs)
 
     def deserialize(self, save_data):
         got_data = str(save_data)
@@ -211,7 +209,9 @@ class Email(BaseOption):
 
 
 class Boolean(BaseOption):
-    validator_key = 'boolean'
+
+    def validate(self, value, **kwargs):
+        return validatorfuncs.boolean(value, option_key=self.key, **kwargs)
 
     def display(self, **kwargs):
         if self.value:
@@ -228,7 +228,9 @@ class Boolean(BaseOption):
 
 
 class Color(BaseOption):
-    validator_key = 'color'
+
+    def validate(self, value, **kwargs):
+        return validatorfuncs.color(value, option_key=self.key, **kwargs)
 
     def display(self, **kwargs):
         return f'{self.value} - |{self.value}this|n'
@@ -240,7 +242,9 @@ class Color(BaseOption):
 
 
 class Timezone(BaseOption):
-    validator_key = 'timezone'
+
+    def validate(self, value, **kwargs):
+        return validatorfuncs.timezone(value, option_key=self.key, **kwargs)
 
     @property
     def default(self):
@@ -258,6 +262,9 @@ class Timezone(BaseOption):
 class UnsignedInteger(BaseOption):
     validator_key = 'unsigned_integer'
 
+    def validate(self, value, **kwargs):
+        return validatorfuncs.unsigned_integer(value, option_key=self.key, **kwargs)
+
     def deserialize(self, save_data):
         if isinstance(save_data, int) and save_data >= 0:
             return save_data
@@ -265,7 +272,9 @@ class UnsignedInteger(BaseOption):
 
 
 class SignedInteger(BaseOption):
-    validator_key = 'signed_integer'
+
+    def validate(self, value, **kwargs):
+        return validatorfuncs.signed_integer(value, option_key=self.key, **kwargs)
 
     def deserialize(self, save_data):
         if isinstance(save_data, int):
@@ -274,7 +283,9 @@ class SignedInteger(BaseOption):
 
 
 class PositiveInteger(BaseOption):
-    validator_key = 'positive_integer'
+
+    def validate(self, value, **kwargs):
+        return validatorfuncs.positive_integer(value, option_key=self.key, **kwargs)
 
     def deserialize(self, save_data):
         if isinstance(save_data, int) and save_data > 0:
@@ -283,7 +294,9 @@ class PositiveInteger(BaseOption):
 
 
 class Duration(BaseOption):
-    validator_key = 'duration'
+
+    def validate(self, value, **kwargs):
+        return validatorfuncs.duration(value, option_key=self.key, **kwargs)
 
     def deserialize(self, save_data):
         if isinstance(save_data, int):
@@ -295,7 +308,9 @@ class Duration(BaseOption):
 
 
 class Datetime(BaseOption):
-    validator_key = 'datetime'
+
+    def validate(self, value, **kwargs):
+        return validatorfuncs.datetime(value, option_key=self.key, **kwargs)
 
     def deserialize(self, save_data):
         if isinstance(save_data, int):
@@ -307,8 +322,12 @@ class Datetime(BaseOption):
 
 
 class Future(Datetime):
-    validator_key = 'future'
+
+    def validate(self, value, **kwargs):
+        return validatorfuncs.future(value, option_key=self.key, **kwargs)
 
 
 class Lock(Text):
-    validator_key = 'lock'
+
+    def validate(self, value, **kwargs):
+        return validatorfuncs.lock(value, option_key=self.key, **kwargs)
diff --git a/evennia/utils/optionhandler.py b/evennia/utils/optionhandler.py
index ea984e0653..582b30df10 100644
--- a/evennia/utils/optionhandler.py
+++ b/evennia/utils/optionhandler.py
@@ -1,6 +1,9 @@
 from evennia.utils.utils import string_partial_matching
 from evennia.utils.containers import OPTION_CLASSES
 
+_GA = object.__getattribute__
+_SA = object.__setattr__
+
 
 class InMemorySaveHandler(object):
     """
@@ -69,8 +72,26 @@ class OptionHandler(object):
         self.options = {}
 
     def __getattr__(self, key):
+        """
+        Allow for obj.options.key
+
+        """
         return self.get(key)
 
+    def __setattr__(self, key, value):
+        """
+        Allow for obj.options.key = value
+
+        But we must be careful to avoid infinite loops!
+
+        """
+        try:
+            if key in _GA(self, "options_dict"):
+                _GA(self, "set")(key, value)
+        except AttributeError:
+            pass
+        _SA(self, key, value)
+
     def _load_option(self, key):
         """
         Loads option on-demand if it has not been loaded yet.
diff --git a/evennia/utils/validatorfuncs.py b/evennia/utils/validatorfuncs.py
index a070a32445..0e1307206b 100644
--- a/evennia/utils/validatorfuncs.py
+++ b/evennia/utils/validatorfuncs.py
@@ -19,25 +19,32 @@ from evennia.utils.utils import string_partial_matching as _partial
 _TZ_DICT = {str(tz): _pytz.timezone(tz) for tz in _pytz.common_timezones}
 
 
-def color(entry, thing_name='Color', **kwargs):
+def text(entry, option_key='Text', **kwargs):
+    try:
+        return str(entry)
+    except Exception as err:
+        raise ValueError(f"Input could not be converted to text ({err})")
+
+
+def color(entry, option_key='Color', **kwargs):
     """
     The color should be just a color character, so 'r' if red color is desired.
     """
     if not entry:
-        raise ValueError(f"Nothing entered for a {thing_name}!")
+        raise ValueError(f"Nothing entered for a {option_key}!")
     test_str = strip_ansi(f'|{entry}|n')
     if test_str:
-        raise ValueError(f"'{entry}' is not a valid {thing_name}.")
+        raise ValueError(f"'{entry}' is not a valid {option_key}.")
     return entry
 
 
-def datetime(entry, thing_name='Datetime', account=None, from_tz=None, **kwargs):
+def datetime(entry, option_key='Datetime', account=None, from_tz=None, **kwargs):
     """
     Process a datetime string in standard forms while accounting for the inputter's timezone.
 
     Args:
         entry (str): A date string from a user.
-        thing_name (str): Name to display this datetime as.
+        option_key (str): Name to display this datetime as.
         account (AccountDB): The Account performing this lookup. Unless from_tz is provided,
             account's timezone will be used (if found) for local time and convert the results
             to UTC.
@@ -48,7 +55,7 @@ def datetime(entry, thing_name='Datetime', account=None, from_tz=None, **kwargs)
         datetime in utc.
     """
     if not entry:
-        raise ValueError(f"No {thing_name} entered!")
+        raise ValueError(f"No {option_key} entered!")
     if not from_tz:
         from_tz = _pytz.UTC
     utc = _pytz.UTC
@@ -60,23 +67,23 @@ def datetime(entry, thing_name='Datetime', account=None, from_tz=None, **kwargs)
     elif len(split_time) == 4:
         entry = f"{split_time[0]} {split_time[1]} {split_time[2]} {split_time[3]}"
     else:
-        raise ValueError(f"{thing_name} must be entered in a 24-hour format such as: {now.strftime('%b %d %H:%H')}")
+        raise ValueError(f"{option_key} must be entered in a 24-hour format such as: {now.strftime('%b %d %H:%H')}")
     try:
         local = _dt.datetime.strptime(input, '%b %d %H:%M %Y')
     except ValueError:
-        raise ValueError(f"{thing_name} must be entered in a 24-hour format such as: {now.strftime('%b %d %H:%H')}")
+        raise ValueError(f"{option_key} must be entered in a 24-hour format such as: {now.strftime('%b %d %H:%H')}")
     local_tz = from_tz.localize(local)
     return local_tz.astimezone(utc)
 
 
-def duration(entry, thing_name='Duration', **kwargs):
+def duration(entry, option_key='Duration', **kwargs):
     """
     Take a string and derive a datetime timedelta from it.
 
     Args:
         entry (string): This is a string from user-input. The intended format is, for example: "5d 2w 90s" for
                             'five days, two weeks, and ninety seconds.' Invalid sections are ignored.
-        thing_name (str): Name to display this query as.
+        option_key (str): Name to display this query as.
 
     Returns:
         timedelta
@@ -103,54 +110,54 @@ def duration(entry, thing_name='Duration', **kwargs):
         elif _re.match(r'^[\d]+y$', interval):
             days =+ int(interval.lower().rstrip("y")) * 365
         else:
-            raise ValueError(f"Could not convert section '{interval}' to a {thing_name}.")
+            raise ValueError(f"Could not convert section '{interval}' to a {option_key}.")
 
     return _dt.timedelta(days, seconds, 0, 0, minutes, hours, weeks)
 
 
-def future(entry, thing_name="Future Datetime", from_tz=None, **kwargs):
-    time = datetime(entry, thing_name)
+def future(entry, option_key="Future Datetime", from_tz=None, **kwargs):
+    time = datetime(entry, option_key)
     if time < _dt.datetime.utcnow():
-        raise ValueError(f"That {thing_name} is in the past! Must give a Future datetime!")
+        raise ValueError(f"That {option_key} is in the past! Must give a Future datetime!")
     return time
 
 
-def signed_integer(entry, thing_name="Signed Integer", **kwargs):
+def signed_integer(entry, option_key="Signed Integer", **kwargs):
     if not entry:
-        raise ValueError(f"Must enter a whole number for {thing_name}!")
+        raise ValueError(f"Must enter a whole number for {option_key}!")
     try:
         num = int(entry)
     except ValueError:
-        raise ValueError(f"Could not convert '{entry}' to a whole number for {thing_name}!")
+        raise ValueError(f"Could not convert '{entry}' to a whole number for {option_key}!")
     return num
 
 
-def positive_integer(entry, thing_name="Positive Integer", **kwargs):
-    num = signed_integer(entry, thing_name)
+def positive_integer(entry, option_key="Positive Integer", **kwargs):
+    num = signed_integer(entry, option_key)
     if not num >= 1:
-        raise ValueError(f"Must enter a whole number greater than 0 for {thing_name}!")
+        raise ValueError(f"Must enter a whole number greater than 0 for {option_key}!")
     return num
 
 
-def unsigned_integer(entry, thing_name="Unsigned Integer", **kwargs):
-    num = signed_integer(entry, thing_name)
+def unsigned_integer(entry, option_key="Unsigned Integer", **kwargs):
+    num = signed_integer(entry, option_key)
     if not num >= 0:
-        raise ValueError(f"{thing_name} must be a whole number greater than or equal to 0!")
+        raise ValueError(f"{option_key} must be a whole number greater than or equal to 0!")
     return num
 
 
-def boolean(entry, thing_name="True/False", **kwargs):
+def boolean(entry, option_key="True/False", **kwargs):
     """
     Simplest check in computer logic, right? This will take user input to flick the switch on or off
     Args:
         entry (str): A value such as True, On, Enabled, Disabled, False, 0, or 1.
-        thing_name (str): What kind of Boolean we are setting. What Option is this for?
+        option_key (str): What kind of Boolean we are setting. What Option is this for?
 
     Returns:
         Boolean
     """
     entry = entry.upper()
-    error = f"Must enter 0 (false) or 1 (true) for {thing_name}. Also accepts True, False, On, Off, Yes, No, Enabled, and Disabled"
+    error = f"Must enter 0 (false) or 1 (true) for {option_key}. Also accepts True, False, On, Off, Yes, No, Enabled, and Disabled"
     if not entry:
         raise ValueError(error)
     if entry in ('1', 'TRUE', 'ON', 'ENABLED', 'ENABLE', 'YES'):
@@ -160,41 +167,41 @@ def boolean(entry, thing_name="True/False", **kwargs):
     raise ValueError(error)
 
 
-def timezone(entry, thing_name="Timezone", **kwargs):
+def timezone(entry, option_key="Timezone", **kwargs):
     """
     Takes user input as string, and partial matches a Timezone.
 
     Args:
         entry (str): The name of the Timezone.
-        thing_name (str): What this Timezone is used for.
+        option_key (str): What this Timezone is used for.
 
     Returns:
         A PYTZ timezone.
     """
     if not entry:
-        raise ValueError(f"No {thing_name} entered!")
+        raise ValueError(f"No {option_key} entered!")
     found = _partial(list(_TZ_DICT.keys()), entry, ret_index=False)
     if len(found) > 1:
         raise ValueError(f"That matched: {', '.join(str(t) for t in found)}. Please be more specific!")
     if found:
         return _TZ_DICT[found[0]]
-    raise ValueError(f"Could not find timezone '{entry}' for {thing_name}!")
+    raise ValueError(f"Could not find timezone '{entry}' for {option_key}!")
 
 
-def email(entry, thing_name="Email Address", **kwargs):
+def email(entry, option_key="Email Address", **kwargs):
     if not entry:
         raise ValueError("Email address field empty!")
     try:
         _val_email(entry)  # offloading the hard work to Django!
     except _error:
-        raise ValueError(f"That isn't a valid {thing_name}!")
+        raise ValueError(f"That isn't a valid {option_key}!")
     return entry
 
 
-def lock(entry, thing_name='locks', access_options=None, **kwargs):
+def lock(entry, option_key='locks', access_options=None, **kwargs):
     entry = entry.strip()
     if not entry:
-        raise ValueError(f"No {thing_name} entered to set!")
+        raise ValueError(f"No {option_key} entered to set!")
     for locksetting in entry.split(';'):
         access_type, lockfunc = locksetting.split(':', 1)
         if not access_type: