From 280ffacc2d4b2eaa9834184fbe30024f76069d98 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 10 Aug 2017 23:36:56 +0200
Subject: [PATCH 001/217] First, non-working version of a get_by_tag manager
 method that accepts multiple tags

---
 evennia/typeclasses/managers.py | 80 ++++++++++++++++++++++++++++-----
 1 file changed, 68 insertions(+), 12 deletions(-)

diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py
index b6c486b166..7fff4f2a43 100644
--- a/evennia/typeclasses/managers.py
+++ b/evennia/typeclasses/managers.py
@@ -181,6 +181,7 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
 
     # Tag manager methods
 
+
     def get_tag(self, key=None, category=None, obj=None, tagtype=None, global_search=False):
         """
         Return Tag objects by key, by category, by object (it is
@@ -256,28 +257,83 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
         """
         return self.get_tag(key=key, category=category, obj=obj, tagtype="alias")
 
+#    @returns_typeclass_list
+#    def get_by_tag(self, key=None, category=None, tagtype=None):
+#        """
+#        Return objects having tags with a given key or category or
+#        combination of the two.
+#
+#        Args:
+#            key (str, optional): Tag key. Not case sensitive.
+#            category (str, optional): Tag category. Not case sensitive.
+#            tagtype (str or None, optional): 'type' of Tag, by default
+#                this is either `None` (a normal Tag), `alias` or
+#                `permission`.
+#        Returns:
+#            objects (list): Objects with matching tag.
+#        """
+#        dbmodel = self.model.__dbclass__.__name__.lower()
+#        query = [("db_tags__db_tagtype", tagtype), ("db_tags__db_model", dbmodel)]
+#        if key:
+#            query.append(("db_tags__db_key", key.lower()))
+#        if category:
+#            query.append(("db_tags__db_category", category.lower()))
+#        return self.filter(**dict(query))
+
     @returns_typeclass_list
     def get_by_tag(self, key=None, category=None, tagtype=None):
         """
-        Return objects having tags with a given key or category or
-        combination of the two.
+        Return objects having tags with a given key or category or combination of the two.
+        Also accepts multiple tags/category/tagtype
 
         Args:
-            key (str, optional): Tag key. Not case sensitive.
-            category (str, optional): Tag category. Not case sensitive.
-            tagtype (str or None, optional): 'type' of Tag, by default
+            key (str or list, optional): Tag key or list of keys. Not case sensitive.
+            category (str or list, optional): Tag category. Not case sensitive. If `key` is
+                a list, a single category can either apply to all keys in that list or this
+                must be a list matching the `key` list element by element.
+            tagtype (str, optional): 'type' of Tag, by default
                 this is either `None` (a normal Tag), `alias` or
-                `permission`.
+                `permission`. This always apply to all queried tags.
+
         Returns:
             objects (list): Objects with matching tag.
+
+        Raises:
+            IndexError: If `key` and `category` are both lists and `category` is shorter
+                than `key`.
+
         """
+        keys = make_iter(key)
+        categories = make_iter(category)
+        n_keys = len(keys)
+        n_categories = len(categories)
+
         dbmodel = self.model.__dbclass__.__name__.lower()
-        query = [("db_tags__db_tagtype", tagtype), ("db_tags__db_model", dbmodel)]
-        if key:
-            query.append(("db_tags__db_key", key.lower()))
-        if category:
-            query.append(("db_tags__db_category", category.lower()))
-        return self.filter(**dict(query))
+        if n_keys > 1:
+            if n_categories == 1:
+                category = categories[0]
+                query = Q(db_tags__db_tagtype=tagtype.lower() if tagtype else tagtype,
+                          db_tags__db_category=category.lower() if category else category,
+                          db_tags__db_model=dbmodel)
+                for key in keys:
+                    query = query & Q(db_tags__db_key=key.lower())
+                print "Query:", query
+            else:
+                query = Q(db_tags__db_tagtype=tagtype.lower(),
+                          db_tags__db_model=dbmodel)
+                for ikey, key in keys:
+                    category = categories[ikey]
+                    category = category.lower() if category else category
+                    query = query & Q(db_tags__db_key=key.lower(),
+                                      db_tags__db_category=category)
+            return self.filter(query)
+        else:
+            query = [("db_tags__db_tagtype", tagtype), ("db_tags__db_model", dbmodel)]
+            if key:
+                query.append(("db_tags__db_key", keys[0].lower()))
+            if category:
+                query.append(("db_tags__db_category", categories[0].lower()))
+            return self.filter(**dict(query))
 
     def get_by_permission(self, key=None, category=None):
         """

From 583ce9b71ec1d24e62fd4f2aec4d369f63873c35 Mon Sep 17 00:00:00 2001
From: Nicholas Matlaga <nmatlaga@outlawtack.com>
Date: Wed, 13 Dec 2017 21:08:02 -0500
Subject: [PATCH 002/217] Step through help and option popup when closing

---
 evennia/web/webclient/static/webclient/js/webclient_gui.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/evennia/web/webclient/static/webclient/js/webclient_gui.js b/evennia/web/webclient/static/webclient/js/webclient_gui.js
index ba657858d9..57d9b0b7c0 100644
--- a/evennia/web/webclient/static/webclient/js/webclient_gui.js
+++ b/evennia/web/webclient/static/webclient/js/webclient_gui.js
@@ -175,8 +175,11 @@ function onKeydown (event) {
     }
 
     if (code === 27) { // Escape key
-        closePopup("#optionsdialog");
-        closePopup("#helpdialog");
+        if ($('#helpdialog').is(':visible')) {
+          closePopup("#helpdialog");
+        } else {
+          closePopup("#optionsdialog");
+        }
     }
 
     if (history_entry !== null) {

From 56d9887825a1a113ea82e987679f3a4b05065698 Mon Sep 17 00:00:00 2001
From: Tehom <surly.mime@gmail.com>
Date: Sun, 17 Dec 2017 18:53:41 -0500
Subject: [PATCH 003/217] Allow other typeclasses to have their Attributes set
 via command.

---
 evennia/commands/default/building.py | 42 +++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index f4a001e6d2..1e544748ff 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -1455,6 +1455,11 @@ class CmdSetAttribute(ObjManipCommand):
 
     Switch:
         edit: Open the line editor (string values only)
+        script: If we're trying to set an attribute on a script
+        channel: If we're trying to set an attribute on a channel
+        account: If we're trying to set an attribute on an account
+        (room, exit, char/character may all be used as well for global
+         searches)
 
     Sets attributes on objects. The second form clears
     a previously set attribute while the last form
@@ -1555,6 +1560,38 @@ class CmdSetAttribute(ObjManipCommand):
         # start the editor
         EvEditor(self.caller, load, save, key="%s/%s" % (obj, attr))
 
+    def search_for_obj(self, objname):
+        """
+        Searches for an object matching objname. The object may be of different typeclasses.
+        Args:
+            objname: Name of the object we're looking for
+
+        Returns:
+            A typeclassed object, or None if nothing is found.
+        """
+        from evennia.utils.utils import variable_from_module
+        _AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit('.', 1))
+        caller = self.caller
+        if objname.startswith('*') or "account" in self.switches:
+            found_obj = caller.search_account(objname.lstrip('*'))
+        elif "script" in self.switches:
+            found_obj = _AT_SEARCH_RESULT(search.search_script(objname), caller)
+        elif "channel" in self.switches:
+            found_obj = _AT_SEARCH_RESULT(search.search_channel(objname), caller)
+        else:
+            global_search = True
+            if "char" in self.switches or "character" in self.switches:
+                typeclass = settings.BASE_CHARACTER_TYPECLASS
+            elif "room" in self.switches:
+                typeclass = settings.BASE_ROOM_TYPECLASS
+            elif "exit" in self.switches:
+                typeclass = settings.BASE_EXIT_TYPECLASS
+            else:
+                global_search = False
+                typeclass = None
+            found_obj = caller.search(objname, global_search=global_search, typeclass=typeclass)
+        return found_obj
+
     def func(self):
         """Implement the set attribute - a limited form of @py."""
 
@@ -1568,10 +1605,7 @@ class CmdSetAttribute(ObjManipCommand):
         objname = self.lhs_objattr[0]['name']
         attrs = self.lhs_objattr[0]['attrs']
 
-        if objname.startswith('*'):
-            obj = caller.search_account(objname.lstrip('*'))
-        else:
-            obj = caller.search(objname)
+        obj = self.search_for_obj(objname)
         if not obj:
             return
 

From 08365a5ef5fe5af66cb7de1c6fea1079a4f539d2 Mon Sep 17 00:00:00 2001
From: Tehom <surly.mime@gmail.com>
Date: Tue, 19 Dec 2017 00:28:48 -0500
Subject: [PATCH 004/217] Attempt to handle any errors in logging.

---
 evennia/utils/logger.py | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/evennia/utils/logger.py b/evennia/utils/logger.py
index ce3bfe9a15..b248278ce1 100644
--- a/evennia/utils/logger.py
+++ b/evennia/utils/logger.py
@@ -59,6 +59,22 @@ def timeformat(when=None):
         tz_sign, tz_hour, tz_mins)
 
 
+def log_msg(msg):
+    """
+    Wrapper around log.msg call to catch any exceptions that might
+    occur in logging. If an exception is raised, we'll print to
+    stdout instead.
+
+    Args:
+        msg: The message that was passed to log.msg
+
+    """
+    try:
+        log.msg(msg)
+    except Exception:
+        print("Exception raised while writing message to log. Original message: %s" % msg)
+
+
 def log_trace(errmsg=None):
     """
     Log a traceback to the log. This should be called from within an
@@ -80,9 +96,9 @@ def log_trace(errmsg=None):
             except Exception as e:
                 errmsg = str(e)
             for line in errmsg.splitlines():
-                log.msg('[EE] %s' % line)
+                log_msg('[EE] %s' % line)
     except Exception:
-        log.msg('[EE] %s' % errmsg)
+        log_msg('[EE] %s' % errmsg)
 
 
 log_tracemsg = log_trace
@@ -101,7 +117,7 @@ def log_err(errmsg):
     except Exception as e:
         errmsg = str(e)
     for line in errmsg.splitlines():
-        log.msg('[EE] %s' % line)
+        log_msg('[EE] %s' % line)
 
 
     # log.err('ERROR: %s' % (errmsg,))
@@ -121,7 +137,7 @@ def log_warn(warnmsg):
     except Exception as e:
         warnmsg = str(e)
     for line in warnmsg.splitlines():
-        log.msg('[WW] %s' % line)
+        log_msg('[WW] %s' % line)
 
 
     # log.msg('WARNING: %s' % (warnmsg,))
@@ -139,7 +155,7 @@ def log_info(infomsg):
     except Exception as e:
         infomsg = str(e)
     for line in infomsg.splitlines():
-        log.msg('[..] %s' % line)
+        log_msg('[..] %s' % line)
 
 
 log_infomsg = log_info
@@ -157,7 +173,7 @@ def log_dep(depmsg):
     except Exception as e:
         depmsg = str(e)
     for line in depmsg.splitlines():
-        log.msg('[DP] %s' % line)
+        log_msg('[DP] %s' % line)
 
 
 log_depmsg = log_dep

From 33645df6dda6990f5bdd78c3ab7aea87a99ef5e7 Mon Sep 17 00:00:00 2001
From: Tehom <surly.mime@gmail.com>
Date: Tue, 19 Dec 2017 00:42:23 -0500
Subject: [PATCH 005/217] Try to clarify help file.

---
 evennia/commands/default/building.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index 1e544748ff..5076170957 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -1458,8 +1458,10 @@ class CmdSetAttribute(ObjManipCommand):
         script: If we're trying to set an attribute on a script
         channel: If we're trying to set an attribute on a channel
         account: If we're trying to set an attribute on an account
-        (room, exit, char/character may all be used as well for global
-         searches)
+        room: Setting an attribute on a room (global search)
+        exit: Setting an attribute on an exit (global search)
+        char: Setting an attribute on a character (global search)
+        character: Alias for char, as above.
 
     Sets attributes on objects. The second form clears
     a previously set attribute while the last form

From 181adeaa9074cf166bd4435d56086e578eec2179 Mon Sep 17 00:00:00 2001
From: Tehom <surly.mime@gmail.com>
Date: Mon, 25 Dec 2017 07:15:26 -0500
Subject: [PATCH 006/217] Fix errors in django admin for Attributes

---
 evennia/typeclasses/admin.py | 20 +++++++++++++++++---
 evennia/utils/picklefield.py |  4 +++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/evennia/typeclasses/admin.py b/evennia/typeclasses/admin.py
index c5dd481f90..c4047449f6 100644
--- a/evennia/typeclasses/admin.py
+++ b/evennia/typeclasses/admin.py
@@ -2,7 +2,7 @@ from django.contrib import admin
 from evennia.typeclasses.models import Tag
 from django import forms
 from evennia.utils.picklefield import PickledFormField
-from evennia.utils.dbserialize import from_pickle
+from evennia.utils.dbserialize import from_pickle, _SaverSet
 import traceback
 
 
@@ -164,12 +164,12 @@ class AttributeForm(forms.ModelForm):
     attr_category = forms.CharField(label="Category",
                                     help_text="type of attribute, for sorting",
                                     required=False,
-                                    max_length=4)
+                                    max_length=128)
     attr_value = PickledFormField(label="Value", help_text="Value to pickle/save", required=False)
     attr_type = forms.CharField(label="Type",
                                 help_text="Internal use. Either unset (normal Attribute) or \"nick\"",
                                 required=False,
-                                max_length=4)
+                                max_length=16)
     attr_strvalue = forms.CharField(label="String Value",
                                     help_text="Only set when using the Attribute as a string-only store",
                                     required=False,
@@ -213,6 +213,9 @@ class AttributeForm(forms.ModelForm):
         self.instance.attr_key = attr_key
         self.instance.attr_category = attr_category
         self.instance.attr_value = attr_value
+        # prevent set from being transformed to unicode
+        if isinstance(attr_value, set) or isinstance(attr_value, _SaverSet):
+            self.fields['attr_value'].disabled = True
         self.instance.deserialized_value = from_pickle(attr_value)
         self.instance.attr_strvalue = attr_strvalue
         self.instance.attr_type = attr_type
@@ -237,6 +240,17 @@ class AttributeForm(forms.ModelForm):
         instance.attr_lockstring = self.cleaned_data['attr_lockstring']
         return instance
 
+    def clean_attr_value(self):
+        """
+        Prevent Sets from being cleaned due to literal_eval failing on them. Otherwise they will be turned into
+        unicode.
+        """
+        data = self.cleaned_data['attr_value']
+        initial = self.instance.attr_value
+        if isinstance(initial, set) or isinstance(initial, _SaverSet):
+            return initial
+        return data
+
 
 class AttributeFormSet(forms.BaseInlineFormSet):
     """
diff --git a/evennia/utils/picklefield.py b/evennia/utils/picklefield.py
index bd0a9b1643..9e683d96e6 100644
--- a/evennia/utils/picklefield.py
+++ b/evennia/utils/picklefield.py
@@ -120,9 +120,11 @@ def dbsafe_decode(value, compress_object=False):
 
 class PickledWidget(Textarea):
     def render(self, name, value, attrs=None):
+        """Display of the PickledField in django admin"""
         value = repr(value)
         try:
-            literal_eval(value)
+            # necessary to convert it back after repr(), otherwise validation errors will mutate it
+            value = literal_eval(value)
         except ValueError:
             return value
 

From 7de45c429bdd297a91ec4a5239d9fbd30eb61b1d Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 31 Dec 2017 13:40:16 +0100
Subject: [PATCH 007/217] Fix wrong call of _SEARCH_AT_RESULT from tutorial
 version of look, as reported in #1544.

---
 evennia/contrib/tutorial_world/rooms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/contrib/tutorial_world/rooms.py b/evennia/contrib/tutorial_world/rooms.py
index c16baccff1..15bddefb01 100644
--- a/evennia/contrib/tutorial_world/rooms.py
+++ b/evennia/contrib/tutorial_world/rooms.py
@@ -168,7 +168,7 @@ class CmdTutorialLook(default_cmds.CmdLook):
                 else:
                     # no detail found, delegate our result to the normal
                     # error message handler.
-                    _SEARCH_AT_RESULT(None, caller, args, looking_at_obj)
+                    _SEARCH_AT_RESULT(looking_at_obj, caller, args)
                     return
             else:
                 # we found a match, extract it from the list and carry on

From 0133636b9588a4f631ac05372b2595669198c143 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 31 Dec 2017 13:47:19 +0100
Subject: [PATCH 008/217] Fix typos in doc strings

---
 evennia/contrib/extended_room.py | 2 +-
 evennia/contrib/rpsystem.py      | 2 +-
 evennia/objects/objects.py       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/evennia/contrib/extended_room.py b/evennia/contrib/extended_room.py
index 6823ede50e..0530bd796c 100644
--- a/evennia/contrib/extended_room.py
+++ b/evennia/contrib/extended_room.py
@@ -189,7 +189,7 @@ class ExtendedRoom(DefaultRoom):
             key (str): A detail identifier.
 
         Returns:
-            detail (str or None): A detail mathing the given key.
+            detail (str or None): A detail matching the given key.
 
         Notes:
             A detail is a way to offer more things to look at in a room
diff --git a/evennia/contrib/rpsystem.py b/evennia/contrib/rpsystem.py
index a396a18abc..d469aff3d9 100644
--- a/evennia/contrib/rpsystem.py
+++ b/evennia/contrib/rpsystem.py
@@ -1200,7 +1200,7 @@ class ContribRPObject(DefaultObject):
                 below.
             exact (bool): if unset (default) - prefers to match to beginning of
                 string rather than not matching at all. If set, requires
-                exact mathing of entire string.
+                exact matching of entire string.
             candidates (list of objects): this is an optional custom list of objects
                 to search (filter) between. It is ignored if `global_search`
                 is given. If not set, this list will automatically be defined
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index aca4ec0924..1509e7ce08 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -335,7 +335,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
                 below.
             exact (bool): if unset (default) - prefers to match to beginning of
                 string rather than not matching at all. If set, requires
-                exact mathing of entire string.
+                exact matching of entire string.
             candidates (list of objects): this is an optional custom list of objects
                 to search (filter) between. It is ignored if `global_search`
                 is given. If not set, this list will automatically be defined

From d9a609d735a4f3f162c6f568514decfc52836dd2 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 31 Dec 2017 23:16:16 +0100
Subject: [PATCH 009/217] Allow options to partially update portal session,
 correctly relay late handshakes.

---
 evennia/server/inputfuncs.py     | 13 ++++++++-----
 evennia/server/portal/telnet.py  | 11 ++++++-----
 evennia/server/portal/ttype.py   |  2 +-
 evennia/server/session.py        |  8 +++++++-
 evennia/server/sessionhandler.py | 16 ++++++++++++++++
 5 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/evennia/server/inputfuncs.py b/evennia/server/inputfuncs.py
index 3715bb53fe..28546c2064 100644
--- a/evennia/server/inputfuncs.py
+++ b/evennia/server/inputfuncs.py
@@ -160,10 +160,10 @@ def client_options(session, *args, **kwargs):
         raw (bool): Turn off parsing
 
     """
-    flags = session.protocol_flags
+    old_flags = session.protocol_flags
     if not kwargs or kwargs.get("get", False):
         # return current settings
-        options = dict((key, flags[key]) for key in flags
+        options = dict((key, old_flags[key]) for key in old_flags
                        if key.upper() in ("ANSI", "XTERM256", "MXP",
                                           "UTF-8", "SCREENREADER", "ENCODING",
                                           "MCCP", "SCREENHEIGHT",
@@ -189,6 +189,7 @@ def client_options(session, *args, **kwargs):
             return True if val.lower() in ("true", "on", "1") else False
         return bool(val)
 
+    flags = {}
     for key, value in kwargs.iteritems():
         key = key.lower()
         if key == "client":
@@ -230,9 +231,11 @@ def client_options(session, *args, **kwargs):
             err = _ERROR_INPUT.format(
                 name="client_settings", session=session, inp=key)
             session.msg(text=err)
-    session.protocol_flags = flags
-    # we must update the portal as well
-    session.sessionhandler.session_portal_sync(session)
+
+    session.protocol_flags.update(flags)
+    # we must update the protocol flags on the portal session copy as well
+    session.sessionhandler.session_portal_partial_sync(
+            {session.sessid: {"protocol_flags": flags}})
 
 
 # GMCP alias
diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py
index 4112d85e2a..afd0a9094f 100644
--- a/evennia/server/portal/telnet.py
+++ b/evennia/server/portal/telnet.py
@@ -72,7 +72,7 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
 
         # timeout the handshakes in case the client doesn't reply at all
         from evennia.utils.utils import delay
-        delay(2, callback=self.handshake_done, force=True)
+        delay(2, callback=self.handshake_done, timeout=True)
 
         # TCP/IP keepalive watches for dead links
         self.transport.setTcpKeepAlive(1)
@@ -100,17 +100,18 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
             self.nop_keep_alive = LoopingCall(self._send_nop_keepalive)
             self.nop_keep_alive.start(30, now=False)
 
-    def handshake_done(self, force=False):
+    def handshake_done(self, timeout=False):
         """
         This is called by all telnet extensions once they are finished.
         When all have reported, a sync with the server is performed.
         The system will force-call this sync after a small time to handle
         clients that don't reply to handshakes at all.
         """
-        if self.handshakes > 0:
-            if force:
+        if timeout:
+            if self.handshakes > 0:
+                self.handshakes = 0
                 self.sessionhandler.sync(self)
-                return
+        else:
             self.handshakes -= 1
             if self.handshakes <= 0:
                 # do the sync
diff --git a/evennia/server/portal/ttype.py b/evennia/server/portal/ttype.py
index 96ae1c1100..b9c3e8b239 100644
--- a/evennia/server/portal/ttype.py
+++ b/evennia/server/portal/ttype.py
@@ -66,7 +66,7 @@ class Ttype(object):
             option (Option): Not used.
 
         """
-        self.protocol.protocol_flags['TTYPE'] = True
+        self.protocol.protocol_flags['TTYPE'] = False
         self.protocol.handshake_done()
 
     def will_ttype(self, option):
diff --git a/evennia/server/session.py b/evennia/server/session.py
index 70be0708d7..cf29430185 100644
--- a/evennia/server/session.py
+++ b/evennia/server/session.py
@@ -118,7 +118,13 @@ class Session(object):
 
         """
         for propname, value in sessdata.items():
-            setattr(self, propname, value)
+            if (propname == "prototocol_flags" and isinstance(value, dict) and
+                    hasattr(self, "protocol_flags") and
+                    isinstance(self.protocol_flags.propname, dict)):
+                # special handling to allow partial update of protocol flags
+                self.protocol_flags.update(value)
+            else:
+                setattr(self, propname, value)
 
     def at_sync(self):
         """
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index 825cf6da30..c8c0fafd64 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -538,6 +538,22 @@ class ServerSessionHandler(SessionHandler):
                                                                 sessiondata=sessdata,
                                                                 clean=False)
 
+    def session_portal_partial_sync(self, session_data):
+        """
+        Call to make a partial update of the session, such as only a particular property.
+
+        Args:
+            session_data (dict): Store `{sessid: {property:value}, ...}` defining one or
+                more sessions in detail.
+
+        """
+        return self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION,
+                                                                operation=SSYNC,
+                                                                sessiondata=session_data,
+                                                                clean=False)
+
+
+
     def disconnect_all_sessions(self, reason="You have been disconnected."):
         """
         Cleanly disconnect all of the connected sessions.

From 8eb384cfdb11fd3c82a9e3321a76a27bd717c117 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 31 Dec 2017 23:36:58 +0100
Subject: [PATCH 010/217] bugfix of protocol_flag update mechanism

---
 evennia/server/session.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/server/session.py b/evennia/server/session.py
index cf29430185..9853bcd366 100644
--- a/evennia/server/session.py
+++ b/evennia/server/session.py
@@ -118,9 +118,9 @@ class Session(object):
 
         """
         for propname, value in sessdata.items():
-            if (propname == "prototocol_flags" and isinstance(value, dict) and
+            if (propname == "protocol_flags" and isinstance(value, dict) and
                     hasattr(self, "protocol_flags") and
-                    isinstance(self.protocol_flags.propname, dict)):
+                    isinstance(self.protocol_flags, dict)):
                 # special handling to allow partial update of protocol flags
                 self.protocol_flags.update(value)
             else:

From 7ac3b2d228b88390f898c46e085a9146e7419dc8 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 1 Jan 2018 13:19:59 +0100
Subject: [PATCH 011/217] Fix issue with messaging at session-level

---
 evennia/server/serversession.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evennia/server/serversession.py b/evennia/server/serversession.py
index aaaeaaaedd..2a427d591f 100644
--- a/evennia/server/serversession.py
+++ b/evennia/server/serversession.py
@@ -400,6 +400,7 @@ class ServerSession(Session):
         # this can happen if this is triggered e.g. a command.msg
         # that auto-adds the session, we'd get a kwarg collision.
         kwargs.pop("session", None)
+        kwargs.pop("from_obj", None)
         if text is not None:
             self.data_out(text=text, **kwargs)
         else:

From be02d058e10d4da7c7f45fcf9cab2111898a8183 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 1 Jan 2018 15:27:21 +0100
Subject: [PATCH 012/217] Minor refactoring and stabilizing

---
 evennia/server/portal/telnet.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py
index afd0a9094f..bdb937bde5 100644
--- a/evennia/server/portal/telnet.py
+++ b/evennia/server/portal/telnet.py
@@ -50,6 +50,9 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
         # when it reaches 0 the portal/server syncs their data
         self.handshakes = 8  # suppress-go-ahead, naws, ttype, mccp, mssp, msdp, gmcp, mxp
         self.init_session(self.protocol_name, client_address, self.factory.sessionhandler)
+        # add this new connection to sessionhandler so
+        # the Server becomes aware of it.
+        self.sessionhandler.connect(self)
 
         # suppress go-ahead
         self.sga = suppress_ga.SuppressGA(self)
@@ -66,12 +69,9 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
         self.oob = telnet_oob.TelnetOOB(self)
         # mxp support
         self.mxp = Mxp(self)
-        # add this new connection to sessionhandler so
-        # the Server becomes aware of it.
-        self.sessionhandler.connect(self)
 
-        # timeout the handshakes in case the client doesn't reply at all
         from evennia.utils.utils import delay
+        # timeout the handshakes in case the client doesn't reply at all
         delay(2, callback=self.handshake_done, timeout=True)
 
         # TCP/IP keepalive watches for dead links
@@ -306,8 +306,8 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
         # handle arguments
         options = kwargs.get("options", {})
         flags = self.protocol_flags
-        xterm256 = options.get("xterm256", flags.get('XTERM256', False) if flags["TTYPE"] else True)
-        useansi = options.get("ansi", flags.get('ANSI', False) if flags["TTYPE"] else True)
+        xterm256 = options.get("xterm256", flags.get('XTERM256', False) if flags.get("TTYPE", False) else True)
+        useansi = options.get("ansi", flags.get('ANSI', False) if flags.get("TTYPE", False) else True)
         raw = options.get("raw", flags.get("RAW", False))
         nocolor = options.get("nocolor", flags.get("NOCOLOR") or not (xterm256 or useansi))
         echo = options.get("echo", None)

From 3235d6dcc75525dd9217fc4df87f196a825eb24a Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 1 Jan 2018 20:58:48 +0100
Subject: [PATCH 013/217] Add a slight delay to telnet handshake to give mudlet
 a chance to catch up

---
 evennia/commands/default/tests.py | 8 +++++---
 evennia/server/sessionhandler.py  | 8 +++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index ffb63ef723..65fb0fa639 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -16,7 +16,7 @@ import re
 import types
 
 from django.conf import settings
-from mock import Mock
+from mock import Mock, mock
 
 from evennia.commands.default.cmdset_character import CharacterCmdSet
 from evennia.utils.test_resources import EvenniaTest
@@ -37,12 +37,14 @@ _RE = re.compile(r"^\+|-+\+|\+-+|--*|\|(?:\s|$)", re.MULTILINE)
 # Command testing
 # ------------------------------------------------------------
 
+
+@mock.patch("evennia.utils.utils.delay")
 class CommandTest(EvenniaTest):
     """
     Tests a command
     """
-
-    def call(self, cmdobj, args, msg=None, cmdset=None, noansi=True, caller=None, receiver=None, cmdstring=None, obj=None):
+    def call(self, cmdobj, args, msg=None, cmdset=None, noansi=True, caller=None,
+             receiver=None, cmdstring=None, obj=None):
         """
         Test a command by assigning all the needed
         properties to cmdobj and  running
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index c8c0fafd64..5fb15930c9 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -310,7 +310,13 @@ class ServerSessionHandler(SessionHandler):
                 sess.uid = None
 
         # show the first login command
-        self.data_in(sess, text=[[CMD_LOGINSTART], {}])
+
+        # this delay is necessary notably for Mudlet, which will fail on the connection screen
+        # unless the MXP protocol has been negotiated. Unfortunately this may be too short for some
+        # networks, the symptom is that < and > are not parsed by mudlet on first connection.
+        from evennia.utils.utils import delay
+        delay(0.3, self.data_in, sess, text=[[CMD_LOGINSTART], {}])
+        # self.data_in(sess, text=[[CMD_LOGINSTART], {}])
 
     def portal_session_sync(self, portalsessiondata):
         """

From 980d94a4c729872546176f73a44c44faf630746d Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 1 Jan 2018 21:03:11 +0100
Subject: [PATCH 014/217] Add TIME_IGNORE_DOWNTIMES to allow for true 1:1 time
 ratios. Implements #1545

---
 evennia/settings_default.py | 7 ++++++-
 evennia/utils/gametime.py   | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index b1e2a7a79e..7948868ed9 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -490,8 +490,13 @@ TIME_FACTOR = 2.0
 # The starting point of your game time (the epoch), in seconds.
 # In Python a value of 0 means Jan 1 1970 (use negatives for earlier
 # start date). This will affect the returns from the utils.gametime
-# module.
+# module. If None, the server's first start-time is used as the epoch.
 TIME_GAME_EPOCH = None
+# Normally, game time will only increase when the server runs. If this is True,
+# game time will not pause when the server reloads or goes offline. This setting
+# together with a time factor of 1 should keep the game in sync with
+# the real time (add a different epoch to shift time)
+TIME_IGNORE_DOWNTIMES = False
 
 ######################################################################
 # Inlinefunc
diff --git a/evennia/utils/gametime.py b/evennia/utils/gametime.py
index 793e348143..3736128819 100644
--- a/evennia/utils/gametime.py
+++ b/evennia/utils/gametime.py
@@ -19,6 +19,8 @@ from evennia.utils.create import create_script
 # to real time.
 
 TIMEFACTOR = settings.TIME_FACTOR
+IGNORE_DOWNTIMES = settings.TIME_IGNORE_DOWNTIMES
+
 
 # Only set if gametime_reset was called at some point.
 GAME_TIME_OFFSET = ServerConfig.objects.conf("gametime_offset", default=0)
@@ -133,7 +135,10 @@ def gametime(absolute=False):
 
     """
     epoch = game_epoch() if absolute else 0
-    gtime = epoch + (runtime() - GAME_TIME_OFFSET) * TIMEFACTOR
+    if IGNORE_DOWNTIMES:
+        gtime = epoch + (time.time() - server_epoch()) * TIMEFACTOR
+    else:
+        gtime = epoch + (runtime() - GAME_TIME_OFFSET) * TIMEFACTOR
     return gtime
 
 

From 19a7637cfc5e0ff0bcc4527fdfad95c2b56f0904 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 2 Jan 2018 21:21:57 +0100
Subject: [PATCH 015/217] Work towards resolving unittests with deferreds

---
 evennia/commands/default/tests.py         |  1 -
 evennia/commands/tests.py                 |  7 +++++
 evennia/contrib/tests.py                  | 36 +++++++++++++++++------
 evennia/contrib/tutorial_world/objects.py |  7 ++---
 evennia/scripts/taskhandler.py            |  7 +++--
 evennia/server/sessionhandler.py          |  3 +-
 evennia/utils/utils.py                    |  2 +-
 7 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 65fb0fa639..f437779662 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -38,7 +38,6 @@ _RE = re.compile(r"^\+|-+\+|\+-+|--*|\|(?:\s|$)", re.MULTILINE)
 # ------------------------------------------------------------
 
 
-@mock.patch("evennia.utils.utils.delay")
 class CommandTest(EvenniaTest):
     """
     Tests a command
diff --git a/evennia/commands/tests.py b/evennia/commands/tests.py
index 0e465e377b..ef8f9d24a5 100644
--- a/evennia/commands/tests.py
+++ b/evennia/commands/tests.py
@@ -264,14 +264,20 @@ class TestCmdSetMergers(TestCase):
 # test cmdhandler functions
 
 
+import sys
 from evennia.commands import cmdhandler
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
 
+def _mockdelay(time, func, *args, **kwargs):
+    return func(*args, **kwargs)
+
+
 class TestGetAndMergeCmdSets(TwistedTestCase, EvenniaTest):
     "Test the cmdhandler.get_and_merge_cmdsets function."
 
     def setUp(self):
+        self.patch(sys.modules['evennia.server.sessionhandler'], 'delay', _mockdelay)
         super(TestGetAndMergeCmdSets, self).setUp()
         self.cmdset_a = _CmdSetA()
         self.cmdset_b = _CmdSetB()
@@ -325,6 +331,7 @@ class TestGetAndMergeCmdSets(TwistedTestCase, EvenniaTest):
         a.no_exits = True
         a.no_channels = True
         self.set_cmdsets(self.obj1, a, b, c, d)
+
         deferred = cmdhandler.get_and_merge_cmdsets(self.obj1, None, None, self.obj1, "object", "")
 
         def _callback(cmdset):
diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py
index 23e4662ec3..ff6b01d5cf 100644
--- a/evennia/contrib/tests.py
+++ b/evennia/contrib/tests.py
@@ -815,9 +815,30 @@ class TestTutorialWorldMob(EvenniaTest):
 
 
 from evennia.contrib.tutorial_world import objects as tutobjects
+from mock.mock import MagicMock
+from twisted.trial.unittest import TestCase as TwistedTestCase
+
+from twisted.internet.base import DelayedCall
+DelayedCall.debug = True
 
 
-class TestTutorialWorldObjects(CommandTest):
+def _mockdelay(tim, func, *args, **kwargs):
+    func(*args, **kwargs)
+    return MagicMock()
+
+
+def _mockdeferLater(reactor, timedelay, callback, *args, **kwargs):
+    callback(*args, **kwargs)
+    return MagicMock()
+
+
+class TestTutorialWorldObjects(TwistedTestCase, CommandTest):
+
+    def setUp(self):
+        self.patch(sys.modules['evennia.contrib.tutorial_world.objects'], 'delay', _mockdelay)
+        self.patch(sys.modules['evennia.scripts.taskhandler'], 'deferLater', _mockdeferLater)
+        super(TestTutorialWorldObjects, self).setUp()
+
     def test_tutorialobj(self):
         obj1 = create_object(tutobjects.TutorialObject, key="tutobj")
         obj1.reset()
@@ -839,10 +860,7 @@ class TestTutorialWorldObjects(CommandTest):
 
     def test_lightsource(self):
         light = create_object(tutobjects.LightSource, key="torch", location=self.room1)
-        self.call(tutobjects.CmdLight(), "", "You light torch.", obj=light)
-        light._burnout()
-        if hasattr(light, "deferred"):
-            light.deferred.cancel()
+        self.call(tutobjects.CmdLight(), "", "A torch on the floor flickers and dies.|You light torch.", obj=light)
         self.assertFalse(light.pk)
 
     def test_crumblingwall(self):
@@ -860,12 +878,12 @@ class TestTutorialWorldObjects(CommandTest):
                   "You shift the weedy green root upwards.|Holding aside the root you think you notice something behind it ...", obj=wall)
         self.call(tutobjects.CmdPressButton(), "",
                   "You move your fingers over the suspicious depression, then gives it a decisive push. First", obj=wall)
-        self.assertTrue(wall.db.button_exposed)
-        self.assertTrue(wall.db.exit_open)
+        # we patch out the delay, so these are closed immediately
+        self.assertFalse(wall.db.button_exposed)
+        self.assertFalse(wall.db.exit_open)
         wall.reset()
-        if hasattr(wall, "deferred"):
-            wall.deferred.cancel()
         wall.delete()
+        return wall.deferred
 
     def test_weapon(self):
         weapon = create_object(tutobjects.Weapon, key="sword", location=self.char1)
diff --git a/evennia/contrib/tutorial_world/objects.py b/evennia/contrib/tutorial_world/objects.py
index 3859de7d2d..b260770577 100644
--- a/evennia/contrib/tutorial_world/objects.py
+++ b/evennia/contrib/tutorial_world/objects.py
@@ -23,8 +23,7 @@ from future.utils import listvalues
 import random
 
 from evennia import DefaultObject, DefaultExit, Command, CmdSet
-from evennia import utils
-from evennia.utils import search
+from evennia.utils import search, delay
 from evennia.utils.spawner import spawn
 
 # -------------------------------------------------------------
@@ -373,7 +372,7 @@ class LightSource(TutorialObject):
             # start the burn timer. When it runs out, self._burnout
             # will be called. We store the deferred so it can be
             # killed in unittesting.
-            self.deferred = utils.delay(60 * 3, self._burnout)
+            self.deferred = delay(60 * 3, self._burnout)
         return True
 
 
@@ -645,7 +644,7 @@ class CrumblingWall(TutorialObject, DefaultExit):
         self.db.exit_open = True
         # start a 45 second timer before closing again. We store the deferred so it can be
         # killed in unittesting.
-        self.deferred = utils.delay(45, self.reset)
+        self.deferred = delay(45, self.reset)
 
     def _translate_position(self, root, ipos):
         """Translates the position into words"""
diff --git a/evennia/scripts/taskhandler.py b/evennia/scripts/taskhandler.py
index f4819ba076..a61dd6fb4a 100644
--- a/evennia/scripts/taskhandler.py
+++ b/evennia/scripts/taskhandler.py
@@ -4,7 +4,8 @@ Module containing the task handler for Evennia deferred tasks, persistent or not
 
 from datetime import datetime, timedelta
 
-from twisted.internet import reactor, task
+from twisted.internet import reactor
+from twisted.internet.task import deferLater
 from evennia.server.models import ServerConfig
 from evennia.utils.logger import log_err
 from evennia.utils.dbserialize import dbserialize, dbunserialize
@@ -143,7 +144,7 @@ class TaskHandler(object):
             args = [task_id]
             kwargs = {}
 
-        return task.deferLater(reactor, timedelay, callback, *args, **kwargs)
+        return deferLater(reactor, timedelay, callback, *args, **kwargs)
 
     def remove(self, task_id):
         """Remove a persistent task without executing it.
@@ -189,7 +190,7 @@ class TaskHandler(object):
         now = datetime.now()
         for task_id, (date, callbac, args, kwargs) in self.tasks.items():
             seconds = max(0, (date - now).total_seconds())
-            task.deferLater(reactor, seconds, self.do_task, task_id)
+            deferLater(reactor, seconds, self.do_task, task_id)
 
 
 # Create the soft singleton
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index 5fb15930c9..39637bb00b 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -21,7 +21,7 @@ from evennia.commands.cmdhandler import CMD_LOGINSTART
 from evennia.utils.logger import log_trace
 from evennia.utils.utils import (variable_from_module, is_iter,
                                  to_str, to_unicode,
-                                 make_iter,
+                                 make_iter, delay,
                                  callables_from_module)
 from evennia.utils.inlinefuncs import parse_inlinefunc
 
@@ -314,7 +314,6 @@ class ServerSessionHandler(SessionHandler):
         # this delay is necessary notably for Mudlet, which will fail on the connection screen
         # unless the MXP protocol has been negotiated. Unfortunately this may be too short for some
         # networks, the symptom is that < and > are not parsed by mudlet on first connection.
-        from evennia.utils.utils import delay
         delay(0.3, self.data_in, sess, text=[[CMD_LOGINSTART], {}])
         # self.data_in(sess, text=[[CMD_LOGINSTART], {}])
 
diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py
index 1a159991ba..550b11eac3 100644
--- a/evennia/utils/utils.py
+++ b/evennia/utils/utils.py
@@ -948,7 +948,7 @@ def delay(timedelay, callback, *args, **kwargs):
             specified here.
 
     Note:
-        The task handler (`evennia.scripts.taskhandler.TASK_HANDLEr`) will
+        The task handler (`evennia.scripts.taskhandler.TASK_HANDLER`) will
         be called for persistent or non-persistent tasks.
         If persistent is set to True, the callback, its arguments
         and other keyword arguments will be saved in the database,

From d038cf0f634344e90fa884219b154c2b75482246 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 3 Jan 2018 22:37:52 +0100
Subject: [PATCH 016/217] Don't send delayed CMD_LOGINSTART if session already
 logged in (to handle autologins)

---
 evennia/server/sessionhandler.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index 39637bb00b..49d9b46498 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -274,6 +274,16 @@ class ServerSessionHandler(SessionHandler):
         self.server = None
         self.server_data = {"servername": _SERVERNAME}
 
+    def _run_cmd_login(self, session):
+        """
+        Launch the CMD_LOGINSTART command. This is wrapped
+        for delays.
+
+        """
+        if not session.logged_in:
+            self.data_in(session, text=[[CMD_LOGINSTART], {}])
+
+
     def portal_connect(self, portalsessiondata):
         """
         Called by Portal when a new session has connected.
@@ -314,8 +324,7 @@ class ServerSessionHandler(SessionHandler):
         # this delay is necessary notably for Mudlet, which will fail on the connection screen
         # unless the MXP protocol has been negotiated. Unfortunately this may be too short for some
         # networks, the symptom is that < and > are not parsed by mudlet on first connection.
-        delay(0.3, self.data_in, sess, text=[[CMD_LOGINSTART], {}])
-        # self.data_in(sess, text=[[CMD_LOGINSTART], {}])
+        delay(0.3, self._run_cmd_login, sess)
 
     def portal_session_sync(self, portalsessiondata):
         """

From 55a29f00a12c50311dd7b277795ec7cfa606f443 Mon Sep 17 00:00:00 2001
From: sorressean <tyler@tysdomain.com>
Date: Fri, 5 Jan 2018 02:33:29 -0500
Subject: [PATCH 017/217] Fixed typo in help message that shows syntax.

---
 evennia/commands/default/building.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index f4a001e6d2..9f3e2303a9 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -2686,7 +2686,7 @@ class CmdSpawn(COMMAND_DEFAULT_CLASS):
         def _show_prototypes(prototypes):
             """Helper to show a list of available prototypes"""
             prots = ", ".join(sorted(prototypes.keys()))
-            return "\nAvailable prototypes (case sensistive): %s" % (
+            return "\nAvailable prototypes (case sensative): %s" % (
                     "\n" + utils.fill(prots) if prots else "None")
 
         prototypes = spawn(return_prototypes=True)

From 78bdffa076d4802a3bf7749291d9f610bcf99a23 Mon Sep 17 00:00:00 2001
From: sorressean <tyler@tysdomain.com>
Date: Fri, 5 Jan 2018 02:38:35 -0500
Subject: [PATCH 018/217] spelled correctly this time.

---
 evennia/commands/default/building.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index 9f3e2303a9..78aa7d7553 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -2686,7 +2686,7 @@ class CmdSpawn(COMMAND_DEFAULT_CLASS):
         def _show_prototypes(prototypes):
             """Helper to show a list of available prototypes"""
             prots = ", ".join(sorted(prototypes.keys()))
-            return "\nAvailable prototypes (case sensative): %s" % (
+            return "\nAvailable prototypes (case sensitive): %s" % (
                     "\n" + utils.fill(prots) if prots else "None")
 
         prototypes = spawn(return_prototypes=True)

From 3c2b359f559efdb5a11abeb21763a42ded28c553 Mon Sep 17 00:00:00 2001
From: Vincent Le Goff <vincent.legoff.srs@gmail.com>
Date: Sat, 6 Jan 2018 13:32:30 +0100
Subject: [PATCH 019/217] [IGPS] Fix mistakes in the say event

---
 evennia/contrib/ingame_python/typeclasses.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/contrib/ingame_python/typeclasses.py b/evennia/contrib/ingame_python/typeclasses.py
index 33729bef66..3f52b982bf 100644
--- a/evennia/contrib/ingame_python/typeclasses.py
+++ b/evennia/contrib/ingame_python/typeclasses.py
@@ -430,7 +430,7 @@ class EventCharacter(DefaultCharacter):
 
             # Browse all the room's other characters
             for obj in location.contents:
-                if obj is self or not inherits_from(obj, "objects.objects.DefaultCharacter"):
+                if obj is self or not inherits_from(obj, "evennia.objects.objects.DefaultCharacter"):
                     continue
 
                 allow = obj.callbacks.call("can_say", self, obj, message, parameters=message)
@@ -491,7 +491,7 @@ class EventCharacter(DefaultCharacter):
                   parameters=message)
 
             # Call the other characters' "say" event
-            presents = [obj for obj in location.contents if obj is not self and inherits_from(obj, "objects.objects.DefaultCharacter")]
+            presents = [obj for obj in location.contents if obj is not self and inherits_from(obj, "evennia.objects.objects.DefaultCharacter")]
             for present in presents:
                 present.callbacks.call("say", self, present, message, parameters=message)
 

From 0bbaf9ea1788106fb5268db10c2d8b2690adf18d Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 6 Jan 2018 19:19:20 +0100
Subject: [PATCH 020/217] Make DELAY_CMD_LOGINSTART configurable in settings

---
 evennia/server/sessionhandler.py | 10 ++++------
 evennia/settings_default.py      |  8 ++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index 49d9b46498..423bc87f1c 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -65,6 +65,7 @@ from django.utils.translation import ugettext as _
 _SERVERNAME = settings.SERVERNAME
 _MULTISESSION_MODE = settings.MULTISESSION_MODE
 _IDLE_TIMEOUT = settings.IDLE_TIMEOUT
+_DELAY_CMD_LOGINSTART = settings.DELAY_CMD_LOGINSTART
 _MAX_SERVER_COMMANDS_PER_SECOND = 100.0
 _MAX_SESSION_COMMANDS_PER_SECOND = 5.0
 _MODEL_MAP = None
@@ -319,12 +320,9 @@ class ServerSessionHandler(SessionHandler):
                 sess.logged_in = False
                 sess.uid = None
 
-        # show the first login command
-
-        # this delay is necessary notably for Mudlet, which will fail on the connection screen
-        # unless the MXP protocol has been negotiated. Unfortunately this may be too short for some
-        # networks, the symptom is that < and > are not parsed by mudlet on first connection.
-        delay(0.3, self._run_cmd_login, sess)
+        # show the first login command, may delay slightly to allow
+        # the handshakes to finish.
+        delay(_DELAY_CMD_LOGINSTART, self._run_cmd_login, sess)
 
     def portal_session_sync(self, portalsessiondata):
         """
diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index b1e2a7a79e..7ae45c4be2 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -307,6 +307,14 @@ CMD_IGNORE_PREFIXES = "@&/+"
 # This module should contain one or more variables
 # with strings defining the look of the screen.
 CONNECTION_SCREEN_MODULE = "server.conf.connection_screens"
+# Delay to use before sending the evennia.syscmdkeys.CMD_LOGINSTART Command
+# when a new session connects (this defaults the unloggedin-look for showing
+# the connection screen). The delay is useful mainly for telnet, to allow
+# client/server to establish client capabilities like color/mxp etc before
+# sending any text. A value of 0.3 should be enough. While a good idea, it may
+# cause issues with menu-logins and autoconnects since the menu will not have
+# started when the autoconnects starts sending menu commands.
+DELAY_CMD_LOGINSTART = 0.3
 # An optional module that, if existing, must hold a function
 # named at_initial_setup(). This hook method can be used to customize
 # the server's initial setup sequence (the very first startup of the system).

From 5fabb57c26910d8af55e7d618d6d8c1551196f81 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 6 Jan 2018 19:22:34 +0100
Subject: [PATCH 021/217] Edit version info

---
 evennia/VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/VERSION.txt b/evennia/VERSION.txt
index faef31a435..f8d71478f5 100644
--- a/evennia/VERSION.txt
+++ b/evennia/VERSION.txt
@@ -1 +1 @@
-0.7.0
+0.8.0-dev

From 9ae8206d8af5003408aa84d4ccb36257ea675029 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 6 Jan 2018 19:19:20 +0100
Subject: [PATCH 022/217] Make DELAY_CMD_LOGINSTART configurable in settings

---
 evennia/server/sessionhandler.py | 10 ++++------
 evennia/settings_default.py      |  8 ++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index 49d9b46498..423bc87f1c 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -65,6 +65,7 @@ from django.utils.translation import ugettext as _
 _SERVERNAME = settings.SERVERNAME
 _MULTISESSION_MODE = settings.MULTISESSION_MODE
 _IDLE_TIMEOUT = settings.IDLE_TIMEOUT
+_DELAY_CMD_LOGINSTART = settings.DELAY_CMD_LOGINSTART
 _MAX_SERVER_COMMANDS_PER_SECOND = 100.0
 _MAX_SESSION_COMMANDS_PER_SECOND = 5.0
 _MODEL_MAP = None
@@ -319,12 +320,9 @@ class ServerSessionHandler(SessionHandler):
                 sess.logged_in = False
                 sess.uid = None
 
-        # show the first login command
-
-        # this delay is necessary notably for Mudlet, which will fail on the connection screen
-        # unless the MXP protocol has been negotiated. Unfortunately this may be too short for some
-        # networks, the symptom is that < and > are not parsed by mudlet on first connection.
-        delay(0.3, self._run_cmd_login, sess)
+        # show the first login command, may delay slightly to allow
+        # the handshakes to finish.
+        delay(_DELAY_CMD_LOGINSTART, self._run_cmd_login, sess)
 
     def portal_session_sync(self, portalsessiondata):
         """
diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index b1e2a7a79e..7ae45c4be2 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -307,6 +307,14 @@ CMD_IGNORE_PREFIXES = "@&/+"
 # This module should contain one or more variables
 # with strings defining the look of the screen.
 CONNECTION_SCREEN_MODULE = "server.conf.connection_screens"
+# Delay to use before sending the evennia.syscmdkeys.CMD_LOGINSTART Command
+# when a new session connects (this defaults the unloggedin-look for showing
+# the connection screen). The delay is useful mainly for telnet, to allow
+# client/server to establish client capabilities like color/mxp etc before
+# sending any text. A value of 0.3 should be enough. While a good idea, it may
+# cause issues with menu-logins and autoconnects since the menu will not have
+# started when the autoconnects starts sending menu commands.
+DELAY_CMD_LOGINSTART = 0.3
 # An optional module that, if existing, must hold a function
 # named at_initial_setup(). This hook method can be used to customize
 # the server's initial setup sequence (the very first startup of the system).

From 1c6b74dc89f276194752bb5ae7253c0bd11fb7ae Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 6 Jan 2018 20:12:51 +0100
Subject: [PATCH 023/217] Update/refactor search_channel with aliases and
 proper query. Resolves #1534.

---
 evennia/comms/managers.py  | 53 +++++++++++++++++---------------------
 evennia/objects/manager.py | 10 ++++---
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/evennia/comms/managers.py b/evennia/comms/managers.py
index f50d813123..dc541528c7 100644
--- a/evennia/comms/managers.py
+++ b/evennia/comms/managers.py
@@ -355,15 +355,16 @@ class ChannelDBManager(TypedObjectManager):
             channel (Channel or None): A channel match.
 
         """
-        # first check the channel key
-        channels = self.filter(db_key__iexact=channelkey)
-        if not channels:
-            # also check aliases
-            channels = [channel for channel in self.all()
-                        if channelkey in channel.aliases.all()]
-        if channels:
-            return channels[0]
-        return None
+        dbref = self.dbref(channelkey)
+        if dbref:
+            try:
+                return self.get(id=dbref)
+            except self.model.DoesNotExist:
+                pass
+        results = self.filter(Q(db_key__iexact=channelkey) |
+                              Q(db_tags__db_tagtype__iexact="alias",
+                                db_tags__db_key__iexact=channelkey)).distinct()
+        return results[0] if results else None
 
     def get_subscriptions(self, subscriber):
         """
@@ -393,26 +394,20 @@ class ChannelDBManager(TypedObjectManager):
                 case sensitive) match.
 
         """
-        channels = []
-        if not ostring:
-            return channels
-        try:
-            # try an id match first
-            dbref = int(ostring.strip('#'))
-            channels = self.filter(id=dbref)
-        except Exception:
-            # Usually because we couldn't convert to int - not a dbref
-            pass
-        if not channels:
-            # no id match. Search on the key.
-            if exact:
-                channels = self.filter(db_key__iexact=ostring)
-            else:
-                channels = self.filter(db_key__icontains=ostring)
-        if not channels:
-            # still no match. Search by alias.
-            channels = [channel for channel in self.all()
-                        if ostring.lower() in [a.lower for a in channel.aliases.all()]]
+        dbref = self.dbref(ostring)
+        if dbref:
+            try:
+                return self.get(id=dbref)
+            except self.model.DoesNotExist:
+                pass
+        if exact:
+            channels = self.filter(Q(db_key__iexact=ostring) |
+                                   Q(db_tags__db_tagtype__iexact="alias",
+                                     db_tags__db_key__iexact=ostring)).distinct()
+        else:
+            channels = self.filter(Q(db_key__icontains=ostring) |
+                                   Q(db_tags__db_tagtype__iexact="alias",
+                                     db_tags__db_key__icontains=ostring)).distinct()
         return channels
     # back-compatibility alias
     channel_search = search_channel
diff --git a/evennia/objects/manager.py b/evennia/objects/manager.py
index 3d29768e5a..4c81ea186a 100644
--- a/evennia/objects/manager.py
+++ b/evennia/objects/manager.py
@@ -76,10 +76,14 @@ class ObjectDBManager(TypedObjectManager):
         # simplest case - search by dbref
         dbref = self.dbref(ostring)
         if dbref:
-            return dbref
+            try:
+                return self.get(id=dbref)
+            except self.model.DoesNotExist:
+                pass
+
         # not a dbref. Search by name.
-        cand_restriction = candidates is not None and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates)
-                                                                if obj]) or Q()
+        cand_restriction = candidates is not None and Q(
+                pk__in=[_GA(obj, "id") for obj in make_iter(candidates) if obj]) or Q()
         if exact:
             return self.filter(cand_restriction & Q(db_account__username__iexact=ostring))
         else:  # fuzzy matching

From 1835f75107fe64e49e06d46abd4712313656b812 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 7 Jan 2018 16:20:56 +0100
Subject: [PATCH 024/217] Make alias command handle categories, remove 'alias'
 alias from nick cmd

---
 evennia/commands/default/building.py | 36 +++++++++++++++++++++-------
 evennia/commands/default/general.py  |  2 +-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index 10bfd0f099..445ec082a9 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -106,9 +106,15 @@ class CmdSetObjAlias(COMMAND_DEFAULT_CLASS):
     Usage:
       @alias <obj> [= [alias[,alias,alias,...]]]
       @alias <obj> =
+      @alias/category <obj> = [alias[,alias,...]:<category>
+
+    Switches:
+      category - requires ending input with :category, to store the
+        given aliases with the given category.
 
     Assigns aliases to an object so it can be referenced by more
-    than one name. Assign empty to remove all aliases from object.
+    than one name. Assign empty to remove all aliases from object. If
+    assigning a category, all aliases given will be using this category.
 
     Observe that this is not the same thing as personal aliases
     created with the 'nick' command! Aliases set with @alias are
@@ -138,9 +144,12 @@ class CmdSetObjAlias(COMMAND_DEFAULT_CLASS):
             return
         if self.rhs is None:
             # no =, so we just list aliases on object.
-            aliases = obj.aliases.all()
+            aliases = obj.aliases.all(return_key_and_category=True)
             if aliases:
-                caller.msg("Aliases for '%s': %s" % (obj.get_display_name(caller), ", ".join(aliases)))
+                caller.msg("Aliases for %s: %s" % (
+                    obj.get_display_name(caller),
+                    ", ".join("'%s'%s" % (alias, "" if category is None else "[category:'%s']" % category)
+                              for (alias, category) in aliases)))
             else:
                 caller.msg("No aliases exist for '%s'." % obj.get_display_name(caller))
             return
@@ -159,17 +168,27 @@ class CmdSetObjAlias(COMMAND_DEFAULT_CLASS):
                 caller.msg("No aliases to clear.")
             return
 
+        category = None
+        if "category" in self.switches:
+            if ":" in self.rhs:
+                rhs, category = self.rhs.rsplit(':', 1)
+                category = category.strip()
+            else:
+                caller.msg("If specifying the /category switch, the category must be given "
+                           "as :category at the end.")
+        else:
+            rhs = self.rhs
+
         # merge the old and new aliases (if any)
-        old_aliases = obj.aliases.all()
-        new_aliases = [alias.strip().lower() for alias in self.rhs.split(',')
-                       if alias.strip()]
+        old_aliases = obj.aliases.get(category=category, return_list=True)
+        new_aliases = [alias.strip().lower() for alias in rhs.split(',') if alias.strip()]
 
         # make the aliases only appear once
         old_aliases.extend(new_aliases)
         aliases = list(set(old_aliases))
 
         # save back to object.
-        obj.aliases.add(aliases)
+        obj.aliases.add(aliases, category=category)
 
         # we need to trigger this here, since this will force
         # (default) Exits to rebuild their Exit commands with the new
@@ -177,7 +196,8 @@ class CmdSetObjAlias(COMMAND_DEFAULT_CLASS):
         obj.at_cmdset_get(force_init=True)
 
         # report all aliases on the object
-        caller.msg("Alias(es) for '%s' set to %s." % (obj.get_display_name(caller), str(obj.aliases)))
+        caller.msg("Alias(es) for '%s' set to '%s'%s." % (obj.get_display_name(caller),
+                   str(obj.aliases), " (category: '%s')" % category if category else ""))
 
 
 class CmdCopy(ObjManipCommand):
diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 2f880f3f7f..612a798167 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -113,7 +113,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
 
     """
     key = "nick"
-    aliases = ["nickname", "nicks", "alias"]
+    aliases = ["nickname", "nicks"]
     locks = "cmd:all()"
 
     def func(self):

From 0b7c937903966258a46e95ff13fe5311fb299d2a Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 7 Jan 2018 16:21:59 +0100
Subject: [PATCH 025/217] Clarify taghandler.get docstring

---
 evennia/typeclasses/tags.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/evennia/typeclasses/tags.py b/evennia/typeclasses/tags.py
index e7c3bfdbb1..488dce0f85 100644
--- a/evennia/typeclasses/tags.py
+++ b/evennia/typeclasses/tags.py
@@ -269,14 +269,15 @@ class TagHandler(object):
 
     def get(self, key=None, default=None, category=None, return_tagobj=False, return_list=False):
         """
-        Get the tag for the given key or list of tags.
+        Get the tag for the given key, category or combination of the two.
 
         Args:
-            key (str or list): The tag or tags to retrieve.
+            key (str or list, optional): The tag or tags to retrieve.
             default (any, optional): The value to return in case of no match.
             category (str, optional): The Tag category to limit the
                 request to. Note that `None` is the valid, default
-                category.
+                category. If no `key` is given, all tags of this category will be
+                returned.
             return_tagobj (bool, optional): Return the Tag object itself
                 instead of a string representation of the Tag.
             return_list (bool, optional): Always return a list, regardless

From dfd2d3897ab5f8118732907835be389bfd2da0cb Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 7 Jan 2018 19:31:01 +0100
Subject: [PATCH 026/217] Add inflect dependency. Add get_plural_name and
 mechanisms discussed in #1385.

---
 evennia/objects/objects.py | 45 +++++++++++++++++++++++++++++++++-----
 requirements.txt           |  1 +
 win_requirements.txt       |  1 +
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index af7f520817..7c230a8c47 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -6,8 +6,10 @@ entities.
 
 """
 import time
+import inflect
 from builtins import object
 from future.utils import with_metaclass
+from collections import Counter
 
 from django.conf import settings
 
@@ -22,9 +24,10 @@ from evennia.commands import cmdhandler
 from evennia.utils import search
 from evennia.utils import logger
 from evennia.utils.utils import (variable_from_module, lazy_property,
-                                 make_iter, to_unicode, is_iter)
+                                 make_iter, to_unicode, is_iter, list_to_string)
 from django.utils.translation import ugettext as _
 
+_INFLECT = inflect.engine()
 _MULTISESSION_MODE = settings.MULTISESSION_MODE
 
 _ScriptDB = None
@@ -281,9 +284,34 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
             return "{}(#{})".format(self.name, self.id)
         return self.name
 
+    def get_plural_name(self, looker, **kwargs):
+        """
+        Return the plural form of this object's key. This is used for grouping multiple same-named
+        versions of this object.
+
+        Args:
+            looker (Object): Onlooker. Not used by default.
+        Kwargs:
+            key (str): Optional key to pluralize, use this instead of the object's key.
+            count (int): How many entities of this type are being counted (not used by default).
+        Returns:
+            plural (str): The determined plural form of the key.
+
+        """
+        key = kwargs.get("key", self.key)
+        plural = _INFLECT.plural(key, 2)
+        if not self.aliases.get(plural, category="plural_key"):
+            # we need to wipe any old plurals/an/a in case key changed in the interrim
+            self.aliases.clear(category="plural_key")
+            self.aliases.add(plural, category="plural_key")
+            # save the singular form as an alias here too so we can display "an egg" and also
+            # look at 'an egg'.
+            self.aliases.add(_INFLECT.an(key), category="plural_key")
+        return plural
+
     def search(self, searchdata,
                global_search=False,
-               use_nicks=True,  # should this default to off?
+               use_nicks=True,
                typeclass=None,
                location=None,
                attribute_name=None,
@@ -1441,16 +1469,23 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
             elif con.has_account:
                 users.append("|c%s|n" % key)
             else:
-                things.append(key)
+                # things can be pluralized
+                things.append((key, con.get_plural_name(looker)))
         # get description, build string
         string = "|c%s|n\n" % self.get_display_name(looker)
         desc = self.db.desc
         if desc:
             string += "%s" % desc
         if exits:
-            string += "\n|wExits:|n " + ", ".join(exits)
+            string += "\n|wExits:|n " + list_to_string(exits)
         if users or things:
-            string += "\n|wYou see:|n " + ", ".join(users + things)
+            # handle pluralization
+            things = [("%s %s" % (_INFLECT.number_to_words(count, one=_INFLECT.an(key), threshold=12),
+                                  plural if count > 1 else "")).strip()
+                      for ikey, ((key, plural), count) in enumerate(Counter(things).iteritems())]
+
+            string += "\n|wYou see:|n " + list_to_string(users + things)
+
         return string
 
     def at_look(self, target, **kwargs):
diff --git a/requirements.txt b/requirements.txt
index be3cf558e5..7f4b94726f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,3 +7,4 @@ pillow == 2.9.0
 pytz
 future >= 0.15.2
 django-sekizai
+inflect
diff --git a/win_requirements.txt b/win_requirements.txt
index 7012643657..8a130b3268 100644
--- a/win_requirements.txt
+++ b/win_requirements.txt
@@ -10,3 +10,4 @@ pillow == 2.9.0
 pytz
 future >= 0.15.2
 django-sekizai
+inflect

From cc1bc92c3dc65a7a5cd7258350feb0d8937f3bdd Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 7 Jan 2018 20:34:03 +0100
Subject: [PATCH 027/217] Rename to get_numbered_name. Handle 'two boxes'
 through aliasing. Fix unittests

---
 evennia/commands/default/tests.py |  3 ++-
 evennia/objects/objects.py        | 42 +++++++++++++++++++------------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index f437779662..013baec4cc 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -239,7 +239,8 @@ class TestBuilding(CommandTest):
         self.call(building.CmdExamine(), "Obj", "Name/key: Obj")
 
     def test_set_obj_alias(self):
-        self.call(building.CmdSetObjAlias(), "Obj = TestObj1b", "Alias(es) for 'Obj(#4)' set to testobj1b.")
+        self.call(building.CmdSetObjAlias(), "Obj =", "Cleared aliases from Obj(#4)")
+        self.call(building.CmdSetObjAlias(), "Obj = TestObj1b", "Alias(es) for 'Obj(#4)' set to 'testobj1b'.")
 
     def test_copy(self):
         self.call(building.CmdCopy(), "Obj = TestObj2;TestObj2b, TestObj3;TestObj3b", "Copied Obj to 'TestObj3' (aliases: ['TestObj3b']")
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 7c230a8c47..de4e887b32 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -9,7 +9,7 @@ import time
 import inflect
 from builtins import object
 from future.utils import with_metaclass
-from collections import Counter
+from collections import defaultdict
 
 from django.conf import settings
 
@@ -284,30 +284,35 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
             return "{}(#{})".format(self.name, self.id)
         return self.name
 
-    def get_plural_name(self, looker, **kwargs):
+    def get_numbered_name(self, count, looker, **kwargs):
         """
-        Return the plural form of this object's key. This is used for grouping multiple same-named
-        versions of this object.
+        Return the numbered (singular, plural) forms of this object's key. This is by default called
+        by return_appearance and is used for grouping multiple same-named of this object. Note that
+        this will be called on *every* member of a group even though the plural name will be only
+        shown once. Also the singular display version, such as 'an apple', 'a tree' is determined
+        from this method.
 
         Args:
+            count (int): Number of objects of this type
             looker (Object): Onlooker. Not used by default.
         Kwargs:
             key (str): Optional key to pluralize, use this instead of the object's key.
-            count (int): How many entities of this type are being counted (not used by default).
         Returns:
-            plural (str): The determined plural form of the key.
-
+            singular (str): The singular form to display.
+            plural (str): The determined plural form of the key, including the count.
         """
         key = kwargs.get("key", self.key)
         plural = _INFLECT.plural(key, 2)
+        plural = "%s %s" % (_INFLECT.number_to_words(count, threshold=12), plural)
+        singular = _INFLECT.an(key)
         if not self.aliases.get(plural, category="plural_key"):
             # we need to wipe any old plurals/an/a in case key changed in the interrim
             self.aliases.clear(category="plural_key")
             self.aliases.add(plural, category="plural_key")
             # save the singular form as an alias here too so we can display "an egg" and also
             # look at 'an egg'.
-            self.aliases.add(_INFLECT.an(key), category="plural_key")
-        return plural
+            self.aliases.add(singular, category="plural_key")
+        return singular, plural
 
     def search(self, searchdata,
                global_search=False,
@@ -1461,7 +1466,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
         # get and identify all objects
         visible = (con for con in self.contents if con != looker and
                    con.access(looker, "view"))
-        exits, users, things = [], [], []
+        exits, users, things = [], [], defaultdict(list)
         for con in visible:
             key = con.get_display_name(looker)
             if con.destination:
@@ -1470,7 +1475,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
                 users.append("|c%s|n" % key)
             else:
                 # things can be pluralized
-                things.append((key, con.get_plural_name(looker)))
+                things[key].append(con)
         # get description, build string
         string = "|c%s|n\n" % self.get_display_name(looker)
         desc = self.db.desc
@@ -1479,12 +1484,17 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
         if exits:
             string += "\n|wExits:|n " + list_to_string(exits)
         if users or things:
-            # handle pluralization
-            things = [("%s %s" % (_INFLECT.number_to_words(count, one=_INFLECT.an(key), threshold=12),
-                                  plural if count > 1 else "")).strip()
-                      for ikey, ((key, plural), count) in enumerate(Counter(things).iteritems())]
+            # handle pluralization of things (never pluralize users)
+            thing_strings = []
+            for key, itemlist in sorted(things.iteritems()):
+                nitem = len(itemlist)
+                if nitem == 1:
+                    key, _ = itemlist[0].get_numbered_name(nitem, looker, key=key)
+                else:
+                    key = [item.get_numbered_name(nitem, looker, key=key)[1] for item in itemlist][0]
+                thing_strings.append(key)
 
-            string += "\n|wYou see:|n " + list_to_string(users + things)
+            string += "\n|wYou see:|n " + list_to_string(users + thing_strings)
 
         return string
 

From b273641984bcf6cac2efdea4926b77f8896cbefa Mon Sep 17 00:00:00 2001
From: Tehom <surly.mime@gmail.com>
Date: Mon, 8 Jan 2018 05:31:20 -0500
Subject: [PATCH 028/217] Refactor return_appearance to extract desc update
 into its own method.

---
 evennia/contrib/extended_room.py | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/evennia/contrib/extended_room.py b/evennia/contrib/extended_room.py
index 0530bd796c..755c2ac22e 100644
--- a/evennia/contrib/extended_room.py
+++ b/evennia/contrib/extended_room.py
@@ -213,37 +213,39 @@ class ExtendedRoom(DefaultRoom):
             return detail
         return None
 
-    def return_appearance(self, looker):
+    def return_appearance(self, looker, **kwargs):
         """
         This is called when e.g. the look command wants to retrieve
         the description of this object.
 
         Args:
             looker (Object): The object looking at us.
+            **kwargs (dict): Arbitrary, optional arguments for users
+                overriding the call (unused by default).
 
         Returns:
             description (str): Our description.
 
         """
-        update = False
+        # ensures that our description is current based on time/season
+        self.update_current_description()
+        # run the normal return_appearance method, now that desc is updated.
+        return super(ExtendedRoom, self).return_appearance(looker, **kwargs)
 
+    def update_current_description(self):
+        """
+        This will update the description of the room if the time or season
+        has changed since last checked.
+        """
+        update = False
         # get current time and season
         curr_season, curr_timeslot = self.get_time_and_season()
-
         # compare with previously stored slots
         last_season = self.ndb.last_season
         last_timeslot = self.ndb.last_timeslot
-
         if curr_season != last_season:
             # season changed. Load new desc, or a fallback.
-            if curr_season == 'spring':
-                new_raw_desc = self.db.spring_desc
-            elif curr_season == 'summer':
-                new_raw_desc = self.db.summer_desc
-            elif curr_season == 'autumn':
-                new_raw_desc = self.db.autumn_desc
-            else:
-                new_raw_desc = self.db.winter_desc
+            new_raw_desc = self.attributes.get("%s_desc" % curr_season)
             if new_raw_desc:
                 raw_desc = new_raw_desc
             else:
@@ -252,19 +254,15 @@ class ExtendedRoom(DefaultRoom):
             self.db.raw_desc = raw_desc
             self.ndb.last_season = curr_season
             update = True
-
         if curr_timeslot != last_timeslot:
             # timeslot changed. Set update flag.
             self.ndb.last_timeslot = curr_timeslot
             update = True
-
         if update:
             # if anything changed we have to re-parse
             # the raw_desc for time markers
             # and re-save the description again.
             self.db.desc = self.replace_timeslots(self.db.raw_desc, curr_timeslot)
-        # run the normal return_appearance method, now that desc is updated.
-        return super(ExtendedRoom, self).return_appearance(looker)
 
 
 # Custom Look command supporting Room details. Add this to

From a634f156540c03a90f48bd887d1df0c7ba322158 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 9 Jan 2018 18:09:56 +0100
Subject: [PATCH 029/217] Add escaping = as \= in nicks, add colors. Resolves
 #1551.

---
 evennia/commands/default/general.py | 51 +++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 6a30e3813c..97c9e49a8d 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -1,6 +1,7 @@
 """
 General Character commands usually available to all characters
 """
+import re
 from django.conf import settings
 from evennia.utils import utils, evtable
 from evennia.typeclasses.attributes import NickTemplateInvalid
@@ -75,13 +76,14 @@ class CmdLook(COMMAND_DEFAULT_CLASS):
 
 class CmdNick(COMMAND_DEFAULT_CLASS):
     """
-    define a personal alias/nick
+    define a personal alias/nick by defining a string to
+    match and replace it with another on the fly
 
     Usage:
       nick[/switches] <string> [= [replacement_string]]
       nick[/switches] <template> = <replacement_template>
       nick/delete <string> or number
-      nick/test <test string>
+      nicks
 
     Switches:
       inputline - replace on the inputline (default)
@@ -90,22 +92,24 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
       delete    - remove nick by name or by index given by /list
       clearall  - clear all nicks
       list      - show all defined aliases (also "nicks" works)
-      test      - test input to see what it matches with
 
     Examples:
       nick hi = say Hello, I'm Sarah!
       nick/object tom = the tall man
-      nick build $1 $2 = @create/drop $1;$2     - (template)
-      nick tell $1 $2=@page $1=$2               - (template)
+      nick build $1 $2 = @create/drop $1;$2
+      nick tell $1 $2=@page $1=$2
+      nick tm?$1=@page tallman=$1
+      nick tm\=$1=@page tallman=$1
 
     A 'nick' is a personal string replacement. Use $1, $2, ... to catch arguments.
     Put the last $-marker without an ending space to catch all remaining text. You
-    can also use unix-glob matching:
+    can also use unix-glob matching for the left-hand side:
 
         * - matches everything
-        ? - matches a single character
-        [seq] - matches all chars in sequence
-        [!seq] - matches everything not in sequence
+        ? - matches 0 or 1 single characters
+        [abcd] - matches these chars in any order
+        [!abcd] - matches everything not among these chars
+        \= - use to have '=' in your matching string
 
     Note that no objects are actually renamed or changed by this command - your nicks
     are only available to you. If you want to permanently add keywords to an object
@@ -116,9 +120,27 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
     aliases = ["nickname", "nicks", "alias"]
     locks = "cmd:all()"
 
+    def parse(self):
+        """
+        Support escaping of = with \=
+        """
+        args = self.args
+        super(CmdNick, self).parse()
+        parts = re.split(r"(?<!\\)=", args, 1)
+        self.rhs = None
+        if len(parts) < 2:
+            self.lhs = parts[0].strip()
+        else:
+            self.lhs, self.rhs = [part.strip() for part in parts]
+        self.lhs = self.lhs.replace("\=", "=")
+
     def func(self):
         """Create the nickname"""
 
+        def _cy(string):
+            "add color to the special markers"
+            return re.sub(r"(\$[0-9]+|\*|\?|\[.+?\])", r"|Y\1|n", string)
+
         caller = self.caller
         switches = self.switches
         nicktypes = [switch for switch in switches if switch in ("object", "account", "inputline")] or ["inputline"]
@@ -133,7 +155,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
                 table = evtable.EvTable("#", "Type", "Nick match", "Replacement")
                 for inum, nickobj in enumerate(nicklist):
                     _, _, nickvalue, replacement = nickobj.value
-                    table.add_row(str(inum + 1), nickobj.db_category, nickvalue, replacement)
+                    table.add_row(str(inum + 1), nickobj.db_category, _cy(nickvalue), _cy(replacement))
                 string = "|wDefined Nicks:|n\n%s" % table
             caller.msg(string)
             return
@@ -182,12 +204,15 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
                     caller.nicks.remove(old_nickstring, category=nicktype)
                     string += "\nNick removed: '|w%s|n' -> |w%s|n." % (old_nickstring, old_replstring)
                 else:
-                    errstring += "\nNick '|w%s|n' was not deleted." % old_nickstring
+                    errstring += "\nNick '|w%s|n' was not deleted." % (old_nickstring)
             elif replstring:
                 # creating new nick
                 errstring = ""
                 if oldnick:
-                    string += "\nNick '|w%s|n' updated to map to '|w%s|n'." % (old_nickstring, replstring)
+                    if replstring == old_replstring:
+                        string += "\nIdentical nick already set."
+                    else:
+                        string += "\nNick '|w%s|n' updated to map to '|w%s|n'." % (old_nickstring, replstring)
                 else:
                     string += "\nNick '|w%s|n' mapped to '|w%s|n'." % (nickstring, replstring)
                 try:
@@ -200,7 +225,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
                 string += "\nNick '|w%s|n' maps to '|w%s|n'." % (old_nickstring, old_replstring)
                 errstring = ""
         string = errstring if errstring else string
-        caller.msg(string)
+        caller.msg(_cy(string))
 
 
 class CmdInventory(COMMAND_DEFAULT_CLASS):

From 69c5fc7106f7b42b8484c3fcbc68fafd4b34192c Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 9 Jan 2018 18:22:42 +0100
Subject: [PATCH 030/217] Correct nick parsing

---
 evennia/commands/default/general.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 97c9e49a8d..8a9b79f94d 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -124,8 +124,8 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
         """
         Support escaping of = with \=
         """
-        args = self.args
         super(CmdNick, self).parse()
+        args = (self.lhs or "") + " = %s" % self.rhs if self.rhs else ""
         parts = re.split(r"(?<!\\)=", args, 1)
         self.rhs = None
         if len(parts) < 2:

From b3ad00c385dbfce07621c739b8267de886286f62 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 9 Jan 2018 18:51:07 +0100
Subject: [PATCH 031/217] Fix error in nick deletion parsing

---
 evennia/commands/default/general.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 8a9b79f94d..a6d6c40e48 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -89,7 +89,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
       inputline - replace on the inputline (default)
       object    - replace on object-lookup
       account    - replace on account-lookup
-      delete    - remove nick by name or by index given by /list
+      delete    - remove nick by name or by index in /list
       clearall  - clear all nicks
       list      - show all defined aliases (also "nicks" works)
 
@@ -125,7 +125,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
         Support escaping of = with \=
         """
         super(CmdNick, self).parse()
-        args = (self.lhs or "") + " = %s" % self.rhs if self.rhs else ""
+        args = (self.lhs or "") + (" = %s" % self.rhs if self.rhs else "")
         parts = re.split(r"(?<!\\)=", args, 1)
         self.rhs = None
         if len(parts) < 2:
@@ -166,7 +166,10 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
             return
 
         if not self.args or not self.lhs:
-            caller.msg("Usage: nick[/switches] nickname = [realname]")
+            if "delete" in switches or "del" in switches:
+                caller.msg("usage nick/delete nickname or #1 (use nicks for list)")
+            else:
+                caller.msg("Usage: nick[/switches] nickname = [realname]")
             return
 
         nickstring = self.lhs

From 39d1426946801ca85ec89304a4b3ca4550ab8185 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 9 Jan 2018 19:39:49 +0100
Subject: [PATCH 032/217] Refactoring/cleanup of deletion/managing of nicks in
 nick Command

---
 evennia/commands/default/general.py | 83 ++++++++++++++++-------------
 evennia/commands/default/tests.py   |  6 +--
 2 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index a6d6c40e48..a9059dfb6b 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -89,9 +89,10 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
       inputline - replace on the inputline (default)
       object    - replace on object-lookup
       account    - replace on account-lookup
-      delete    - remove nick by name or by index in /list
-      clearall  - clear all nicks
+
       list      - show all defined aliases (also "nicks" works)
+      delete    - remove nick by index in /list
+      clearall  - clear all nicks
 
     Examples:
       nick hi = say Hello, I'm Sarah!
@@ -103,13 +104,13 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
 
     A 'nick' is a personal string replacement. Use $1, $2, ... to catch arguments.
     Put the last $-marker without an ending space to catch all remaining text. You
-    can also use unix-glob matching for the left-hand side:
+    can also use unix-glob matching for the left-hand side <string>:
 
         * - matches everything
         ? - matches 0 or 1 single characters
         [abcd] - matches these chars in any order
         [!abcd] - matches everything not among these chars
-        \= - use to have '=' in your matching string
+        \= - escape literal '=' you want in your <string>
 
     Note that no objects are actually renamed or changed by this command - your nicks
     are only available to you. If you want to permanently add keywords to an object
@@ -143,9 +144,12 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
 
         caller = self.caller
         switches = self.switches
-        nicktypes = [switch for switch in switches if switch in ("object", "account", "inputline")] or ["inputline"]
+        nicktypes = [switch for switch in switches if switch in (
+            "object", "account", "inputline")] or ["inputline"]
 
-        nicklist = utils.make_iter(caller.nicks.get(return_obj=True) or [])
+        nicklist = (utils.make_iter(caller.nicks.get(category="inputline", return_obj=True) or []) +
+                    utils.make_iter(caller.nicks.get(category="object", return_obj=True) or []) +
+                    utils.make_iter(caller.nicks.get(category="account", return_obj=True) or []))
 
         if 'list' in switches or self.cmdstring in ("nicks", "@nicks"):
 
@@ -165,17 +169,37 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
             caller.msg("Cleared all nicks.")
             return
 
+        if 'delete' in switches or 'del' in switches:
+            if not self.args or not self.lhs:
+                caller.msg("usage nick/delete #num ('nicks' for list)")
+                return
+            # see if a number was given
+            arg = self.args.lstrip("#")
+            if arg.isdigit():
+                # we are given a index in nicklist
+                delindex = int(arg)
+                if 0 < delindex <= len(nicklist):
+                    oldnick = nicklist[delindex - 1]
+                    _, _, old_nickstring, old_replstring = oldnick.value
+                else:
+                    caller.msg("Not a valid nick index. See 'nicks' for a list.")
+                    return
+                nicktype = oldnick.category
+                nicktypestr = "%s-nick" % nicktype.capitalize()
+
+                caller.nicks.remove(old_nickstring, category=nicktype)
+                caller.msg("%s removed: '|w%s|n' -> |w%s|n." % (
+                           nicktypestr, old_nickstring, old_replstring))
+                return
+
         if not self.args or not self.lhs:
-            if "delete" in switches or "del" in switches:
-                caller.msg("usage nick/delete nickname or #1 (use nicks for list)")
-            else:
-                caller.msg("Usage: nick[/switches] nickname = [realname]")
+            caller.msg("Usage: nick[/switches] nickname = [realname]")
             return
 
+        # setting new nicks
+
         nickstring = self.lhs
         replstring = self.rhs
-        old_nickstring = None
-        old_replstring = None
 
         if replstring == nickstring:
             caller.msg("No point in setting nick same as the string to replace...")
@@ -185,39 +209,24 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
         errstring = ""
         string = ""
         for nicktype in nicktypes:
+            nicktypestr = "%s-nick" % nicktype.capitalize()
+            old_nickstring = None
+            old_replstring = None
+
             oldnick = caller.nicks.get(key=nickstring, category=nicktype, return_obj=True)
             if oldnick:
                 _, _, old_nickstring, old_replstring = oldnick.value
-            else:
-                # no old nick, see if a number was given
-                arg = self.args.lstrip("#")
-                if arg.isdigit():
-                    # we are given a index in nicklist
-                    delindex = int(arg)
-                    if 0 < delindex <= len(nicklist):
-                        oldnick = nicklist[delindex - 1]
-                        _, _, old_nickstring, old_replstring = oldnick.value
-                    else:
-                        errstring += "Not a valid nick index."
-                else:
-                    errstring += "Nick not found."
-            if "delete" in switches or "del" in switches:
-                # clear the nick
-                if old_nickstring and caller.nicks.has(old_nickstring, category=nicktype):
-                    caller.nicks.remove(old_nickstring, category=nicktype)
-                    string += "\nNick removed: '|w%s|n' -> |w%s|n." % (old_nickstring, old_replstring)
-                else:
-                    errstring += "\nNick '|w%s|n' was not deleted." % (old_nickstring)
-            elif replstring:
+            if replstring:
                 # creating new nick
                 errstring = ""
                 if oldnick:
                     if replstring == old_replstring:
-                        string += "\nIdentical nick already set."
+                        string += "\nIdentical %s already set." % nicktypestr.lower()
                     else:
-                        string += "\nNick '|w%s|n' updated to map to '|w%s|n'." % (old_nickstring, replstring)
+                        string += "\n%s '|w%s|n' updated to map to '|w%s|n'." % (
+                                nicktypestr, old_nickstring, replstring)
                 else:
-                    string += "\nNick '|w%s|n' mapped to '|w%s|n'." % (nickstring, replstring)
+                    string += "\n%s '|w%s|n' mapped to '|w%s|n'." % (nicktypestr, nickstring, replstring)
                 try:
                     caller.nicks.add(nickstring, replstring, category=nicktype)
                 except NickTemplateInvalid:
@@ -225,7 +234,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
                     return
             elif old_nickstring and old_replstring:
                 # just looking at the nick
-                string += "\nNick '|w%s|n' maps to '|w%s|n'." % (old_nickstring, old_replstring)
+                string += "\n%s '|w%s|n' maps to '|w%s|n'." % (nicktypestr, old_nickstring, old_replstring)
                 errstring = ""
         string = errstring if errstring else string
         caller.msg(_cy(string))
diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index f437779662..3c7dc258d8 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -126,9 +126,9 @@ class TestGeneral(CommandTest):
         self.call(general.CmdPose(), "looks around", "Char looks around")
 
     def test_nick(self):
-        self.call(general.CmdNick(), "testalias = testaliasedstring1", "Nick 'testalias' mapped to 'testaliasedstring1'.")
-        self.call(general.CmdNick(), "/account testalias = testaliasedstring2", "Nick 'testalias' mapped to 'testaliasedstring2'.")
-        self.call(general.CmdNick(), "/object testalias = testaliasedstring3", "Nick 'testalias' mapped to 'testaliasedstring3'.")
+        self.call(general.CmdNick(), "testalias = testaliasedstring1", "Inputlinenick 'testalias' mapped to 'testaliasedstring1'.")
+        self.call(general.CmdNick(), "/account testalias = testaliasedstring2", "Accountnick 'testalias' mapped to 'testaliasedstring2'.")
+        self.call(general.CmdNick(), "/object testalias = testaliasedstring3", "Objectnick 'testalias' mapped to 'testaliasedstring3'.")
         self.assertEqual(u"testaliasedstring1", self.char1.nicks.get("testalias"))
         self.assertEqual(u"testaliasedstring2", self.char1.nicks.get("testalias", category="account"))
         self.assertEqual(u"testaliasedstring3", self.char1.nicks.get("testalias", category="object"))

From 986ca75fe957e21ab9c6e1d589e6d4b7c312f6c8 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 9 Jan 2018 20:38:06 +0100
Subject: [PATCH 033/217] Update nicks to properly handle account-nicks in e.g.
 pages

---
 evennia/accounts/accounts.py        |  7 +++++--
 evennia/commands/default/general.py | 18 ++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py
index 43dfe71795..626c4a60f3 100644
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@@ -457,7 +457,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
                                      callertype="account", session=session, **kwargs)
 
     def search(self, searchdata, return_puppet=False, search_object=False,
-               typeclass=None, nofound_string=None, multimatch_string=None, **kwargs):
+               typeclass=None, nofound_string=None, multimatch_string=None, use_nicks=True, **kwargs):
         """
         This is similar to `DefaultObject.search` but defaults to searching
         for Accounts only.
@@ -481,6 +481,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
             multimatch_string (str, optional): A one-time error
                 message to echo if `searchdata` leads to multiple matches.
                 If not given, will fall back to the default handler.
+            use_nicks (bool, optional): Use account-level nick replacement.
 
         Return:
             match (Account, Object or None): A single Account or Object match.
@@ -496,8 +497,10 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
             if searchdata.lower() in ("me", "*me", "self", "*self",):
                 return self
         if search_object:
-            matches = ObjectDB.objects.object_search(searchdata, typeclass=typeclass)
+            matches = ObjectDB.objects.object_search(searchdata, typeclass=typeclass, use_nicks=use_nicks)
         else:
+            searchdata = self.nicks.nickreplace(searchdata, categories=("account", ), include_account=False)
+
             matches = AccountDB.objects.account_search(searchdata, typeclass=typeclass)
         matches = _AT_SEARCH_RESULT(matches, self, query=searchdata,
                                     nofound_string=nofound_string,
diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index a9059dfb6b..ff377119fa 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -143,13 +143,14 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
             return re.sub(r"(\$[0-9]+|\*|\?|\[.+?\])", r"|Y\1|n", string)
 
         caller = self.caller
+        account = self.caller.account or caller
         switches = self.switches
         nicktypes = [switch for switch in switches if switch in (
             "object", "account", "inputline")] or ["inputline"]
 
         nicklist = (utils.make_iter(caller.nicks.get(category="inputline", return_obj=True) or []) +
                     utils.make_iter(caller.nicks.get(category="object", return_obj=True) or []) +
-                    utils.make_iter(caller.nicks.get(category="account", return_obj=True) or []))
+                    utils.make_iter(account.nicks.get(category="account", return_obj=True) or []))
 
         if 'list' in switches or self.cmdstring in ("nicks", "@nicks"):
 
@@ -166,6 +167,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
 
         if 'clearall' in switches:
             caller.nicks.clear()
+            caller.account.nicks.clear()
             caller.msg("Cleared all nicks.")
             return
 
@@ -187,7 +189,10 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
                 nicktype = oldnick.category
                 nicktypestr = "%s-nick" % nicktype.capitalize()
 
-                caller.nicks.remove(old_nickstring, category=nicktype)
+                if nicktype == "account":
+                    account.nicks.remove(old_nickstring, category=nicktype)
+                else:
+                    caller.nicks.remove(old_nickstring, category=nicktype)
                 caller.msg("%s removed: '|w%s|n' -> |w%s|n." % (
                            nicktypestr, old_nickstring, old_replstring))
                 return
@@ -209,11 +214,16 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
         errstring = ""
         string = ""
         for nicktype in nicktypes:
+            if nicktype == "account":
+                obj = account
+            else:
+                obj = caller
+
             nicktypestr = "%s-nick" % nicktype.capitalize()
             old_nickstring = None
             old_replstring = None
 
-            oldnick = caller.nicks.get(key=nickstring, category=nicktype, return_obj=True)
+            oldnick = obj.nicks.get(key=nickstring, category=nicktype, return_obj=True)
             if oldnick:
                 _, _, old_nickstring, old_replstring = oldnick.value
             if replstring:
@@ -228,7 +238,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
                 else:
                     string += "\n%s '|w%s|n' mapped to '|w%s|n'." % (nicktypestr, nickstring, replstring)
                 try:
-                    caller.nicks.add(nickstring, replstring, category=nicktype)
+                    obj.nicks.add(nickstring, replstring, category=nicktype)
                 except NickTemplateInvalid:
                     caller.msg("You must use the same $-markers both in the nick and in the replacement.")
                     return

From 9488f73bab2a5b5358e3f6015aca095c17e00569 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 9 Jan 2018 20:42:16 +0100
Subject: [PATCH 034/217] Update unittests

---
 evennia/commands/default/tests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 3c7dc258d8..61bcf46a8c 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -130,7 +130,8 @@ class TestGeneral(CommandTest):
         self.call(general.CmdNick(), "/account testalias = testaliasedstring2", "Accountnick 'testalias' mapped to 'testaliasedstring2'.")
         self.call(general.CmdNick(), "/object testalias = testaliasedstring3", "Objectnick 'testalias' mapped to 'testaliasedstring3'.")
         self.assertEqual(u"testaliasedstring1", self.char1.nicks.get("testalias"))
-        self.assertEqual(u"testaliasedstring2", self.char1.nicks.get("testalias", category="account"))
+        self.assertEqual(None, self.char1.nicks.get("testalias", category="account"))
+        self.assertEqual(u"testaliasedstring2", self.char1.account.nicks.get("testalias", category="account"))
         self.assertEqual(u"testaliasedstring3", self.char1.nicks.get("testalias", category="object"))
 
     def test_get_and_drop(self):

From 00b4ab3c108381fa2d6a712f009e9b645f03e18e Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 10 Jan 2018 08:06:14 +0100
Subject: [PATCH 035/217] Retry if sending data before AMP started. Resolves
 #1506.

---
 evennia/server/portal/portalsessionhandler.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/evennia/server/portal/portalsessionhandler.py b/evennia/server/portal/portalsessionhandler.py
index 171216f8d8..d93e54465f 100644
--- a/evennia/server/portal/portalsessionhandler.py
+++ b/evennia/server/portal/portalsessionhandler.py
@@ -378,6 +378,12 @@ class PortalSessionHandler(SessionHandler):
             if self.command_overflow:
                 self.data_out(session, text=[[_ERROR_COMMAND_OVERFLOW], {}])
                 return
+            if not self.portal.amp_protocol:
+                # this can happen if someone connects before AMP connection
+                # was established (usually on first start)
+                reactor.callLater(1.0, self.data_in, session, **kwargs)
+                return
+
             # scrub data
             kwargs = self.clean_senddata(session, kwargs)
 

From b73a70560c44dc881d1d508f1bfdaa31d210b07a Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 10 Jan 2018 22:47:53 +0100
Subject: [PATCH 036/217] Allow AMP to handle multiple connections gracefully
 (more stable).

---
 evennia/server/amp.py            | 53 ++++++++++++++++++++++++++------
 evennia/server/portal/portal.py  |  3 --
 evennia/server/sessionhandler.py | 10 +++++-
 3 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/evennia/server/amp.py b/evennia/server/amp.py
index 9694abd034..a62adb51d4 100644
--- a/evennia/server/amp.py
+++ b/evennia/server/amp.py
@@ -29,7 +29,7 @@ except ImportError:
     import pickle
 from twisted.protocols import amp
 from twisted.internet import protocol
-from twisted.internet.defer import Deferred
+from twisted.internet.defer import Deferred, DeferredList
 from evennia.utils import logger
 from evennia.utils.utils import to_str, variable_from_module
 import zlib  # Used in Compressed class
@@ -45,11 +45,13 @@ PSYNC = chr(3)         # portal session sync
 SLOGIN = chr(4)        # server session login
 SDISCONN = chr(5)      # server session disconnect
 SDISCONNALL = chr(6)   # server session disconnect all
-SSHUTD = chr(7)        # server shutdown
+SSHUTD = chr(7)        # server shutdown (shutdown portal too)
 SSYNC = chr(8)         # server session sync
 SCONN = chr(11)        # server creating new connection (for irc bots and etc)
 PCONNSYNC = chr(12)    # portal post-syncing a session
 PDISCONNALL = chr(13)  # portal session disconnect all
+SRELOAD = chr(14)      # server reloading (have portal start a new server)
+
 AMP_MAXLEN = amp.MAX_VALUE_LENGTH    # max allowed data length in AMP protocol (cannot be changed)
 
 BATCH_RATE = 250     # max commands/sec before switching to batch-sending
@@ -97,6 +99,7 @@ class AmpServerFactory(protocol.ServerFactory):
         """
         self.server = server
         self.protocol = AMPProtocol
+        self.connections = []
 
     def buildProtocol(self, addr):
         """
@@ -114,6 +117,9 @@ class AmpServerFactory(protocol.ServerFactory):
         return self.server.amp_protocol
 
 
+_AMP_TRANSPORTS = []
+
+
 class AmpClientFactory(protocol.ReconnectingClientFactory):
     """
     This factory creates an instance of the Portal, an AMPProtocol
@@ -327,6 +333,9 @@ def loads(data):
     return pickle.loads(to_str(data))
 
 
+def cmdline_input(data):
+    print("cmdline_input received:\n %s" % data)
+
 # -------------------------------------------------------------
 # Core AMP protocol for communication Server <-> Portal
 # -------------------------------------------------------------
@@ -356,6 +365,22 @@ class AMPProtocol(amp.AMP):
         self.send_mode = True
         self.send_task = None
 
+    def dataReceived(self, data):
+        if data[0] != b'\0':
+            cmdline_input(data)
+        else:
+            super(AMPProtocol, self).dataReceived(data)
+
+    def makeConnection(self, transport):
+        """
+        Copied from parent AMP protocol
+        """
+        global _AMP_TRANSPORTS
+        # this makes for a factor x10 faster sends across the wire
+        transport.setTcpNoDelay(True)
+        super(AMPProtocol, self).makeConnection(transport)
+        _AMP_TRANSPORTS.append(transport)
+
     def connectionMade(self):
         """
         This is called when an AMP connection is (re-)established
@@ -363,9 +388,6 @@ class AMPProtocol(amp.AMP):
         need to make sure to only trigger resync from the portal side.
 
         """
-        # this makes for a factor x10 faster sends across the wire
-        self.transport.setTcpNoDelay(True)
-
         if hasattr(self.factory, "portal"):
             # only the portal has the 'portal' property, so we know we are
             # on the portal side and can initialize the connection.
@@ -387,7 +409,8 @@ class AMPProtocol(amp.AMP):
         portal will continuously try to reconnect, showing the problem
         that way.
         """
-        pass
+        global _AMP_TRANSPORTS
+        _AMP_TRANSPORTS = [transport for transport in _AMP_TRANSPORTS if transport.connected == 1]
 
     # Error handling
 
@@ -421,9 +444,18 @@ class AMPProtocol(amp.AMP):
             (sessid, kwargs).
 
         """
-        return self.callRemote(command,
-                               packed_data=dumps((sessid, kwargs))
-                               ).addErrback(self.errback, command.key)
+        if hasattr(self.factory, "portal") or len(_AMP_TRANSPORTS) == 1:
+            return self.callRemote(command,
+                                   packed_data=dumps((sessid, kwargs))
+                                   ).addErrback(self.errback, command.key)
+
+        else:
+            deferreds = []
+            for transport in _AMP_TRANSPORTS:
+                self.transport = transport
+                deferreds.append(self.callRemote(command,
+                                           packed_data=dumps((sessid, kwargs))))
+            return DeferredList(deferreds, fireOnOneErrback=1).addErrback(self.errback, command.key)
 
     # Message definition + helper methods to call/create each message type
 
@@ -584,6 +616,9 @@ class AMPProtocol(amp.AMP):
             # the server orders the portal to shut down
             self.factory.portal.shutdown(restart=False)
 
+        elif operation == SRELOAD:  # server reload
+            self.factory.portal.server_reload(**kwargs)
+
         elif operation == SSYNC:  # server_session_sync
             # server wants to save session data to the portal,
             # maybe because it's about to shut down.
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index 79002c2a0e..400fd91b7b 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -10,14 +10,11 @@ by game/evennia.py).
 from __future__ import print_function
 from builtins import object
 
-import time
 import sys
 import os
 
 from twisted.application import internet, service
 from twisted.internet import protocol, reactor
-from twisted.internet.task import LoopingCall
-from twisted.web import server
 import django
 django.setup()
 from django.conf import settings
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index 423bc87f1c..9862f03421 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -58,6 +58,8 @@ SSYNC = chr(8)        # server session sync
 SCONN = chr(11)        # server portal connection (for bots)
 PCONNSYNC = chr(12)   # portal post-syncing session
 PDISCONNALL = chr(13)  # portal session discnnect all
+SRELOAD = chr(14)      # server reloading (have portal start a new server)
+
 
 # i18n
 from django.utils.translation import ugettext as _
@@ -432,9 +434,15 @@ class ServerSessionHandler(SessionHandler):
         self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION, operation=SCONN,
                                                          protocol_path=protocol_path, config=configdict)
 
+    def portal_restart_server(self):
+        """
+        Called by server when reloading. We tell the portal to start a new server instance.
+
+        """
+
     def portal_shutdown(self):
         """
-        Called by server when shutting down the portal.
+        Called by server when shutting down the portal (usually because server is going down too).
 
         """
         self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION,

From 973f1a9314161307a4d26e2add8325bc4a939c9a Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 11 Jan 2018 21:37:40 +0100
Subject: [PATCH 037/217] Make AMP protocol multi-sending and able to handle
 HTTP input

---
 evennia/server/amp.py | 59 ++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/evennia/server/amp.py b/evennia/server/amp.py
index a62adb51d4..cb2fec8c65 100644
--- a/evennia/server/amp.py
+++ b/evennia/server/amp.py
@@ -62,6 +62,17 @@ _SENDBATCH = defaultdict(list)
 _MSGBUFFER = defaultdict(list)
 
 
+_HTTP_WARNING = """
+HTTP/1.1 200 OK
+Content-Type: text/html
+
+<html><body>
+This is Evennia's interal AMP port. It handles communication
+between Evennia's different processes.<h3><p>This port should NOT be
+publicly visible.</p></h3>
+</body></html>""".strip()
+
+
 def get_restart_mode(restart_file):
     """
     Parse the server/portal restart status
@@ -99,7 +110,7 @@ class AmpServerFactory(protocol.ServerFactory):
         """
         self.server = server
         self.protocol = AMPProtocol
-        self.connections = []
+        self.broadcasts = []
 
     def buildProtocol(self, addr):
         """
@@ -142,6 +153,9 @@ class AmpClientFactory(protocol.ReconnectingClientFactory):
         """
         self.portal = portal
         self.protocol = AMPProtocol
+        # not really used unless connecting to multiple servers, but
+        # avoids having to check for its existence on the protocol
+        self.broadcasts = []
 
     def startedConnecting(self, connector):
         """
@@ -336,6 +350,7 @@ def loads(data):
 def cmdline_input(data):
     print("cmdline_input received:\n %s" % data)
 
+
 # -------------------------------------------------------------
 # Core AMP protocol for communication Server <-> Portal
 # -------------------------------------------------------------
@@ -350,6 +365,11 @@ class AMPProtocol(amp.AMP):
     amp.Command subclasses that specify the datatypes of the
     input/output of these methods.
 
+    This version of the protocol is a broadcast-version: it can
+    accept multiple connections and will broadcast to all of them.
+    IT will also correctly intercept non-AMP messages to avoid them
+    interrupting the connection.
+
     """
 
     # helper methods
@@ -366,21 +386,15 @@ class AMPProtocol(amp.AMP):
         self.send_task = None
 
     def dataReceived(self, data):
+        """
+        Handle non-AMP messages, such as HTTP communication.
+        """
         if data[0] != b'\0':
-            cmdline_input(data)
+            self.transport.write(_HTTP_WARNING)
+            self.transport.loseConnection()
         else:
             super(AMPProtocol, self).dataReceived(data)
 
-    def makeConnection(self, transport):
-        """
-        Copied from parent AMP protocol
-        """
-        global _AMP_TRANSPORTS
-        # this makes for a factor x10 faster sends across the wire
-        transport.setTcpNoDelay(True)
-        super(AMPProtocol, self).makeConnection(transport)
-        _AMP_TRANSPORTS.append(transport)
-
     def connectionMade(self):
         """
         This is called when an AMP connection is (re-)established
@@ -388,6 +402,7 @@ class AMPProtocol(amp.AMP):
         need to make sure to only trigger resync from the portal side.
 
         """
+        self.factory.broadcasts.append(self)
         if hasattr(self.factory, "portal"):
             # only the portal has the 'portal' property, so we know we are
             # on the portal side and can initialize the connection.
@@ -409,8 +424,7 @@ class AMPProtocol(amp.AMP):
         portal will continuously try to reconnect, showing the problem
         that way.
         """
-        global _AMP_TRANSPORTS
-        _AMP_TRANSPORTS = [transport for transport in _AMP_TRANSPORTS if transport.connected == 1]
+        self.factory.broadcasts.remove(self)
 
     # Error handling
 
@@ -444,18 +458,11 @@ class AMPProtocol(amp.AMP):
             (sessid, kwargs).
 
         """
-        if hasattr(self.factory, "portal") or len(_AMP_TRANSPORTS) == 1:
-            return self.callRemote(command,
-                                   packed_data=dumps((sessid, kwargs))
-                                   ).addErrback(self.errback, command.key)
-
-        else:
-            deferreds = []
-            for transport in _AMP_TRANSPORTS:
-                self.transport = transport
-                deferreds.append(self.callRemote(command,
-                                           packed_data=dumps((sessid, kwargs))))
-            return DeferredList(deferreds, fireOnOneErrback=1).addErrback(self.errback, command.key)
+        deferreds = []
+        for prot in self.factory.broadcasts:
+            deferreds.append(prot.callRemote(command,
+                                             packed_data=dumps((sessid, kwargs))))
+        return DeferredList(deferreds, fireOnOneErrback=1).addErrback(self.errback, command.key)
 
     # Message definition + helper methods to call/create each message type
 

From 571c173a7f51c22eda55bcde3e981529952de305 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 11 Jan 2018 22:09:01 +0100
Subject: [PATCH 038/217] Swap so Server is the AMP-client and Portal the
 AMP-server

---
 evennia/server/amp.py           | 49 +++++++++++++--------------------
 evennia/server/portal/portal.py |  8 +++---
 evennia/server/server.py        |  6 ++--
 3 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/evennia/server/amp.py b/evennia/server/amp.py
index cb2fec8c65..2774958a5a 100644
--- a/evennia/server/amp.py
+++ b/evennia/server/amp.py
@@ -93,22 +93,22 @@ def get_restart_mode(restart_file):
 
 class AmpServerFactory(protocol.ServerFactory):
     """
-    This factory creates the Server as a new AMPProtocol instance for accepting
-    connections from the Portal.
+    This factory creates AMP Server instance. This
+    is meant to sit on the Evennia Portal service.
     """
     noisy = False
 
-    def __init__(self, server):
+    def __init__(self, portal):
         """
         Initialize the factory.
 
         Args:
-            server (Server): The Evennia server service instance.
+            portal (Portal): The Evennia Portal service instance.
             protocol (Protocol): The protocol the factory creates
                 instances of.
 
         """
-        self.server = server
+        self.portal = portal
         self.protocol = AMPProtocol
         self.broadcasts = []
 
@@ -123,9 +123,9 @@ class AmpServerFactory(protocol.ServerFactory):
             protocol (Protocol): The created protocol.
 
         """
-        self.server.amp_protocol = AMPProtocol()
-        self.server.amp_protocol.factory = self
-        return self.server.amp_protocol
+        self.portal.amp_protocol = AMPProtocol()
+        self.portal.amp_protocol.factory = self
+        return self.portal.amp_protocol
 
 
 _AMP_TRANSPORTS = []
@@ -133,8 +133,8 @@ _AMP_TRANSPORTS = []
 
 class AmpClientFactory(protocol.ReconnectingClientFactory):
     """
-    This factory creates an instance of the Portal, an AMPProtocol
-    instances to use to connect
+    This factory creates an instance of an AMP client. This
+    is intended to be the Evennia 'Server' service.
 
     """
     # Initial reconnect delay in seconds.
@@ -143,16 +143,17 @@ class AmpClientFactory(protocol.ReconnectingClientFactory):
     maxDelay = 1
     noisy = False
 
-    def __init__(self, portal):
+    def __init__(self, server):
         """
         Initializes the client factory.
 
         Args:
-            portal (Portal): Portal instance.
+            server (server): server instance.
 
         """
-        self.portal = portal
+        self.server = server
         self.protocol = AMPProtocol
+        self.maxDelay = 10
         # not really used unless connecting to multiple servers, but
         # avoids having to check for its existence on the protocol
         self.broadcasts = []
@@ -177,9 +178,9 @@ class AmpClientFactory(protocol.ReconnectingClientFactory):
 
         """
         self.resetDelay()
-        self.portal.amp_protocol = AMPProtocol()
-        self.portal.amp_protocol.factory = self
-        return self.portal.amp_protocol
+        self.server.amp_protocol = AMPProtocol()
+        self.server.amp_protocol.factory = self
+        return self.server.amp_protocol
 
     def clientConnectionLost(self, connector, reason):
         """
@@ -191,13 +192,7 @@ class AmpClientFactory(protocol.ReconnectingClientFactory):
             reason (str): Eventual text describing why connection was lost.
 
         """
-        if hasattr(self, "server_restart_mode"):
-            self.portal.sessions.announce_all(" Server restarting ...")
-            self.maxDelay = 2
-        else:
-            # Don't translate this; avoid loading django on portal side.
-            self.maxDelay = 10
-            self.portal.sessions.announce_all(" ... Portal lost connection to Server.")
+        logger.log_info("Server lost connection to the Portal. Reconnecting ...")
         protocol.ReconnectingClientFactory.clientConnectionLost(self, connector, reason)
 
     def clientConnectionFailed(self, connector, reason):
@@ -210,11 +205,7 @@ class AmpClientFactory(protocol.ReconnectingClientFactory):
             reason (str): Eventual text describing why connection failed.
 
         """
-        if hasattr(self, "server_restart_mode"):
-            self.maxDelay = 2
-        else:
-            self.maxDelay = 10
-        self.portal.sessions.announce_all(" ...")
+        logger.log_info("Attempting to reconnect to Portal ...")
         protocol.ReconnectingClientFactory.clientConnectionFailed(self, connector, reason)
 
 
@@ -411,8 +402,6 @@ class AMPProtocol(amp.AMP):
                                          PSYNC,
                                          sessiondata=sessdata)
             self.factory.portal.sessions.at_server_connection()
-            if hasattr(self.factory, "server_restart_mode"):
-                del self.factory.server_restart_mode
 
     def connectionLost(self, reason):
         """
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index 400fd91b7b..eda7aeada4 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -191,10 +191,10 @@ if AMP_ENABLED:
 
     print('  amp (to Server): %s (internal)' % AMP_PORT)
 
-    factory = amp.AmpClientFactory(PORTAL)
-    amp_client = internet.TCPClient(AMP_HOST, AMP_PORT, factory)
-    amp_client.setName('evennia_amp')
-    PORTAL.services.addService(amp_client)
+    factory = amp.AmpServerFactory(PORTAL)
+    amp_service = internet.TCPServer(AMP_PORT, factory, interface=AMP_INTERFACE)
+    amp_service.setName("PortalAMPService")
+    PORTAL.services.addService(amp_service)
 
 
 # We group all the various services under the same twisted app.
diff --git a/evennia/server/server.py b/evennia/server/server.py
index fb9f753b5c..643b3161f7 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -550,9 +550,9 @@ if AMP_ENABLED:
 
     from evennia.server import amp
 
-    factory = amp.AmpServerFactory(EVENNIA)
-    amp_service = internet.TCPServer(AMP_PORT, factory, interface=AMP_INTERFACE)
-    amp_service.setName("EvenniaPortal")
+    factory = amp.AmpClientFactory(EVENNIA)
+    amp_service = internet.TCPClient(AMP_HOST, AMP_PORT, factory)
+    amp_service.setName('ServerAMPClient')
     EVENNIA.services.addService(amp_service)
 
 if WEBSERVER_ENABLED:

From 7001090b78dc5a26cf8da85e173891c2f91a2a84 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 11 Jan 2018 23:43:58 +0100
Subject: [PATCH 039/217] Refactor amp into three modules, separating
 clients/server better

---
 evennia/server/amp.py               | 701 ----------------------------
 evennia/server/amp_client.py        | 185 ++++++++
 evennia/server/portal/amp.py        | 353 ++++++++++++++
 evennia/server/portal/amp_server.py | 168 +++++++
 evennia/server/portal/portal.py     |   6 +-
 evennia/server/server.py            |   4 +-
 6 files changed, 711 insertions(+), 706 deletions(-)
 delete mode 100644 evennia/server/amp.py
 create mode 100644 evennia/server/amp_client.py
 create mode 100644 evennia/server/portal/amp.py
 create mode 100644 evennia/server/portal/amp_server.py

diff --git a/evennia/server/amp.py b/evennia/server/amp.py
deleted file mode 100644
index 2774958a5a..0000000000
--- a/evennia/server/amp.py
+++ /dev/null
@@ -1,701 +0,0 @@
-"""
-Contains the protocols, commands, and client factory needed for the Server
-and Portal to communicate with each other, letting Portal work as a proxy.
-Both sides use this same protocol.
-
-The separation works like this:
-
-Portal - (AMP client) handles protocols. It contains a list of connected
-         sessions in a dictionary for identifying the respective account
-         connected. If it loses the AMP connection it will automatically
-         try to reconnect.
-
-Server - (AMP server) Handles all mud operations. The server holds its own list
-         of sessions tied to account objects. This is synced against the portal
-         at startup and when a session connects/disconnects
-
-"""
-from __future__ import print_function
-
-# imports needed on both server and portal side
-import os
-import time
-from collections import defaultdict, namedtuple
-from itertools import count
-from cStringIO import StringIO
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
-from twisted.protocols import amp
-from twisted.internet import protocol
-from twisted.internet.defer import Deferred, DeferredList
-from evennia.utils import logger
-from evennia.utils.utils import to_str, variable_from_module
-import zlib  # Used in Compressed class
-
-DUMMYSESSION = namedtuple('DummySession', ['sessid'])(0)
-
-# communication bits
-# (chr(9) and chr(10) are \t and \n, so skipping them)
-
-PCONN = chr(1)         # portal session connect
-PDISCONN = chr(2)      # portal session disconnect
-PSYNC = chr(3)         # portal session sync
-SLOGIN = chr(4)        # server session login
-SDISCONN = chr(5)      # server session disconnect
-SDISCONNALL = chr(6)   # server session disconnect all
-SSHUTD = chr(7)        # server shutdown (shutdown portal too)
-SSYNC = chr(8)         # server session sync
-SCONN = chr(11)        # server creating new connection (for irc bots and etc)
-PCONNSYNC = chr(12)    # portal post-syncing a session
-PDISCONNALL = chr(13)  # portal session disconnect all
-SRELOAD = chr(14)      # server reloading (have portal start a new server)
-
-AMP_MAXLEN = amp.MAX_VALUE_LENGTH    # max allowed data length in AMP protocol (cannot be changed)
-
-BATCH_RATE = 250     # max commands/sec before switching to batch-sending
-BATCH_TIMEOUT = 0.5  # how often to poll to empty batch queue, in seconds
-
-# buffers
-_SENDBATCH = defaultdict(list)
-_MSGBUFFER = defaultdict(list)
-
-
-_HTTP_WARNING = """
-HTTP/1.1 200 OK
-Content-Type: text/html
-
-<html><body>
-This is Evennia's interal AMP port. It handles communication
-between Evennia's different processes.<h3><p>This port should NOT be
-publicly visible.</p></h3>
-</body></html>""".strip()
-
-
-def get_restart_mode(restart_file):
-    """
-    Parse the server/portal restart status
-
-    Args:
-        restart_file (str): Path to restart.dat file.
-
-    Returns:
-        restart_mode (bool): If the file indicates the server is in
-            restart mode or not.
-
-    """
-    if os.path.exists(restart_file):
-        flag = open(restart_file, 'r').read()
-        return flag == "True"
-    return False
-
-
-class AmpServerFactory(protocol.ServerFactory):
-    """
-    This factory creates AMP Server instance. This
-    is meant to sit on the Evennia Portal service.
-    """
-    noisy = False
-
-    def __init__(self, portal):
-        """
-        Initialize the factory.
-
-        Args:
-            portal (Portal): The Evennia Portal service instance.
-            protocol (Protocol): The protocol the factory creates
-                instances of.
-
-        """
-        self.portal = portal
-        self.protocol = AMPProtocol
-        self.broadcasts = []
-
-    def buildProtocol(self, addr):
-        """
-        Start a new connection, and store it on the service object.
-
-        Args:
-            addr (str): Connection address. Not used.
-
-        Returns:
-            protocol (Protocol): The created protocol.
-
-        """
-        self.portal.amp_protocol = AMPProtocol()
-        self.portal.amp_protocol.factory = self
-        return self.portal.amp_protocol
-
-
-_AMP_TRANSPORTS = []
-
-
-class AmpClientFactory(protocol.ReconnectingClientFactory):
-    """
-    This factory creates an instance of an AMP client. This
-    is intended to be the Evennia 'Server' service.
-
-    """
-    # Initial reconnect delay in seconds.
-    initialDelay = 1
-    factor = 1.5
-    maxDelay = 1
-    noisy = False
-
-    def __init__(self, server):
-        """
-        Initializes the client factory.
-
-        Args:
-            server (server): server instance.
-
-        """
-        self.server = server
-        self.protocol = AMPProtocol
-        self.maxDelay = 10
-        # not really used unless connecting to multiple servers, but
-        # avoids having to check for its existence on the protocol
-        self.broadcasts = []
-
-    def startedConnecting(self, connector):
-        """
-        Called when starting to try to connect to the MUD server.
-
-        Args:
-            connector (Connector): Twisted Connector instance representing
-                this connection.
-
-        """
-        pass
-
-    def buildProtocol(self, addr):
-        """
-        Creates an AMPProtocol instance when connecting to the server.
-
-        Args:
-            addr (str): Connection address. Not used.
-
-        """
-        self.resetDelay()
-        self.server.amp_protocol = AMPProtocol()
-        self.server.amp_protocol.factory = self
-        return self.server.amp_protocol
-
-    def clientConnectionLost(self, connector, reason):
-        """
-        Called when the AMP connection to the MUD server is lost.
-
-        Args:
-            connector (Connector): Twisted Connector instance representing
-                this connection.
-            reason (str): Eventual text describing why connection was lost.
-
-        """
-        logger.log_info("Server lost connection to the Portal. Reconnecting ...")
-        protocol.ReconnectingClientFactory.clientConnectionLost(self, connector, reason)
-
-    def clientConnectionFailed(self, connector, reason):
-        """
-        Called when an AMP connection attempt to the MUD server fails.
-
-        Args:
-            connector (Connector): Twisted Connector instance representing
-                this connection.
-            reason (str): Eventual text describing why connection failed.
-
-        """
-        logger.log_info("Attempting to reconnect to Portal ...")
-        protocol.ReconnectingClientFactory.clientConnectionFailed(self, connector, reason)
-
-
-# AMP Communication Command types
-
-class Compressed(amp.String):
-    """
-    This is a customn AMP command Argument that both handles too-long
-    sends as well as uses zlib for compression across the wire. The
-    batch-grouping of too-long sends is borrowed from the "mediumbox"
-    recipy at twisted-hacks's ~glyph/+junk/amphacks/mediumbox.
-
-    """
-
-    def fromBox(self, name, strings, objects, proto):
-        """
-        Converts from box representation to python. We
-        group very long data into batches.
-        """
-        value = StringIO()
-        value.write(strings.get(name))
-        for counter in count(2):
-            # count from 2 upwards
-            chunk = strings.get("%s.%d" % (name, counter))
-            if chunk is None:
-                break
-            value.write(chunk)
-        objects[name] = value.getvalue()
-
-    def toBox(self, name, strings, objects, proto):
-        """
-        Convert from data to box. We handled too-long
-        batched data and put it together here.
-        """
-        value = StringIO(objects[name])
-        strings[name] = value.read(AMP_MAXLEN)
-        for counter in count(2):
-            chunk = value.read(AMP_MAXLEN)
-            if not chunk:
-                break
-            strings["%s.%d" % (name, counter)] = chunk
-
-    def toString(self, inObject):
-        """
-        Convert to send on the wire, with compression.
-        """
-        return zlib.compress(inObject, 9)
-
-    def fromString(self, inString):
-        """
-        Convert (decompress) from the wire to Python.
-        """
-        return zlib.decompress(inString)
-
-
-class MsgPortal2Server(amp.Command):
-    """
-    Message Portal -> Server
-
-    """
-    key = "MsgPortal2Server"
-    arguments = [('packed_data', Compressed())]
-    errors = {Exception: 'EXCEPTION'}
-    response = []
-
-
-class MsgServer2Portal(amp.Command):
-    """
-    Message Server -> Portal
-
-    """
-    key = "MsgServer2Portal"
-    arguments = [('packed_data', Compressed())]
-    errors = {Exception: 'EXCEPTION'}
-    response = []
-
-
-class AdminPortal2Server(amp.Command):
-    """
-    Administration Portal -> Server
-
-    Sent when the portal needs to perform admin operations on the
-    server, such as when a new session connects or resyncs
-
-    """
-    key = "AdminPortal2Server"
-    arguments = [('packed_data', Compressed())]
-    errors = {Exception: 'EXCEPTION'}
-    response = []
-
-
-class AdminServer2Portal(amp.Command):
-    """
-    Administration Server -> Portal
-
-    Sent when the server needs to perform admin operations on the
-    portal.
-
-    """
-    key = "AdminServer2Portal"
-    arguments = [('packed_data', Compressed())]
-    errors = {Exception: 'EXCEPTION'}
-    response = []
-
-
-class FunctionCall(amp.Command):
-    """
-    Bidirectional Server <-> Portal
-
-    Sent when either process needs to call an arbitrary function in
-    the other. This does not use the batch-send functionality.
-
-    """
-    key = "FunctionCall"
-    arguments = [('module', amp.String()),
-                 ('function', amp.String()),
-                 ('args', amp.String()),
-                 ('kwargs', amp.String())]
-    errors = {Exception: 'EXCEPTION'}
-    response = [('result', amp.String())]
-
-
-# Helper functions for pickling.
-
-def dumps(data):
-    return to_str(pickle.dumps(to_str(data), pickle.HIGHEST_PROTOCOL))
-
-
-def loads(data):
-    return pickle.loads(to_str(data))
-
-
-def cmdline_input(data):
-    print("cmdline_input received:\n %s" % data)
-
-
-# -------------------------------------------------------------
-# Core AMP protocol for communication Server <-> Portal
-# -------------------------------------------------------------
-
-class AMPProtocol(amp.AMP):
-    """
-    This is the protocol that the MUD server and the proxy server
-    communicate to each other with. AMP is a bi-directional protocol,
-    so both the proxy and the MUD use the same commands and protocol.
-
-    AMP specifies responder methods here and connect them to
-    amp.Command subclasses that specify the datatypes of the
-    input/output of these methods.
-
-    This version of the protocol is a broadcast-version: it can
-    accept multiple connections and will broadcast to all of them.
-    IT will also correctly intercept non-AMP messages to avoid them
-    interrupting the connection.
-
-    """
-
-    # helper methods
-
-    def __init__(self, *args, **kwargs):
-        """
-        Initialize protocol with some things that need to be in place
-        already before connecting both on portal and server.
-
-        """
-        self.send_batch_counter = 0
-        self.send_reset_time = time.time()
-        self.send_mode = True
-        self.send_task = None
-
-    def dataReceived(self, data):
-        """
-        Handle non-AMP messages, such as HTTP communication.
-        """
-        if data[0] != b'\0':
-            self.transport.write(_HTTP_WARNING)
-            self.transport.loseConnection()
-        else:
-            super(AMPProtocol, self).dataReceived(data)
-
-    def connectionMade(self):
-        """
-        This is called when an AMP connection is (re-)established
-        between server and portal. AMP calls it on both sides, so we
-        need to make sure to only trigger resync from the portal side.
-
-        """
-        self.factory.broadcasts.append(self)
-        if hasattr(self.factory, "portal"):
-            # only the portal has the 'portal' property, so we know we are
-            # on the portal side and can initialize the connection.
-            sessdata = self.factory.portal.sessions.get_all_sync_data()
-            self.send_AdminPortal2Server(DUMMYSESSION,
-                                         PSYNC,
-                                         sessiondata=sessdata)
-            self.factory.portal.sessions.at_server_connection()
-
-    def connectionLost(self, reason):
-        """
-        We swallow connection errors here. The reason is that during a
-        normal reload/shutdown there will almost always be cases where
-        either the portal or server shuts down before a message has
-        returned its (empty) return, triggering a connectionLost error
-        that is irrelevant. If a true connection error happens, the
-        portal will continuously try to reconnect, showing the problem
-        that way.
-        """
-        self.factory.broadcasts.remove(self)
-
-    # Error handling
-
-    def errback(self, e, info):
-        """
-        Error callback.
-        Handles errors to avoid dropping connections on server tracebacks.
-
-        Args:
-            e (Failure): Deferred error instance.
-            info (str): Error string.
-
-        """
-        e.trap(Exception)
-        logger.log_err("AMP Error for %(info)s: %(e)s" % {'info': info,
-                                                          'e': e.getErrorMessage()})
-
-    def send_data(self, command, sessid, **kwargs):
-        """
-        Send data across the wire.
-
-        Args:
-            command (AMP Command): A protocol send command.
-            sessid (int): A unique Session id.
-
-        Returns:
-            deferred (deferred or None): A deferred with an errback.
-
-        Notes:
-            Data will be sent across the wire pickled as a tuple
-            (sessid, kwargs).
-
-        """
-        deferreds = []
-        for prot in self.factory.broadcasts:
-            deferreds.append(prot.callRemote(command,
-                                             packed_data=dumps((sessid, kwargs))))
-        return DeferredList(deferreds, fireOnOneErrback=1).addErrback(self.errback, command.key)
-
-    # Message definition + helper methods to call/create each message type
-
-    # Portal -> Server Msg
-
-    @MsgPortal2Server.responder
-    def server_receive_msgportal2server(self, packed_data):
-        """
-        Receives message arriving to server. This method is executed
-        on the Server.
-
-        Args:
-            packed_data (str): Data to receive (a pickled tuple (sessid,kwargs))
-
-        """
-        sessid, kwargs = loads(packed_data)
-        session = self.factory.server.sessions.get(sessid, None)
-        if session:
-            self.factory.server.sessions.data_in(session, **kwargs)
-        return {}
-
-    def send_MsgPortal2Server(self, session, **kwargs):
-        """
-        Access method called by the Portal and executed on the Portal.
-
-        Args:
-            session (session): Session
-            kwargs (any, optional): Optional data.
-
-        Returns:
-            deferred (Deferred): Asynchronous return.
-
-        """
-        return self.send_data(MsgPortal2Server, session.sessid, **kwargs)
-
-    # Server -> Portal message
-
-    @MsgServer2Portal.responder
-    def portal_receive_server2portal(self, packed_data):
-        """
-        Receives message arriving to Portal from Server.
-        This method is executed on the Portal.
-
-        Args:
-            packed_data (str): Pickled data (sessid, kwargs) coming over the wire.
-        """
-        sessid, kwargs = loads(packed_data)
-        session = self.factory.portal.sessions.get(sessid, None)
-        if session:
-            self.factory.portal.sessions.data_out(session, **kwargs)
-        return {}
-
-    def send_MsgServer2Portal(self, session, **kwargs):
-        """
-        Access method - executed on the Server for sending data
-            to Portal.
-
-        Args:
-            session (Session): Unique Session.
-            kwargs (any, optiona): Extra data.
-
-        """
-        return self.send_data(MsgServer2Portal, session.sessid, **kwargs)
-
-    # Server administration from the Portal side
-    @AdminPortal2Server.responder
-    def server_receive_adminportal2server(self, packed_data):
-        """
-        Receives admin data from the Portal (allows the portal to
-        perform admin operations on the server). This is executed on
-        the Server.
-
-        Args:
-            packed_data (str): Incoming, pickled data.
-
-        """
-        sessid, kwargs = loads(packed_data)
-        operation = kwargs.pop("operation", "")
-        server_sessionhandler = self.factory.server.sessions
-
-        if operation == PCONN:  # portal_session_connect
-            # create a new session and sync it
-            server_sessionhandler.portal_connect(kwargs.get("sessiondata"))
-
-        elif operation == PCONNSYNC:  # portal_session_sync
-            server_sessionhandler.portal_session_sync(kwargs.get("sessiondata"))
-
-        elif operation == PDISCONN:  # portal_session_disconnect
-            # session closed from portal sid
-            session = server_sessionhandler.get(sessid)
-            if session:
-                server_sessionhandler.portal_disconnect(session)
-
-        elif operation == PDISCONNALL:  # portal_disconnect_all
-            # portal orders all sessions to close
-            server_sessionhandler.portal_disconnect_all()
-
-        elif operation == PSYNC:  # portal_session_sync
-            # force a resync of sessions when portal reconnects to
-            # server (e.g. after a server reboot) the data kwarg
-            # contains a dict {sessid: {arg1:val1,...}}
-            # representing the attributes to sync for each
-            # session.
-            server_sessionhandler.portal_sessions_sync(kwargs.get("sessiondata"))
-        else:
-            raise Exception("operation %(op)s not recognized." % {'op': operation})
-        return {}
-
-    def send_AdminPortal2Server(self, session, operation="", **kwargs):
-        """
-        Send Admin instructions from the Portal to the Server.
-        Executed
-        on the Portal.
-
-        Args:
-            session (Session): Session.
-            operation (char, optional): Identifier for the server operation, as defined by the
-                global variables in `evennia/server/amp.py`.
-            data (str or dict, optional): Data used in the administrative operation.
-
-        """
-        return self.send_data(AdminPortal2Server, session.sessid, operation=operation, **kwargs)
-
-    # Portal administration from the Server side
-
-    @AdminServer2Portal.responder
-    def portal_receive_adminserver2portal(self, packed_data):
-        """
-
-        Receives and handles admin operations sent to the Portal
-        This is executed on the Portal.
-
-        Args:
-            packed_data (str): Data received, a pickled tuple (sessid, kwargs).
-
-        """
-        sessid, kwargs = loads(packed_data)
-        operation = kwargs.pop("operation")
-        portal_sessionhandler = self.factory.portal.sessions
-
-        if operation == SLOGIN:  # server_session_login
-            # a session has authenticated; sync it.
-            session = portal_sessionhandler.get(sessid)
-            if session:
-                portal_sessionhandler.server_logged_in(session, kwargs.get("sessiondata"))
-
-        elif operation == SDISCONN:  # server_session_disconnect
-            # the server is ordering to disconnect the session
-            session = portal_sessionhandler.get(sessid)
-            if session:
-                portal_sessionhandler.server_disconnect(session, reason=kwargs.get("reason"))
-
-        elif operation == SDISCONNALL:  # server_session_disconnect_all
-            # server orders all sessions to disconnect
-            portal_sessionhandler.server_disconnect_all(reason=kwargs.get("reason"))
-
-        elif operation == SSHUTD:  # server_shutdown
-            # the server orders the portal to shut down
-            self.factory.portal.shutdown(restart=False)
-
-        elif operation == SRELOAD:  # server reload
-            self.factory.portal.server_reload(**kwargs)
-
-        elif operation == SSYNC:  # server_session_sync
-            # server wants to save session data to the portal,
-            # maybe because it's about to shut down.
-            portal_sessionhandler.server_session_sync(kwargs.get("sessiondata"),
-                                                      kwargs.get("clean", True))
-            # set a flag in case we are about to shut down soon
-            self.factory.server_restart_mode = True
-
-        elif operation == SCONN:  # server_force_connection (for irc/etc)
-            portal_sessionhandler.server_connect(**kwargs)
-
-        else:
-            raise Exception("operation %(op)s not recognized." % {'op': operation})
-        return {}
-
-    def send_AdminServer2Portal(self, session, operation="", **kwargs):
-        """
-        Administrative access method called by the Server to send an
-        instruction to the Portal.
-
-        Args:
-            session (Session): Session.
-            operation (char, optional): Identifier for the server
-                operation, as defined by the global variables in
-                `evennia/server/amp.py`.
-            data (str or dict, optional): Data going into the adminstrative.
-
-        """
-        return self.send_data(AdminServer2Portal, session.sessid, operation=operation, **kwargs)
-
-    # Extra functions
-
-    @FunctionCall.responder
-    def receive_functioncall(self, module, function, func_args, func_kwargs):
-        """
-        This allows Portal- and Server-process to call an arbitrary
-        function in the other process. It is intended for use by
-        plugin modules.
-
-        Args:
-            module (str or module): The module containing the
-                `function` to call.
-            function (str): The name of the function to call in
-                `module`.
-            func_args (str): Pickled args tuple for use in `function` call.
-            func_kwargs (str): Pickled kwargs dict for use in `function` call.
-
-        """
-        args = loads(func_args)
-        kwargs = loads(func_kwargs)
-
-        # call the function (don't catch tracebacks here)
-        result = variable_from_module(module, function)(*args, **kwargs)
-
-        if isinstance(result, Deferred):
-            # if result is a deferred, attach handler to properly
-            # wrap the return value
-            result.addCallback(lambda r: {"result": dumps(r)})
-            return result
-        else:
-            return {'result': dumps(result)}
-
-    def send_FunctionCall(self, modulepath, functionname, *args, **kwargs):
-        """
-        Access method called by either process. This will call an arbitrary
-        function on the other process (On Portal if calling from Server and
-        vice versa).
-
-        Inputs:
-            modulepath (str) - python path to module holding function to call
-            functionname (str) - name of function in given module
-            *args, **kwargs will be used as arguments/keyword args for the
-                            remote function call
-        Returns:
-            A deferred that fires with the return value of the remote
-            function call
-
-        """
-        return self.callRemote(FunctionCall,
-                               module=modulepath,
-                               function=functionname,
-                               args=dumps(args),
-                               kwargs=dumps(kwargs)).addCallback(
-            lambda r: loads(r["result"])).addErrback(self.errback, "FunctionCall")
diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
new file mode 100644
index 0000000000..9552ad2122
--- /dev/null
+++ b/evennia/server/amp_client.py
@@ -0,0 +1,185 @@
+"""
+The Evennia Server service acts as an AMP-client when talking to the
+Portal. This module sets up the Client-side communication.
+
+"""
+
+from evennia.server.portal import amp
+from twisted.internet import protocol
+from evennia.utils import logger
+
+
+class AMPClientFactory(protocol.ReconnectingClientFactory):
+    """
+    This factory creates an instance of an AMP client connection. This handles communication from
+    the be the Evennia 'Server' service to the 'Portal'. The client will try to auto-reconnect on a
+    connection error.
+
+    """
+    # Initial reconnect delay in seconds.
+    initialDelay = 1
+    factor = 1.5
+    maxDelay = 1
+    noisy = False
+
+    def __init__(self, server):
+        """
+        Initializes the client factory.
+
+        Args:
+            server (server): server instance.
+
+        """
+        self.server = server
+        self.protocol = AMPServerClientProtocol
+        self.maxDelay = 10
+        # not really used unless connecting to multiple servers, but
+        # avoids having to check for its existence on the protocol
+        self.broadcasts = []
+
+    def startedConnecting(self, connector):
+        """
+        Called when starting to try to connect to the MUD server.
+
+        Args:
+            connector (Connector): Twisted Connector instance representing
+                this connection.
+
+        """
+        pass
+
+    def buildProtocol(self, addr):
+        """
+        Creates an AMPProtocol instance when connecting to the server.
+
+        Args:
+            addr (str): Connection address. Not used.
+
+        """
+        self.resetDelay()
+        self.server.amp_protocol = AMPServerClientProtocol()
+        self.server.amp_protocol.factory = self
+        return self.server.amp_protocol
+
+    def clientConnectionLost(self, connector, reason):
+        """
+        Called when the AMP connection to the MUD server is lost.
+
+        Args:
+            connector (Connector): Twisted Connector instance representing
+                this connection.
+            reason (str): Eventual text describing why connection was lost.
+
+        """
+        logger.log_info("Server lost connection to the Portal. Reconnecting ...")
+        protocol.ReconnectingClientFactory.clientConnectionLost(self, connector, reason)
+
+    def clientConnectionFailed(self, connector, reason):
+        """
+        Called when an AMP connection attempt to the MUD server fails.
+
+        Args:
+            connector (Connector): Twisted Connector instance representing
+                this connection.
+            reason (str): Eventual text describing why connection failed.
+
+        """
+        logger.log_info("Attempting to reconnect to Portal ...")
+        protocol.ReconnectingClientFactory.clientConnectionFailed(self, connector, reason)
+
+
+class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
+    """
+    This protocol describes the Server service (acting as an AMP-client)'s communication with the
+    Portal (which acts as the AMP-server)
+
+    """
+    # sending AMP data
+
+    def send_MsgServer2Portal(self, session, **kwargs):
+        """
+        Access method - executed on the Server for sending data
+            to Portal.
+
+        Args:
+            session (Session): Unique Session.
+            kwargs (any, optiona): Extra data.
+
+        """
+        return self.data_out(amp.MsgServer2Portal, session.sessid, **kwargs)
+
+    def send_AdminServer2Portal(self, session, operation="", **kwargs):
+        """
+        Administrative access method called by the Server to send an
+        instruction to the Portal.
+
+        Args:
+            session (Session): Session.
+            operation (char, optional): Identifier for the server
+                operation, as defined by the global variables in
+                `evennia/server/amp.py`.
+            data (str or dict, optional): Data going into the adminstrative.
+
+        """
+        return self.data_out(amp.AdminServer2Portal, session.sessid, operation=operation, **kwargs)
+
+    # receiving AMP data
+
+    @amp.MsgPortal2Server.responder
+    def server_receive_msgportal2server(self, packed_data):
+        """
+        Receives message arriving to server. This method is executed
+        on the Server.
+
+        Args:
+            packed_data (str): Data to receive (a pickled tuple (sessid,kwargs))
+
+        """
+        sessid, kwargs = self.data_in(packed_data)
+        session = self.factory.server.sessions.get(sessid, None)
+        if session:
+            self.factory.server.sessions.data_in(session, **kwargs)
+        return {}
+
+    @amp.AdminPortal2Server.responder
+    def server_receive_adminportal2server(self, packed_data):
+        """
+        Receives admin data from the Portal (allows the portal to
+        perform admin operations on the server). This is executed on
+        the Server.
+
+        Args:
+            packed_data (str): Incoming, pickled data.
+
+        """
+        sessid, kwargs = self.data_in(packed_data)
+        operation = kwargs.pop("operation", "")
+        server_sessionhandler = self.factory.server.sessions
+
+        if operation == amp.PCONN:  # portal_session_connect
+            # create a new session and sync it
+            server_sessionhandler.portal_connect(kwargs.get("sessiondata"))
+
+        elif operation == amp.PCONNSYNC:  # portal_session_sync
+            server_sessionhandler.portal_session_sync(kwargs.get("sessiondata"))
+
+        elif operation == amp.PDISCONN:  # portal_session_disconnect
+            # session closed from portal sid
+            session = server_sessionhandler.get(sessid)
+            if session:
+                server_sessionhandler.portal_disconnect(session)
+
+        elif operation == amp.PDISCONNALL:  # portal_disconnect_all
+            # portal orders all sessions to close
+            server_sessionhandler.portal_disconnect_all()
+
+        elif operation == amp.PSYNC:  # portal_session_sync
+            # force a resync of sessions when portal reconnects to
+            # server (e.g. after a server reboot) the data kwarg
+            # contains a dict {sessid: {arg1:val1,...}}
+            # representing the attributes to sync for each
+            # session.
+            server_sessionhandler.portal_sessions_sync(kwargs.get("sessiondata"))
+        else:
+            raise Exception("operation %(op)s not recognized." % {'op': operation})
+        return {}
diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py
new file mode 100644
index 0000000000..9968c22a9e
--- /dev/null
+++ b/evennia/server/portal/amp.py
@@ -0,0 +1,353 @@
+"""
+The AMP (Asynchronous Message Protocol)-communication commands and constants used by Evennia.
+
+This module acts as a central place for AMP-servers and -clients to get commands to use.
+
+"""
+from __future__ import print_function
+import time
+from twisted.protocols import amp
+from collections import defaultdict, namedtuple
+from cStringIO import StringIO
+from itertools import count
+import zlib  # Used in Compressed class
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
+
+from twisted.internet.defer import DeferredList, Deferred
+from evennia.utils import logger
+from evennia.utils.utils import to_str, variable_from_module
+
+
+# communication bits
+# (chr(9) and chr(10) are \t and \n, so skipping them)
+
+PCONN = chr(1)         # portal session connect
+PDISCONN = chr(2)      # portal session disconnect
+PSYNC = chr(3)         # portal session sync
+SLOGIN = chr(4)        # server session login
+SDISCONN = chr(5)      # server session disconnect
+SDISCONNALL = chr(6)   # server session disconnect all
+SSHUTD = chr(7)        # server shutdown (shutdown portal too)
+SSYNC = chr(8)         # server session sync
+SCONN = chr(11)        # server creating new connection (for irc bots and etc)
+PCONNSYNC = chr(12)    # portal post-syncing a session
+PDISCONNALL = chr(13)  # portal session disconnect all
+SRELOAD = chr(14)      # server reloading (have portal start a new server)
+
+AMP_MAXLEN = amp.MAX_VALUE_LENGTH    # max allowed data length in AMP protocol (cannot be changed)
+BATCH_RATE = 250     # max commands/sec before switching to batch-sending
+BATCH_TIMEOUT = 0.5  # how often to poll to empty batch queue, in seconds
+
+# buffers
+_SENDBATCH = defaultdict(list)
+_MSGBUFFER = defaultdict(list)
+
+# resources
+
+DUMMYSESSION = namedtuple('DummySession', ['sessid'])(0)
+
+
+_HTTP_WARNING = """
+HTTP/1.1 200 OK
+Content-Type: text/html
+
+<html><body>
+This is Evennia's interal AMP port. It handles communication
+between Evennia's different processes.<h3><p>This port should NOT be
+publicly visible.</p></h3>
+</body></html>""".strip()
+
+
+# Helper functions for pickling.
+
+def dumps(data):
+    return to_str(pickle.dumps(to_str(data), pickle.HIGHEST_PROTOCOL))
+
+
+def loads(data):
+    return pickle.loads(to_str(data))
+
+
+# AMP Communication Command types
+
+class Compressed(amp.String):
+    """
+    This is a custom AMP command Argument that both handles too-long
+    sends as well as uses zlib for compression across the wire. The
+    batch-grouping of too-long sends is borrowed from the "mediumbox"
+    recipy at twisted-hacks's ~glyph/+junk/amphacks/mediumbox.
+
+    """
+
+    def fromBox(self, name, strings, objects, proto):
+        """
+        Converts from box representation to python. We
+        group very long data into batches.
+        """
+        value = StringIO()
+        value.write(strings.get(name))
+        for counter in count(2):
+            # count from 2 upwards
+            chunk = strings.get("%s.%d" % (name, counter))
+            if chunk is None:
+                break
+            value.write(chunk)
+        objects[name] = value.getvalue()
+
+    def toBox(self, name, strings, objects, proto):
+        """
+        Convert from data to box. We handled too-long
+        batched data and put it together here.
+        """
+        value = StringIO(objects[name])
+        strings[name] = value.read(AMP_MAXLEN)
+        for counter in count(2):
+            chunk = value.read(AMP_MAXLEN)
+            if not chunk:
+                break
+            strings["%s.%d" % (name, counter)] = chunk
+
+    def toString(self, inObject):
+        """
+        Convert to send on the wire, with compression.
+        """
+        return zlib.compress(inObject, 9)
+
+    def fromString(self, inString):
+        """
+        Convert (decompress) from the wire to Python.
+        """
+        return zlib.decompress(inString)
+
+
+class MsgPortal2Server(amp.Command):
+    """
+    Message Portal -> Server
+
+    """
+    key = "MsgPortal2Server"
+    arguments = [('packed_data', Compressed())]
+    errors = {Exception: 'EXCEPTION'}
+    response = []
+
+
+class MsgServer2Portal(amp.Command):
+    """
+    Message Server -> Portal
+
+    """
+    key = "MsgServer2Portal"
+    arguments = [('packed_data', Compressed())]
+    errors = {Exception: 'EXCEPTION'}
+    response = []
+
+
+class AdminPortal2Server(amp.Command):
+    """
+    Administration Portal -> Server
+
+    Sent when the portal needs to perform admin operations on the
+    server, such as when a new session connects or resyncs
+
+    """
+    key = "AdminPortal2Server"
+    arguments = [('packed_data', Compressed())]
+    errors = {Exception: 'EXCEPTION'}
+    response = []
+
+
+class AdminServer2Portal(amp.Command):
+    """
+    Administration Server -> Portal
+
+    Sent when the server needs to perform admin operations on the
+    portal.
+
+    """
+    key = "AdminServer2Portal"
+    arguments = [('packed_data', Compressed())]
+    errors = {Exception: 'EXCEPTION'}
+    response = []
+
+
+class FunctionCall(amp.Command):
+    """
+    Bidirectional Server <-> Portal
+
+    Sent when either process needs to call an arbitrary function in
+    the other. This does not use the batch-send functionality.
+
+    """
+    key = "FunctionCall"
+    arguments = [('module', amp.String()),
+                 ('function', amp.String()),
+                 ('args', amp.String()),
+                 ('kwargs', amp.String())]
+    errors = {Exception: 'EXCEPTION'}
+    response = [('result', amp.String())]
+
+
+# -------------------------------------------------------------
+# Core AMP protocol for communication Server <-> Portal
+# -------------------------------------------------------------
+
+class AMPMultiConnectionProtocol(amp.AMP):
+    """
+    AMP protocol that safely handle multiple connections to the same
+    server without dropping old ones - new clients will receive
+    all server returns (broadcast). Will also correctly handle
+    erroneous HTTP requests on the port and return a HTTP error response.
+
+    """
+
+    # helper methods
+
+    def __init__(self, *args, **kwargs):
+        """
+        Initialize protocol with some things that need to be in place
+        already before connecting both on portal and server.
+
+        """
+        self.send_batch_counter = 0
+        self.send_reset_time = time.time()
+        self.send_mode = True
+        self.send_task = None
+
+    def dataReceived(self, data):
+        """
+        Handle non-AMP messages, such as HTTP communication.
+        """
+        if data[0] != b'\0':
+            self.transport.write(_HTTP_WARNING)
+            self.transport.loseConnection()
+        else:
+            super(AMPMultiConnectionProtocol, self).dataReceived(data)
+
+    def connectionMade(self):
+        """
+        This is called when an AMP connection is (re-)established
+        between server and portal. AMP calls it on both sides, so we
+        need to make sure to only trigger resync from the portal side.
+
+        """
+        self.factory.broadcasts.append(self)
+
+    def connectionLost(self, reason):
+        """
+        We swallow connection errors here. The reason is that during a
+        normal reload/shutdown there will almost always be cases where
+        either the portal or server shuts down before a message has
+        returned its (empty) return, triggering a connectionLost error
+        that is irrelevant. If a true connection error happens, the
+        portal will continuously try to reconnect, showing the problem
+        that way.
+        """
+        self.factory.broadcasts.remove(self)
+
+    # Error handling
+
+    def errback(self, e, info):
+        """
+        Error callback.
+        Handles errors to avoid dropping connections on server tracebacks.
+
+        Args:
+            e (Failure): Deferred error instance.
+            info (str): Error string.
+
+        """
+        e.trap(Exception)
+        logger.log_err("AMP Error for %(info)s: %(e)s" % {'info': info,
+                                                          'e': e.getErrorMessage()})
+
+    def data_in(self, packed_data):
+        """
+        Process incoming packed data.
+
+        Args:
+            packed_data (bytes): Zip-packed data.
+        Returns:
+            unpaced_data (any): Unpacked package
+
+        """
+        return loads(packed_data)
+
+    def data_out(self, command, sessid, **kwargs):
+        """
+        Send data across the wire. Always use this to send.
+
+        Args:
+            command (AMP Command): A protocol send command.
+            sessid (int): A unique Session id.
+
+        Returns:
+            deferred (deferred or None): A deferred with an errback.
+
+        Notes:
+            Data will be sent across the wire pickled as a tuple
+            (sessid, kwargs).
+
+        """
+        deferreds = []
+        for prot in self.factory.broadcasts:
+            deferreds.append(prot.callRemote(command,
+                                             packed_data=dumps((sessid, kwargs))))
+        return DeferredList(deferreds, fireOnOneErrback=1).addErrback(self.errback, command.key)
+
+    # generic function send/recvs
+
+    def send_FunctionCall(self, modulepath, functionname, *args, **kwargs):
+        """
+        Access method called by either process. This will call an arbitrary
+        function on the other process (On Portal if calling from Server and
+        vice versa).
+
+        Inputs:
+            modulepath (str) - python path to module holding function to call
+            functionname (str) - name of function in given module
+            *args, **kwargs will be used as arguments/keyword args for the
+                            remote function call
+        Returns:
+            A deferred that fires with the return value of the remote
+            function call
+
+        """
+        return self.callRemote(FunctionCall,
+                               module=modulepath,
+                               function=functionname,
+                               args=dumps(args),
+                               kwargs=dumps(kwargs)).addCallback(
+            lambda r: loads(r["result"])).addErrback(self.errback, "FunctionCall")
+
+    @FunctionCall.responder
+    def receive_functioncall(self, module, function, func_args, func_kwargs):
+        """
+        This allows Portal- and Server-process to call an arbitrary
+        function in the other process. It is intended for use by
+        plugin modules.
+
+        Args:
+            module (str or module): The module containing the
+                `function` to call.
+            function (str): The name of the function to call in
+                `module`.
+            func_args (str): Pickled args tuple for use in `function` call.
+            func_kwargs (str): Pickled kwargs dict for use in `function` call.
+
+        """
+        args = loads(func_args)
+        kwargs = loads(func_kwargs)
+
+        # call the function (don't catch tracebacks here)
+        result = variable_from_module(module, function)(*args, **kwargs)
+
+        if isinstance(result, Deferred):
+            # if result is a deferred, attach handler to properly
+            # wrap the return value
+            result.addCallback(lambda r: {"result": dumps(r)})
+            return result
+        else:
+            return {'result': dumps(result)}
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
new file mode 100644
index 0000000000..3c5bf175d2
--- /dev/null
+++ b/evennia/server/portal/amp_server.py
@@ -0,0 +1,168 @@
+"""
+The Evennia Portal service acts as an AMP-server, handling AMP
+communication to the AMP clients connecting to it (by default
+these are the Evennia Server and the evennia launcher).
+
+"""
+from twisted.internet import protocol
+from evennia.server.portal import amp
+
+
+class AMPServerFactory(protocol.ServerFactory):
+
+    """
+    This factory creates AMP Server connection. This acts as the 'Portal'-side communication to the
+    'Server' process.
+
+    """
+    noisy = False
+
+    def __init__(self, portal):
+        """
+        Initialize the factory. This is called as the Portal service starts.
+
+        Args:
+            portal (Portal): The Evennia Portal service instance.
+            protocol (Protocol): The protocol the factory creates
+                instances of.
+
+        """
+        self.portal = portal
+        self.protocol = AMPServerProtocol
+        self.broadcasts = []
+
+    def buildProtocol(self, addr):
+        """
+        Start a new connection, and store it on the service object.
+
+        Args:
+            addr (str): Connection address. Not used.
+
+        Returns:
+            protocol (Protocol): The created protocol.
+
+        """
+        self.portal.amp_protocol = AMPServerProtocol()
+        self.portal.amp_protocol.factory = self
+        return self.portal.amp_protocol
+
+
+class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
+    """
+    Protocol subclass for the AMP-server run by the Portal.
+
+    """
+    def connectionMade(self):
+        """
+        Called when a new connection is established.
+
+        """
+        super(AMPServerProtocol, self).connectionMade()
+
+        sessdata = self.factory.portal.sessions.get_all_sync_data()
+        self.send_AdminPortal2Server(amp.DUMMYSESSION,
+                                     amp.PSYNC,
+                                     sessiondata=sessdata)
+        self.factory.portal.sessions.at_server_connection()
+
+    # sending amp data
+
+    def send_MsgPortal2Server(self, session, **kwargs):
+        """
+        Access method called by the Portal and executed on the Portal.
+
+        Args:
+            session (session): Session
+            kwargs (any, optional): Optional data.
+
+        Returns:
+            deferred (Deferred): Asynchronous return.
+
+        """
+        return self.data_out(amp.MsgPortal2Server, session.sessid, **kwargs)
+
+    def send_AdminPortal2Server(self, session, operation="", **kwargs):
+        """
+        Send Admin instructions from the Portal to the Server.
+        Executed
+        on the Portal.
+
+        Args:
+            session (Session): Session.
+            operation (char, optional): Identifier for the server operation, as defined by the
+                global variables in `evennia/server/amp.py`.
+            data (str or dict, optional): Data used in the administrative operation.
+
+        """
+        return self.data_out(amp.AdminPortal2Server, session.sessid, operation=operation, **kwargs)
+
+    # receive amp data
+
+    @amp.MsgServer2Portal.responder
+    def portal_receive_server2portal(self, packed_data):
+        """
+        Receives message arriving to Portal from Server.
+        This method is executed on the Portal.
+
+        Args:
+            packed_data (str): Pickled data (sessid, kwargs) coming over the wire.
+
+        """
+        sessid, kwargs = self.data_in(packed_data)
+        session = self.factory.portal.sessions.get(sessid, None)
+        if session:
+            self.factory.portal.sessions.data_out(session, **kwargs)
+        return {}
+
+    @amp.AdminServer2Portal.responder
+    def portal_receive_adminserver2portal(self, packed_data):
+        """
+
+        Receives and handles admin operations sent to the Portal
+        This is executed on the Portal.
+
+        Args:
+            packed_data (str): Data received, a pickled tuple (sessid, kwargs).
+
+        """
+        sessid, kwargs = self.data_in(packed_data)
+        operation = kwargs.pop("operation")
+        portal_sessionhandler = self.factory.portal.sessions
+
+        if operation == amp.SLOGIN:  # server_session_login
+            # a session has authenticated; sync it.
+            session = portal_sessionhandler.get(sessid)
+            if session:
+                portal_sessionhandler.server_logged_in(session, kwargs.get("sessiondata"))
+
+        elif operation == amp.SDISCONN:  # server_session_disconnect
+            # the server is ordering to disconnect the session
+            session = portal_sessionhandler.get(sessid)
+            if session:
+                portal_sessionhandler.server_disconnect(session, reason=kwargs.get("reason"))
+
+        elif operation == amp.SDISCONNALL:  # server_session_disconnect_all
+            # server orders all sessions to disconnect
+            portal_sessionhandler.server_disconnect_all(reason=kwargs.get("reason"))
+
+        elif operation == amp.SSHUTD:  # server_shutdown
+            # the server orders the portal to shut down
+            self.factory.portal.shutdown(restart=False)
+
+        elif operation == amp.SRELOAD:  # server reload
+            self.factory.portal.server_reload(**kwargs)
+
+        elif operation == amp.SSYNC:  # server_session_sync
+            # server wants to save session data to the portal,
+            # maybe because it's about to shut down.
+            portal_sessionhandler.server_session_sync(kwargs.get("sessiondata"),
+                                                      kwargs.get("clean", True))
+            # set a flag in case we are about to shut down soon
+            self.factory.server_restart_mode = True
+
+        elif operation == amp.SCONN:  # server_force_connection (for irc/etc)
+            portal_sessionhandler.server_connect(**kwargs)
+
+        else:
+            raise Exception("operation %(op)s not recognized." % {'op': operation})
+        return {}
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index eda7aeada4..293d1d6db5 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -187,13 +187,13 @@ if AMP_ENABLED:
     # the portal and the mud server. Only reason to ever deactivate
     # it would be during testing and debugging.
 
-    from evennia.server import amp
+    from evennia.server.portal import amp_server
 
     print('  amp (to Server): %s (internal)' % AMP_PORT)
 
-    factory = amp.AmpServerFactory(PORTAL)
+    factory = amp_server.AMPServerFactory(PORTAL)
     amp_service = internet.TCPServer(AMP_PORT, factory, interface=AMP_INTERFACE)
-    amp_service.setName("PortalAMPService")
+    amp_service.setName("PortalAMPServer")
     PORTAL.services.addService(amp_service)
 
 
diff --git a/evennia/server/server.py b/evennia/server/server.py
index 643b3161f7..be282527f6 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -548,9 +548,9 @@ if AMP_ENABLED:
         ifacestr = "-%s" % AMP_INTERFACE
     print('  amp (to Portal)%s: %s (internal)' % (ifacestr, AMP_PORT))
 
-    from evennia.server import amp
+    from evennia.server import amp_client
 
-    factory = amp.AmpClientFactory(EVENNIA)
+    factory = amp_client.AMPClientFactory(EVENNIA)
     amp_service = internet.TCPClient(AMP_HOST, AMP_PORT, factory)
     amp_service.setName('ServerAMPClient')
     EVENNIA.services.addService(amp_service)

From d89fbf1943959fa2f78ed4cc836cf15bca45cafd Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 13 Jan 2018 13:11:48 +0100
Subject: [PATCH 040/217] Add better error-handling for AMP, start design
 launcer API

---
 evennia/server/amp_client.py        |  2 +
 evennia/server/portal/amp.py        | 81 ++++++++++++++++++++++++++---
 evennia/server/portal/amp_server.py | 40 ++++++++++++++
 3 files changed, 115 insertions(+), 8 deletions(-)

diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index 9552ad2122..fd36499561 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -126,6 +126,7 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
     # receiving AMP data
 
     @amp.MsgPortal2Server.responder
+    @amp.catch_traceback
     def server_receive_msgportal2server(self, packed_data):
         """
         Receives message arriving to server. This method is executed
@@ -142,6 +143,7 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
         return {}
 
     @amp.AdminPortal2Server.responder
+    @amp.catch_traceback
     def server_receive_adminportal2server(self, packed_data):
         """
         Receives admin data from the Portal (allows the portal to
diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py
index 9968c22a9e..0d3537cd85 100644
--- a/evennia/server/portal/amp.py
+++ b/evennia/server/portal/amp.py
@@ -5,6 +5,7 @@ This module acts as a central place for AMP-servers and -clients to get commands
 
 """
 from __future__ import print_function
+from functools import wraps
 import time
 from twisted.protocols import amp
 from collections import defaultdict, namedtuple
@@ -17,9 +18,10 @@ except ImportError:
     import pickle
 
 from twisted.internet.defer import DeferredList, Deferred
-from evennia.utils import logger
 from evennia.utils.utils import to_str, variable_from_module
 
+# delayed import
+_LOGGER = None
 
 # communication bits
 # (chr(9) and chr(10) are \t and \n, so skipping them)
@@ -30,12 +32,15 @@ PSYNC = chr(3)         # portal session sync
 SLOGIN = chr(4)        # server session login
 SDISCONN = chr(5)      # server session disconnect
 SDISCONNALL = chr(6)   # server session disconnect all
-SSHUTD = chr(7)        # server shutdown (shutdown portal too)
+SSHUTD = chr(7)        # server shutdown
 SSYNC = chr(8)         # server session sync
 SCONN = chr(11)        # server creating new connection (for irc bots and etc)
 PCONNSYNC = chr(12)    # portal post-syncing a session
 PDISCONNALL = chr(13)  # portal session disconnect all
 SRELOAD = chr(14)      # server reloading (have portal start a new server)
+PSTART = chr(15)       # server+portal start
+PSHUTD = chr(16)       # portal (+server) shutdown
+PPING = chr(17)        # server or portal status
 
 AMP_MAXLEN = amp.MAX_VALUE_LENGTH    # max allowed data length in AMP protocol (cannot be changed)
 BATCH_RATE = 250     # max commands/sec before switching to batch-sending
@@ -71,6 +76,21 @@ def loads(data):
     return pickle.loads(to_str(data))
 
 
+@wraps
+def catch_traceback(func):
+    "Helper decorator"
+    def decorator(*args, **kwargs):
+        try:
+            func(*args, **kwargs)
+        except Exception:
+            global _LOGGER
+            if not _LOGGER:
+                from evennia.utils import logger as _LOGGER
+            _LOGGER.log_trace()
+            raise  # make sure the error is visible on the other side of the connection too
+    return decorator
+
+
 # AMP Communication Command types
 
 class Compressed(amp.String):
@@ -123,6 +143,18 @@ class Compressed(amp.String):
         return zlib.decompress(inString)
 
 
+class MsgLauncher2Portal(amp.Command):
+    """
+    Message Launcher -> Portal
+
+    """
+    key = "MsgLauncher2Portal"
+    arguments = [('operation', amp.String()),
+                 ('argument', amp.String())]
+    errors = {Exception: 'EXCEPTION'}
+    response = [('result', amp.String())]
+
+
 class MsgPortal2Server(amp.Command):
     """
     Message Portal -> Server
@@ -173,6 +205,17 @@ class AdminServer2Portal(amp.Command):
     response = []
 
 
+class MsgPing(amp.Command):
+    """
+    Ping between AMP services
+
+    """
+    key = "AMPPing"
+    arguments = [('ping', amp.Boolean())]
+    errors = {Exception: 'EXCEPTION'}
+    response = [('pong', amp.Boolean())]
+
+
 class FunctionCall(amp.Command):
     """
     Bidirectional Server <-> Portal
@@ -259,9 +302,12 @@ class AMPMultiConnectionProtocol(amp.AMP):
             info (str): Error string.
 
         """
+        global _LOGGER
+        if not _LOGGER:
+            from evennia.utils import logger as _LOGGER
         e.trap(Exception)
-        logger.log_err("AMP Error for %(info)s: %(e)s" % {'info': info,
-                                                          'e': e.getErrorMessage()})
+        _LOGGER.log_err("AMP Error for %(info)s: %(e)s" % {'info': info,
+                                                           'e': e.getErrorMessage()})
 
     def data_in(self, packed_data):
         """
@@ -292,10 +338,28 @@ class AMPMultiConnectionProtocol(amp.AMP):
 
         """
         deferreds = []
-        for prot in self.factory.broadcasts:
-            deferreds.append(prot.callRemote(command,
-                                             packed_data=dumps((sessid, kwargs))))
-        return DeferredList(deferreds, fireOnOneErrback=1).addErrback(self.errback, command.key)
+        for protcl in self.factory.broadcasts:
+            deferreds.append(protcl.callRemote(command,
+                                               packed_data=dumps((sessid, kwargs))).addErrback(
+                                                    self.errback, command.key))
+        return DeferredList(deferreds)
+
+    def send_ping(self, port, callback, errback):
+        """
+        Ping to the given AMP port.
+
+        Args:
+            port (int): The port to ping
+            callback (callable): This will be called with the port that replied to the ping.
+            errback (callable0: This will be called with the port that failed to reply.
+
+        """
+        targets = [(protcl, protcl.getHost()[1]) for protcl in self.factory.broadcasts]
+        deferreds = []
+        for protcl, port in ((protcl, prt) for protcl, prt in targets if prt == port):
+            deferreds.append(protcl.callRemote(MsgPing, ping=True).addCallback(
+                callback, port).addErrback(errback, port))
+        return DeferredList(deferreds)
 
     # generic function send/recvs
 
@@ -323,6 +387,7 @@ class AMPMultiConnectionProtocol(amp.AMP):
             lambda r: loads(r["result"])).addErrback(self.errback, "FunctionCall")
 
     @FunctionCall.responder
+    @catch_traceback
     def receive_functioncall(self, module, function, func_args, func_kwargs):
         """
         This allows Portal- and Server-process to call an arbitrary
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 3c5bf175d2..8915feef8a 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -96,9 +96,48 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         """
         return self.data_out(amp.AdminPortal2Server, session.sessid, operation=operation, **kwargs)
 
+    def sendPingPortal2Server(self, callback):
+        """
+        Send ping to check if Server is alive.
+
+        """
+
     # receive amp data
 
+    @amp.MsgLauncher2Portal.responder
+    @amp.catch_traceback
+    def portal_receive_launcher2portal(self, operation, argument):
+        """
+        Receives message arriving from evennia_launcher.
+        This method is executed on the Portal.
+
+        Args:
+            operation (str): The action to perform.
+            argument (str): A possible argument to the instruction, or the empty string.
+
+        Returns:
+            result (dict): The result back to the launcher.
+
+        Notes:
+            This is the entrypoint for controlling the entire Evennia system from the
+            evennia launcher.
+
+        """
+        if operation == amp.PPING:  # check portal and server status
+            pass
+        elif operation == amp.PSTART:   # portal start (server start or reload)
+            pass
+        elif operation == amp.SRELOAD:  # reload server
+            pass
+        elif operation == amp.PSHUTD:  # portal + server shutdown
+            pass
+        else:
+            raise Exception("operation %(op)s not recognized." % {'op': operation})
+        # fallback
+        return {"result": ""}
+
     @amp.MsgServer2Portal.responder
+    @amp.catch_traceback
     def portal_receive_server2portal(self, packed_data):
         """
         Receives message arriving to Portal from Server.
@@ -115,6 +154,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         return {}
 
     @amp.AdminServer2Portal.responder
+    @amp.catch_traceback
     def portal_receive_adminserver2portal(self, packed_data):
         """
 

From 3fde374703a3a2ff4c761796dcd5dfc94edfc4c1 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 13 Jan 2018 15:22:51 +0100
Subject: [PATCH 041/217] Add ability to ping Portal from launcher over AMP

---
 evennia/server/evennia_launcher.py  | 127 +++++++++++++++++++++++++++-
 evennia/server/portal/amp.py        |  18 ++--
 evennia/server/portal/amp_server.py |   8 +-
 3 files changed, 137 insertions(+), 16 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 9ccf664410..94395f09c4 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -20,6 +20,8 @@ import importlib
 from distutils.version import LooseVersion
 from argparse import ArgumentParser
 from subprocess import Popen, check_output, call, CalledProcessError, STDOUT
+from twisted.protocols import amp
+from twisted.internet import reactor, endpoints
 import django
 
 # Signal processing
@@ -49,18 +51,32 @@ CURRENT_DIR = os.getcwd()
 GAMEDIR = CURRENT_DIR
 
 # Operational setup
+AMP_PORT = None
+AMP_HOST = None
+AMP_INTERFACE = None
+
 SERVER_LOGFILE = None
 PORTAL_LOGFILE = None
 HTTP_LOGFILE = None
+
 SERVER_PIDFILE = None
 PORTAL_PIDFILE = None
 SERVER_RESTART = None
 PORTAL_RESTART = None
+
 SERVER_PY_FILE = None
 PORTAL_PY_FILE = None
+
 TEST_MODE = False
 ENFORCED_SETTING = False
 
+# communication constants
+
+SRELOAD = chr(14)      # server reloading (have portal start a new server)
+PSTART = chr(15)       # server+portal start
+PSHUTD = chr(16)       # portal (+server) shutdown
+PSTATUS = chr(17)        # ping server or portal status
+
 # requirements
 PYTHON_MIN = '2.7'
 TWISTED_MIN = '16.0.0'
@@ -303,6 +319,15 @@ MENU = \
     +---------------------------------------------------------------+
     """
 
+ERROR_AMP_UNCONFIGURED = \
+    """
+    Can't find server info for connecting. Either run this command from
+    the game dir (it will then use the game's settings file) or specify
+    the path to your game's settings file manually with the --settings
+    option.
+
+    """
+
 ERROR_LOGDIR_MISSING = \
     """
     ERROR: One or more log-file directory locations could not be
@@ -391,11 +416,94 @@ NOTE_TEST_CUSTOM = \
     on the game dir.)
     """
 
-#------------------------------------------------------------
+
+# ------------------------------------------------------------
 #
-# Functions
+#  Protocol Evennia launcher - Portal/Server communication
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
+
+
+class MsgStatus(amp.Command):
+    """
+    Ping between AMP services
+
+    """
+    key = "AMPPing"
+    arguments = [('question', amp.String())]
+    errors = {Exception: 'EXCEPTION'}
+    response = [('status', amp.String())]
+
+
+class MsgLauncher2Portal(amp.Command):
+    """
+    Message Launcher -> Portal
+
+    """
+    key = "MsgLauncher2Portal"
+    arguments = [('operation', amp.String()),
+                 ('argument', amp.String())]
+    errors = {Exception: 'EXCEPTION'}
+    response = [('result', amp.String())]
+
+
+def send_instruction(instruction, argument, callback, errback):
+    """
+    Send instruction and handle the response.
+
+    """
+    if None in (AMP_HOST, AMP_PORT, AMP_INTERFACE):
+        print(ERROR_AMP_UNCONFIGURED)
+        sys.exit()
+
+    def _on_connect(prot):
+        """
+        This fires with the protocol when connection is established. We
+        immediately send off the instruction then shut down.
+
+        """
+        def _callback(result):
+            callback(result)
+            prot.transport.loseConnection()
+            reactor.stop()
+
+        def _errback(fail):
+            errback(fail)
+            prot.transport.loseConnection()
+            reactor.stop()
+
+        if instruction == PSTATUS:
+            prot.callRemote(MsgStatus, question="").addCallbacks(_callback, _errback)
+        else:
+            prot.callRemote(MsgLauncher2Portal, instruction, argument).addCallbacks(
+                    _callback, _errback)
+
+    point = endpoints.TCP4ClientEndpoint(reactor, AMP_HOST, AMP_PORT)
+    deferred = endpoints.connectProtocol(point, amp.AMP())
+    deferred.addCallbacks(_on_connect, errback)
+    reactor.run()
+
+
+def send_status():
+    """
+    Send ping to portal
+
+    """
+    import time
+    t0 = time.time()
+    def _callback(status):
+        print("STATUS returned: %s (%gms)" % (status, (time.time()-t0) * 1000))
+
+    def _errback(err):
+        print("STATUS returned: %s" % err)
+
+    send_instruction(PSTATUS, None, _callback, _errback)
+
+# ------------------------------------------------------------
+#
+#  Helper functions
+#
+# ------------------------------------------------------------
 
 
 def evennia_version():
@@ -869,12 +977,17 @@ def init_game_directory(path, check_db=True):
         check_database()
 
     # set up the Evennia executables and log file locations
+    global AMP_PORT, AMP_HOST, AMP_INTERFACE
     global SERVER_PY_FILE, PORTAL_PY_FILE
     global SERVER_LOGFILE, PORTAL_LOGFILE, HTTP_LOGFILE
     global SERVER_PIDFILE, PORTAL_PIDFILE
     global SERVER_RESTART, PORTAL_RESTART
     global EVENNIA_VERSION
 
+    AMP_PORT = settings.AMP_PORT
+    AMP_HOST = settings.AMP_HOST
+    AMP_INTERFACE = settings.AMP_INTERFACE
+
     SERVER_PY_FILE = os.path.join(EVENNIA_LIB, "server", "server.py")
     PORTAL_PY_FILE = os.path.join(EVENNIA_LIB, "portal", "portal", "portal.py")
 
@@ -1239,6 +1352,9 @@ def main():
         "service", metavar="component", nargs='?', default="all",
         help=("Which component to operate on: "
               "'server', 'portal' or 'all' (default if not set)."))
+    parser.add_argument(
+        "--status", action='store_true', dest='get_status',
+        default=None, help='Get current server status.')
     parser.epilog = (
         "Common usage: evennia start|stop|reload. Django-admin database commands:"
         "evennia migration|flush|shell|dbshell (see the django documentation for more django-admin commands.)")
@@ -1289,6 +1405,11 @@ def main():
             print(ERROR_INITSETTINGS)
         sys.exit()
 
+    if args.get_status:
+        init_game_directory(CURRENT_DIR, check_db=True)
+        send_status()
+        sys.exit()
+
     if args.dummyrunner:
         # launch the dummy runner
         init_game_directory(CURRENT_DIR, check_db=True)
diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py
index 0d3537cd85..1578b8f1f4 100644
--- a/evennia/server/portal/amp.py
+++ b/evennia/server/portal/amp.py
@@ -40,7 +40,7 @@ PDISCONNALL = chr(13)  # portal session disconnect all
 SRELOAD = chr(14)      # server reloading (have portal start a new server)
 PSTART = chr(15)       # server+portal start
 PSHUTD = chr(16)       # portal (+server) shutdown
-PPING = chr(17)        # server or portal status
+PSTATUS = chr(17)      # ping server or portal status
 
 AMP_MAXLEN = amp.MAX_VALUE_LENGTH    # max allowed data length in AMP protocol (cannot be changed)
 BATCH_RATE = 250     # max commands/sec before switching to batch-sending
@@ -205,15 +205,15 @@ class AdminServer2Portal(amp.Command):
     response = []
 
 
-class MsgPing(amp.Command):
+class MsgStatus(amp.Command):
     """
-    Ping between AMP services
+    Check Status between AMP services
 
     """
     key = "AMPPing"
-    arguments = [('ping', amp.Boolean())]
+    arguments = [('question', amp.String())]
     errors = {Exception: 'EXCEPTION'}
-    response = [('pong', amp.Boolean())]
+    response = [('status', amp.String())]
 
 
 class FunctionCall(amp.Command):
@@ -271,9 +271,7 @@ class AMPMultiConnectionProtocol(amp.AMP):
 
     def connectionMade(self):
         """
-        This is called when an AMP connection is (re-)established
-        between server and portal. AMP calls it on both sides, so we
-        need to make sure to only trigger resync from the portal side.
+        This is called when an AMP connection is (re-)established AMP calls it on both sides.
 
         """
         self.factory.broadcasts.append(self)
@@ -344,7 +342,7 @@ class AMPMultiConnectionProtocol(amp.AMP):
                                                     self.errback, command.key))
         return DeferredList(deferreds)
 
-    def send_ping(self, port, callback, errback):
+    def send_status(self, port, callback, errback):
         """
         Ping to the given AMP port.
 
@@ -357,7 +355,7 @@ class AMPMultiConnectionProtocol(amp.AMP):
         targets = [(protcl, protcl.getHost()[1]) for protcl in self.factory.broadcasts]
         deferreds = []
         for protcl, port in ((protcl, prt) for protcl, prt in targets if prt == port):
-            deferreds.append(protcl.callRemote(MsgPing, ping=True).addCallback(
+            deferreds.append(protcl.callRemote(MsgStatus, status=True).addCallback(
                 callback, port).addErrback(errback, port))
         return DeferredList(deferreds)
 
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 8915feef8a..343680aa89 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -104,6 +104,10 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
     # receive amp data
 
+    @amp.MsgStatus.responder
+    def portal_receive_status(self, question):
+        return {"status": "All well"}
+
     @amp.MsgLauncher2Portal.responder
     @amp.catch_traceback
     def portal_receive_launcher2portal(self, operation, argument):
@@ -123,9 +127,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
             evennia launcher.
 
         """
-        if operation == amp.PPING:  # check portal and server status
-            pass
-        elif operation == amp.PSTART:   # portal start (server start or reload)
+        if operation == amp.PSTART:   # portal start (server start or reload)
             pass
         elif operation == amp.SRELOAD:  # reload server
             pass

From 006364de02e8e38cc2e5c1031d2cc1f86a557b12 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 13 Jan 2018 20:11:02 +0100
Subject: [PATCH 042/217] Start reworking launcher for sending instructions

---
 evennia/server/amp_client.py        |   4 +
 evennia/server/evennia_launcher.py  | 212 ++++++++++++++++++++++++----
 evennia/server/evennia_runner.py    |   4 -
 evennia/server/portal/amp.py        |  28 +---
 evennia/server/portal/amp_server.py |  50 ++++---
 5 files changed, 231 insertions(+), 67 deletions(-)

diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index fd36499561..a76245912b 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -125,6 +125,10 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
 
     # receiving AMP data
 
+    @amp.MsgStatus.responder
+    def server_receive_status(self, question):
+        return {"status": "OK"}
+
     @amp.MsgPortal2Server.responder
     @amp.catch_traceback
     def server_receive_msgportal2server(self, packed_data):
diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 94395f09c4..a9452ae785 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -20,6 +20,12 @@ import importlib
 from distutils.version import LooseVersion
 from argparse import ArgumentParser
 from subprocess import Popen, check_output, call, CalledProcessError, STDOUT
+
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
+
 from twisted.protocols import amp
 from twisted.internet import reactor, endpoints
 import django
@@ -67,15 +73,19 @@ PORTAL_RESTART = None
 SERVER_PY_FILE = None
 PORTAL_PY_FILE = None
 
+SPROFILER_LOGFILE = os.path.join(GAMEDIR, SERVERDIR, "logs", "server.prof")
+PPROFILER_LOGFILE = os.path.join(GAMEDIR, SERVERDIR, "logs", "portal.prof")
+
 TEST_MODE = False
 ENFORCED_SETTING = False
 
 # communication constants
 
 SRELOAD = chr(14)      # server reloading (have portal start a new server)
-PSTART = chr(15)       # server+portal start
+SSTART = chr(15)       # server start
 PSHUTD = chr(16)       # portal (+server) shutdown
-PSTATUS = chr(17)        # ping server or portal status
+SSHUTD = chr(17)       # server-only shutdown
+PSTATUS = chr(18)      # ping server or portal status
 
 # requirements
 PYTHON_MIN = '2.7'
@@ -85,11 +95,11 @@ DJANGO_REC = '1.11'
 
 sys.path[1] = EVENNIA_ROOT
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 #
 # Messages
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 CREATED_NEW_GAMEDIR = \
     """
@@ -416,6 +426,10 @@ NOTE_TEST_CUSTOM = \
     on the game dir.)
     """
 
+PROCESS_ERROR = \
+    """
+    {component} process error: {traceback}.
+    """
 
 # ------------------------------------------------------------
 #
@@ -429,8 +443,8 @@ class MsgStatus(amp.Command):
     Ping between AMP services
 
     """
-    key = "AMPPing"
-    arguments = [('question', amp.String())]
+    key = "MsgStatus"
+    arguments = [('status', amp.String())]
     errors = {Exception: 'EXCEPTION'}
     response = [('status', amp.String())]
 
@@ -442,12 +456,12 @@ class MsgLauncher2Portal(amp.Command):
     """
     key = "MsgLauncher2Portal"
     arguments = [('operation', amp.String()),
-                 ('argument', amp.String())]
+                 ('arguments', amp.String())]
     errors = {Exception: 'EXCEPTION'}
     response = [('result', amp.String())]
 
 
-def send_instruction(instruction, argument, callback, errback):
+def send_instruction(instruction, arguments, callback, errback):
     """
     Send instruction and handle the response.
 
@@ -473,14 +487,22 @@ def send_instruction(instruction, argument, callback, errback):
             reactor.stop()
 
         if instruction == PSTATUS:
-            prot.callRemote(MsgStatus, question="").addCallbacks(_callback, _errback)
+            prot.callRemote(MsgStatus, status="").addCallbacks(_callback, _errback)
         else:
-            prot.callRemote(MsgLauncher2Portal, instruction, argument).addCallbacks(
-                    _callback, _errback)
+            prot.callRemote(
+                MsgLauncher2Portal,
+                instruction=instruction,
+                arguments=pickle.dumps(arguments, pickle.HIGHEST_PROTOCOL).addCallbacks(
+                    _callback, _errback))
+
+    def _on_connect_fail(fail):
+        "This is called if portal is not reachable."
+        errback(fail)
+        reactor.stop()
 
     point = endpoints.TCP4ClientEndpoint(reactor, AMP_HOST, AMP_PORT)
     deferred = endpoints.connectProtocol(point, amp.AMP())
-    deferred.addCallbacks(_on_connect, errback)
+    deferred.addCallbacks(_on_connect, _on_connect_fail)
     reactor.run()
 
 
@@ -489,16 +511,33 @@ def send_status():
     Send ping to portal
 
     """
-    import time
-    t0 = time.time()
-    def _callback(status):
-        print("STATUS returned: %s (%gms)" % (status, (time.time()-t0) * 1000))
+    def _callback(response):
+        pstatus, sstatus = response['status'].split("|")
+        print("Portal:   {}\nServer:   {}".format(pstatus, sstatus))
 
-    def _errback(err):
-        print("STATUS returned: %s" % err)
+    def _errback(fail):
+        pstatus, sstatus = "NOT RUNNING", "NOT RUNNING"
+        print("Portal:   {}\nServer:   {}".format(pstatus, sstatus))
 
     send_instruction(PSTATUS, None, _callback, _errback)
 
+
+def send_repeating_status(callback=None):
+    """
+    Repeat the status ping until a reply is returned or timeout is reached.
+
+    Args:
+        callback (callable): Takes the response on a successful status-reply
+    """
+    def _callback(response):
+        pstatus, sstatus = response['status'].split("|")
+        print("Portal:   {}\nServer:   {}".format(pstatus, sstatus))
+
+    def _errback(fail):
+        send_instruction(PSTATUS, None, _callback, _errback)
+
+    send_instruction(PSTATUS, None, callback or _callback, _errback)
+
 # ------------------------------------------------------------
 #
 #  Helper functions
@@ -506,6 +545,118 @@ def send_status():
 # ------------------------------------------------------------
 
 
+def get_twistd_cmdline(pprofiler, sprofiler):
+
+    portal_cmd = [TWISTED_BINARY,
+                  "--logfile={}".format(PORTAL_LOGFILE),
+                  "--python={}".format(PORTAL_PY_FILE)]
+    server_cmd = [TWISTED_BINARY,
+                  "--logfile={}".format(PORTAL_LOGFILE),
+                  "--python={}".format(PORTAL_PY_FILE)]
+    if pprofiler:
+        portal_cmd.extend(["--savestats",
+                           "--profiler=cprofiler",
+                           "--profile={}".format(PPROFILER_LOGFILE)])
+    if sprofiler:
+        server_cmd.extend(["--savestats",
+                           "--profiler=cprofiler",
+                           "--profile={}".format(SPROFILER_LOGFILE)])
+    return portal_cmd, server_cmd
+
+
+def start_evennia(pprofiler=False, sprofiler=False):
+    """
+    This will start Evennia anew by launching the Evennia Portal (which in turn
+    will start the Server)
+
+    """
+    portal_cmd, server_cmd = get_twistd_cmdline(pprofiler, sprofiler)
+
+    def _portal_running(response):
+        _, server_running = [stat == 'RUNNING' for stat in response['status'].split("|")]
+        print("Portal is already running as process {pid}. Not restarted.".format(pid=0))  # TODO PID
+        if server_running:
+            print("Server is already running as process {pid}. Not restarted.".format(pid=0))  # TODO PID
+        else:
+            print("Server starting {}...".format("(under cProfile)" if pprofiler else ""))
+            send_instruction(SSTART, server_cmd, lambda x: 0, lambda e: 0)  # TODO
+
+    def _portal_cold_started(response):
+        "Called once the portal is up after a cold boot. It needs to know how to start the Server."
+        send_instruction(SSTART, server_cmd, lambda x: 0, lambda e: 0)  # TODO
+
+    def _portal_not_running(fail):
+        print("Portal starting {}...".format("(under cProfile)" if sprofiler else ""))
+        try:
+            Popen(portal_cmd)
+        except Exception as e:
+            print(PROCESS_ERROR.format(component="Portal", traceback=e))
+        send_repeating_status(_portal_cold_started)
+
+    # first, check if the portal/server is running already
+    send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
+
+
+def reload_evennia(sprofiler=False):
+    """
+    This will instruct the Portal to reboot the Server component.
+
+    """
+    _, server_cmd = get_twistd_cmdline(False, sprofiler)
+
+    def _portal_running(response):
+        _, server_running = [stat == 'RUNNING' for stat in response['status'].split("|")]
+        if server_running:
+            print("Server reloading ...")
+        else:
+            print("Server down. Starting anew.")
+        send_instruction(SRELOAD, server_cmd, lambda x: 0, lambda e: 0)  # TODO
+
+    def _portal_not_running(fail):
+        print("Evennia not running. Starting from scratch ...")
+        start_evennia()
+
+    # get portal status
+    send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
+
+
+def stop_evennia():
+    """
+    This instructs the Portal to stop the Server and then itself.
+
+    """
+    def _portal_running(response):
+        _, server_running = [stat == 'RUNNING' for stat in response['status'].split("|")]
+        print("Portal stopping ...")
+        if server_running:
+            print("Server stopping ...")
+        send_instruction(PSHUTD, {}, lambda x: 0, lambda e: 0)  # TODO
+
+    def _portal_not_running(fail):
+        print("Evennia is not running.")
+
+    send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
+
+
+def stop_server_only():
+    """
+    Only stop the Server-component of Evennia (this is not useful except for debug)
+
+    """
+    def _portal_running(response):
+        _, server_running = [stat == 'RUNNING' for stat in response['status'].split("|")]
+        if server_running:
+            print("Server stopping ...")
+            send_instruction(SSHUTD, {}, lambda x: 0, lambda e: 0)  # TODO
+        else:
+            print("Server is not running.")
+
+    def _portal_not_running(fail):
+        print("Evennia is not running.")
+
+    send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
+
+
 def evennia_version():
     """
     Get the Evennia version info from the main package.
@@ -645,10 +796,10 @@ def create_settings_file(init=True, secret_settings=False):
         if os.path.exists(settings_path):
             inp = input("%s already exists. Do you want to reset it? y/[N]> " % settings_path)
             if not inp.lower() == 'y':
-                print ("Aborted.")
+                print("Aborted.")
                 return
             else:
-                print ("Reset the settings file.")
+                print("Reset the settings file.")
 
         default_settings_path = os.path.join(EVENNIA_TEMPLATE, "server", "conf", "settings.py")
         shutil.copy(default_settings_path, settings_path)
@@ -912,7 +1063,7 @@ def error_check_python_modules():
     _imp(settings.COMMAND_PARSER)
     _imp(settings.SEARCH_AT_RESULT)
     _imp(settings.CONNECTION_SCREEN_MODULE)
-    #imp(settings.AT_INITIAL_SETUP_HOOK_MODULE, split=False)
+    # imp(settings.AT_INITIAL_SETUP_HOOK_MODULE, split=False)
     for path in settings.LOCK_FUNC_MODULES:
         _imp(path, split=False)
 
@@ -1280,7 +1431,7 @@ def server_operation(mode, service, interactive, profiler, logserver=False, doex
 
     elif mode == 'stop':
         if os.name == "nt":
-            print (
+            print(
                 "(Obs: You can use a single Ctrl-C to skip "
                 "Windows' annoying 'Terminate batch job (Y/N)?' prompts.)")
         # stop processes, avoiding reload
@@ -1357,7 +1508,8 @@ def main():
         default=None, help='Get current server status.')
     parser.epilog = (
         "Common usage: evennia start|stop|reload. Django-admin database commands:"
-        "evennia migration|flush|shell|dbshell (see the django documentation for more django-admin commands.)")
+        "evennia migration|flush|shell|dbshell (see the django documentation for more "
+        "django-admin commands.)")
 
     args, unknown_args = parser.parse_known_args()
 
@@ -1422,10 +1574,20 @@ def main():
         # launch menu for operation
         init_game_directory(CURRENT_DIR, check_db=True)
         run_menu()
-    elif option in ('start', 'reload', 'stop'):
+    elif option in ('sstart', 'sreload', 'sstop', 'ssstop', 'start', 'reload', 'stop'):
         # operate the server directly
         init_game_directory(CURRENT_DIR, check_db=True)
-        server_operation(option, service, args.interactive, args.profiler, args.logserver, doexit=args.doexit)
+        if option == "sstart":
+            start_evennia(False, args.profiler)
+        elif option == 'sreload':
+            reload_evennia(args.profiler)
+        elif option == 'sstop':
+            stop_evennia()
+        elif option == 'ssstop':
+            stop_server_only()
+        else:
+            server_operation(option, service, args.interactive,
+                             args.profiler, args.logserver, doexit=args.doexit)
     elif option != "noop":
         # pass-through to django manager
         check_db = False
diff --git a/evennia/server/evennia_runner.py b/evennia/server/evennia_runner.py
index 83e7bf4093..27fc187211 100644
--- a/evennia/server/evennia_runner.py
+++ b/evennia/server/evennia_runner.py
@@ -63,10 +63,6 @@ CMDLINE_HELP = \
     are stored in the game's server/ directory.
     """
 
-PROCESS_ERROR = \
-    """
-    {component} process error: {traceback}.
-    """
 
 PROCESS_IOERROR = \
     """
diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py
index 1578b8f1f4..fc6848a577 100644
--- a/evennia/server/portal/amp.py
+++ b/evennia/server/portal/amp.py
@@ -38,9 +38,10 @@ SCONN = chr(11)        # server creating new connection (for irc bots and etc)
 PCONNSYNC = chr(12)    # portal post-syncing a session
 PDISCONNALL = chr(13)  # portal session disconnect all
 SRELOAD = chr(14)      # server reloading (have portal start a new server)
-PSTART = chr(15)       # server+portal start
+SSTART = chr(15)       # server start (portal must already be running anyway)
 PSHUTD = chr(16)       # portal (+server) shutdown
-PSTATUS = chr(17)      # ping server or portal status
+SSHUTD = chr(17)       # server-only shutdown
+PSTATUS = chr(18)      # ping server or portal status
 
 AMP_MAXLEN = amp.MAX_VALUE_LENGTH    # max allowed data length in AMP protocol (cannot be changed)
 BATCH_RATE = 250     # max commands/sec before switching to batch-sending
@@ -150,7 +151,7 @@ class MsgLauncher2Portal(amp.Command):
     """
     key = "MsgLauncher2Portal"
     arguments = [('operation', amp.String()),
-                 ('argument', amp.String())]
+                 ('arguments', amp.String())]
     errors = {Exception: 'EXCEPTION'}
     response = [('result', amp.String())]
 
@@ -210,8 +211,8 @@ class MsgStatus(amp.Command):
     Check Status between AMP services
 
     """
-    key = "AMPPing"
-    arguments = [('question', amp.String())]
+    key = "MsgStatus"
+    arguments = [('status', amp.String())]
     errors = {Exception: 'EXCEPTION'}
     response = [('status', amp.String())]
 
@@ -342,23 +343,6 @@ class AMPMultiConnectionProtocol(amp.AMP):
                                                     self.errback, command.key))
         return DeferredList(deferreds)
 
-    def send_status(self, port, callback, errback):
-        """
-        Ping to the given AMP port.
-
-        Args:
-            port (int): The port to ping
-            callback (callable): This will be called with the port that replied to the ping.
-            errback (callable0: This will be called with the port that failed to reply.
-
-        """
-        targets = [(protcl, protcl.getHost()[1]) for protcl in self.factory.broadcasts]
-        deferreds = []
-        for protcl, port in ((protcl, prt) for protcl, prt in targets if prt == port):
-            deferreds.append(protcl.callRemote(MsgStatus, status=True).addCallback(
-                callback, port).addErrback(errback, port))
-        return DeferredList(deferreds)
-
     # generic function send/recvs
 
     def send_FunctionCall(self, modulepath, functionname, *args, **kwargs):
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 343680aa89..4b18e91c27 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -96,43 +96,61 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         """
         return self.data_out(amp.AdminPortal2Server, session.sessid, operation=operation, **kwargs)
 
-    def sendPingPortal2Server(self, callback):
-        """
-        Send ping to check if Server is alive.
-
-        """
-
     # receive amp data
 
     @amp.MsgStatus.responder
-    def portal_receive_status(self, question):
-        return {"status": "All well"}
+    @amp.catch_traceback
+    def portal_receive_status(self, status):
+        """
+        Check if Server is running
+        """
+        # check if the server is connected
+        server_connected = any(1 for prtcl in self.factory.broadcasts
+                               if prtcl is not self and prtcl.transport.connected)
+        # return portal|server RUNNING/NOT RUNNING
+        if server_connected:
+            return {"status": "RUNNING|RUNNING"}
+        else:
+            return {"status": "RUNNING|NOT RUNNING"}
 
     @amp.MsgLauncher2Portal.responder
     @amp.catch_traceback
-    def portal_receive_launcher2portal(self, operation, argument):
+    def portal_receive_launcher2portal(self, operation, arguments):
         """
         Receives message arriving from evennia_launcher.
         This method is executed on the Portal.
 
         Args:
             operation (str): The action to perform.
-            argument (str): A possible argument to the instruction, or the empty string.
+            arguments (str): Possible argument to the instruction, or the empty string.
 
         Returns:
             result (dict): The result back to the launcher.
 
         Notes:
-            This is the entrypoint for controlling the entire Evennia system from the
-            evennia launcher.
+            This is the entrypoint for controlling the entire Evennia system from the evennia
+            launcher. It can obviously only accessed when the Portal is already up and running.
 
         """
-        if operation == amp.PSTART:   # portal start (server start or reload)
-            pass
+        server_connected = any(1 for prtcl in self.factory.broadcasts
+                               if prtcl is not self and prtcl.transport.connected)
+
+        if operation == amp.SSTART:   # portal start (server start or reload)
+            # first, check if server is already running
+            if server_connected:
+                return {"result": "Server already running (PID {}).".format(0)}  # TODO store and send PID
+            else:
+                self.start_server(amp.loads(arguments))
+                return {"result": "Server started with PID {}.".format(0)}  # TODO
         elif operation == amp.SRELOAD:  # reload server
-            pass
+            if server_connected:
+                self.reload_server(amp.loads(arguments))
+            else:
+                self.start_server(amp.loads(arguments))
         elif operation == amp.PSHUTD:  # portal + server shutdown
-            pass
+            if server_connected:
+                self.stop_server(amp.loads(arguments))
+            self.factory.portal.shutdown(restart=False)
         else:
             raise Exception("operation %(op)s not recognized." % {'op': operation})
         # fallback

From 1b9e5f21c40ef7c82b2d587351e0e54a4faaa493 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 13 Jan 2018 23:01:23 +0100
Subject: [PATCH 043/217] Working launcher sends, no reception on server side
 yet

---
 evennia/server/evennia_launcher.py  | 152 ++++++++++++++++++++++------
 evennia/server/portal/amp_server.py |  15 ++-
 2 files changed, 130 insertions(+), 37 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index a9452ae785..99eab5bb84 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -81,6 +81,8 @@ ENFORCED_SETTING = False
 
 # communication constants
 
+AMP_CONNECTION = None
+
 SRELOAD = chr(14)      # server reloading (have portal start a new server)
 SSTART = chr(15)       # server start
 PSHUTD = chr(16)       # portal (+server) shutdown
@@ -461,11 +463,13 @@ class MsgLauncher2Portal(amp.Command):
     response = [('result', amp.String())]
 
 
-def send_instruction(instruction, arguments, callback, errback):
+def send_instruction(operation, arguments, callback=None, errback=None, autostop=False):
     """
     Send instruction and handle the response.
 
     """
+    global AMP_CONNECTION
+
     if None in (AMP_HOST, AMP_PORT, AMP_INTERFACE):
         print(ERROR_AMP_UNCONFIGURED)
         sys.exit()
@@ -477,36 +481,42 @@ def send_instruction(instruction, arguments, callback, errback):
 
         """
         def _callback(result):
-            callback(result)
+            if callback:
+                callback(result)
             prot.transport.loseConnection()
-            reactor.stop()
+            if autostop:
+                reactor.stop()
 
         def _errback(fail):
-            errback(fail)
+            if errback:
+                errback(fail)
             prot.transport.loseConnection()
-            reactor.stop()
+            if autostop:
+                reactor.stop()
 
-        if instruction == PSTATUS:
+        if operation == PSTATUS:
             prot.callRemote(MsgStatus, status="").addCallbacks(_callback, _errback)
         else:
+            print("callRemote MsgLauncher %s %s" % (ord(operation), arguments))
             prot.callRemote(
                 MsgLauncher2Portal,
-                instruction=instruction,
-                arguments=pickle.dumps(arguments, pickle.HIGHEST_PROTOCOL).addCallbacks(
-                    _callback, _errback))
+                operation=operation,
+                arguments=pickle.dumps(arguments, pickle.HIGHEST_PROTOCOL)).addCallbacks(
+                    _callback, _errback)
 
     def _on_connect_fail(fail):
         "This is called if portal is not reachable."
         errback(fail)
-        reactor.stop()
+        if autostop:
+            reactor.stop()
 
     point = endpoints.TCP4ClientEndpoint(reactor, AMP_HOST, AMP_PORT)
     deferred = endpoints.connectProtocol(point, amp.AMP())
     deferred.addCallbacks(_on_connect, _on_connect_fail)
-    reactor.run()
+    return deferred
 
 
-def send_status():
+def send_status(repeat=False):
     """
     Send ping to portal
 
@@ -519,24 +529,70 @@ def send_status():
         pstatus, sstatus = "NOT RUNNING", "NOT RUNNING"
         print("Portal:   {}\nServer:   {}".format(pstatus, sstatus))
 
-    send_instruction(PSTATUS, None, _callback, _errback)
+    send_instruction(PSTATUS, None, _callback, _errback, autostop=True)
+    reactor.run()
 
 
-def send_repeating_status(callback=None):
+def wait_for_status(portal_running=True, server_running=True, callback=None, errback=None,
+                    rate=0.5, retries=20):
     """
-    Repeat the status ping until a reply is returned or timeout is reached.
+    Repeat the status ping until the desired state combination is achieved.
 
     Args:
-        callback (callable): Takes the response on a successful status-reply
+        portal_running (bool or None): Desired portal run-state. If None, any state is accepted.
+        server_running (bool or None): Desired server run-state. If None, any state is accepted.
+            the portal must be running.
+        callback (callable): Will be called with portal_state, server_state when
+            condition is fulfilled.
+        errback (callable): Will be called with portal_state, server_state if the
+            request is timed out.
+        rate (float): How often to retry.
+        retries (int): How many times to retry before timing out and calling `errback`.
     """
     def _callback(response):
-        pstatus, sstatus = response['status'].split("|")
-        print("Portal:   {}\nServer:   {}".format(pstatus, sstatus))
+        prun, srun = [stat == 'RUNNING' for stat in response['status'].split("|")]
+        if ((portal_running is None or prun == portal_running) and
+            (server_running is None or srun == server_running)):
+            # the correct state was achieved
+            if callback:
+                callback(prun, srun)
+            else:
+                reactor.stop()
+        else:
+            if retries <= 0:
+                if errback:
+                    errback(prun, srun)
+                else:
+                    print("Timeout.")
+                    reactor.stop()
+            else:
+                reactor.callLater(rate, wait_for_status,
+                                  portal_running, server_running,
+                                  callback, errback, rate, retries - 1)
 
     def _errback(fail):
-        send_instruction(PSTATUS, None, _callback, _errback)
+        """
+        Portal not running
+        """
+        if not portal_running:
+            # this is what we want
+            if callback:
+                callback(portal_running, server_running)
+            else:
+                reactor.stop()
+        else:
+            if retries <= 0:
+                if errback:
+                    errback(portal_running, server_running)
+                else:
+                    print("Timeout.")
+                    reactor.stop()
+            else:
+                reactor.callLater(rate, wait_for_status,
+                                  portal_running, server_running,
+                                  callback, errback, rate, retries - 1)
 
-    send_instruction(PSTATUS, None, callback or _callback, _errback)
+    return send_instruction(PSTATUS, None, _callback, _errback)
 
 # ------------------------------------------------------------
 #
@@ -572,18 +628,22 @@ def start_evennia(pprofiler=False, sprofiler=False):
     """
     portal_cmd, server_cmd = get_twistd_cmdline(pprofiler, sprofiler)
 
+    def _server_started(*args):
+        print("... Server started.\nEvennia running.")
+        reactor.stop()
+
+    def _portal_started(*args):
+        send_instruction(SSTART, server_cmd, _server_started)
+
     def _portal_running(response):
         _, server_running = [stat == 'RUNNING' for stat in response['status'].split("|")]
         print("Portal is already running as process {pid}. Not restarted.".format(pid=0))  # TODO PID
         if server_running:
             print("Server is already running as process {pid}. Not restarted.".format(pid=0))  # TODO PID
+            reactor.stop()
         else:
             print("Server starting {}...".format("(under cProfile)" if pprofiler else ""))
-            send_instruction(SSTART, server_cmd, lambda x: 0, lambda e: 0)  # TODO
-
-    def _portal_cold_started(response):
-        "Called once the portal is up after a cold boot. It needs to know how to start the Server."
-        send_instruction(SSTART, server_cmd, lambda x: 0, lambda e: 0)  # TODO
+            send_instruction(SSTART, server_cmd, _server_started)
 
     def _portal_not_running(fail):
         print("Portal starting {}...".format("(under cProfile)" if sprofiler else ""))
@@ -591,10 +651,10 @@ def start_evennia(pprofiler=False, sprofiler=False):
             Popen(portal_cmd)
         except Exception as e:
             print(PROCESS_ERROR.format(component="Portal", traceback=e))
-        send_repeating_status(_portal_cold_started)
+        wait_for_status(True, None, _portal_started)
 
-    # first, check if the portal/server is running already
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
+    reactor.run()
 
 
 def reload_evennia(sprofiler=False):
@@ -604,13 +664,22 @@ def reload_evennia(sprofiler=False):
     """
     _, server_cmd = get_twistd_cmdline(False, sprofiler)
 
+    def _server_restarted(*args):
+        print("... Server re-started.", args)
+        reactor.stop()
+
+    def _server_reloaded(*args):
+        print("... Server reloaded.", args)
+        reactor.stop()
+
     def _portal_running(response):
         _, server_running = [stat == 'RUNNING' for stat in response['status'].split("|")]
         if server_running:
             print("Server reloading ...")
+            send_instruction(SRELOAD, server_cmd, _server_reloaded)
         else:
-            print("Server down. Starting anew.")
-        send_instruction(SRELOAD, server_cmd, lambda x: 0, lambda e: 0)  # TODO
+            print("Server down. Re-starting ...")
+            send_instruction(SSTART, server_cmd, _server_restarted)
 
     def _portal_not_running(fail):
         print("Evennia not running. Starting from scratch ...")
@@ -618,6 +687,7 @@ def reload_evennia(sprofiler=False):
 
     # get portal status
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
+    reactor.run()
 
 
 def stop_evennia():
@@ -625,17 +695,29 @@ def stop_evennia():
     This instructs the Portal to stop the Server and then itself.
 
     """
+    def _portal_stopped(*args):
+        print("... Portal stopped.\nEvennia shut down.")
+        reactor.stop()
+
+    def _server_stopped(*args):
+        print("... Server stopped.", args)
+        send_instruction(PSHUTD, {})
+        wait_for_status(False, None, _portal_stopped)
+
     def _portal_running(response):
         _, server_running = [stat == 'RUNNING' for stat in response['status'].split("|")]
-        print("Portal stopping ...")
         if server_running:
             print("Server stopping ...")
-        send_instruction(PSHUTD, {}, lambda x: 0, lambda e: 0)  # TODO
+            send_instruction(SSHUTD, {}, _server_stopped)
+        else:
+            send_instruction(PSHUTD, {})
+            wait_for_status(False, False, _portal_stopped)
 
     def _portal_not_running(fail):
         print("Evennia is not running.")
 
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
+    reactor.run()
 
 
 def stop_server_only():
@@ -643,11 +725,16 @@ def stop_server_only():
     Only stop the Server-component of Evennia (this is not useful except for debug)
 
     """
+    def _server_stopped(*args):
+        print("... Server stopped.")
+        reactor.stop()
+
     def _portal_running(response):
         _, server_running = [stat == 'RUNNING' for stat in response['status'].split("|")]
         if server_running:
             print("Server stopping ...")
-            send_instruction(SSHUTD, {}, lambda x: 0, lambda e: 0)  # TODO
+            send_instruction(SSHUTD, {})
+            wait_for_status(True, False, _server_stopped)
         else:
             print("Server is not running.")
 
@@ -655,6 +742,7 @@ def stop_server_only():
         print("Evennia is not running.")
 
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
+    reactor.run()
 
 
 def evennia_version():
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 4b18e91c27..a9b27f639c 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -59,11 +59,12 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         """
         super(AMPServerProtocol, self).connectionMade()
 
-        sessdata = self.factory.portal.sessions.get_all_sync_data()
-        self.send_AdminPortal2Server(amp.DUMMYSESSION,
-                                     amp.PSYNC,
-                                     sessiondata=sessdata)
-        self.factory.portal.sessions.at_server_connection()
+        if len(self.factory.broadcasts) < 2:
+            sessdata = self.factory.portal.sessions.get_all_sync_data()
+            self.send_AdminPortal2Server(amp.DUMMYSESSION,
+                                         amp.PSYNC,
+                                         sessiondata=sessdata)
+            self.factory.portal.sessions.at_server_connection()
 
     # sending amp data
 
@@ -135,6 +136,10 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         server_connected = any(1 for prtcl in self.factory.broadcasts
                                if prtcl is not self and prtcl.transport.connected)
 
+        print("AMP SERVER operation == %s received" % (ord(operation)))
+        print("AMP SERVER arguments: %s" % (amp.loads(arguments)))
+        return {"result": "Received."}
+
         if operation == amp.SSTART:   # portal start (server start or reload)
             # first, check if server is already running
             if server_connected:

From b2f4348049f0ac9a6ddee3bad0efa55a2791bd73 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 14 Jan 2018 00:30:13 +0100
Subject: [PATCH 044/217] Further work on controlling the portal with AMP

---
 evennia/server/evennia_launcher.py  | 113 +++++++++++++++-------------
 evennia/server/portal/amp.py        |   3 +-
 evennia/server/portal/amp_server.py |  52 +++++++++++--
 evennia/server/portal/portal.py     |   2 +
 evennia/server/server.py            |   1 +
 5 files changed, 113 insertions(+), 58 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 99eab5bb84..806f51b621 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -463,7 +463,7 @@ class MsgLauncher2Portal(amp.Command):
     response = [('result', amp.String())]
 
 
-def send_instruction(operation, arguments, callback=None, errback=None, autostop=False):
+def send_instruction(operation, arguments, callback=None, errback=None):
     """
     Send instruction and handle the response.
 
@@ -484,20 +484,15 @@ def send_instruction(operation, arguments, callback=None, errback=None, autostop
             if callback:
                 callback(result)
             prot.transport.loseConnection()
-            if autostop:
-                reactor.stop()
 
         def _errback(fail):
             if errback:
                 errback(fail)
             prot.transport.loseConnection()
-            if autostop:
-                reactor.stop()
 
         if operation == PSTATUS:
             prot.callRemote(MsgStatus, status="").addCallbacks(_callback, _errback)
         else:
-            print("callRemote MsgLauncher %s %s" % (ord(operation), arguments))
             prot.callRemote(
                 MsgLauncher2Portal,
                 operation=operation,
@@ -507,8 +502,6 @@ def send_instruction(operation, arguments, callback=None, errback=None, autostop
     def _on_connect_fail(fail):
         "This is called if portal is not reachable."
         errback(fail)
-        if autostop:
-            reactor.stop()
 
     point = endpoints.TCP4ClientEndpoint(reactor, AMP_HOST, AMP_PORT)
     deferred = endpoints.connectProtocol(point, amp.AMP())
@@ -516,20 +509,55 @@ def send_instruction(operation, arguments, callback=None, errback=None, autostop
     return deferred
 
 
-def send_status(repeat=False):
+def _parse_status(response):
+    "Unpack the status information"
+    return pickle.loads(response['status'])
+
+
+def _get_twistd_cmdline(pprofiler, sprofiler):
     """
-    Send ping to portal
+    Compile the command line for starting a Twisted application using the 'twistd' executable.
 
     """
+
+    portal_cmd = [TWISTED_BINARY,
+                  "--logfile={}".format(PORTAL_LOGFILE),
+                  "--python={}".format(PORTAL_PY_FILE)]
+    server_cmd = [TWISTED_BINARY,
+                  "--logfile={}".format(PORTAL_LOGFILE),
+                  "--python={}".format(PORTAL_PY_FILE)]
+    if pprofiler:
+        portal_cmd.extend(["--savestats",
+                           "--profiler=cprofiler",
+                           "--profile={}".format(PPROFILER_LOGFILE)])
+    if sprofiler:
+        server_cmd.extend(["--savestats",
+                           "--profiler=cprofiler",
+                           "--profile={}".format(SPROFILER_LOGFILE)])
+    return portal_cmd, server_cmd
+
+
+def query_status(repeat=False):
+    """
+    Send status ping to portal
+
+    """
+    wmap = {True: "RUNNING",
+            False: "NOT RUNNING"}
+
     def _callback(response):
-        pstatus, sstatus = response['status'].split("|")
-        print("Portal:   {}\nServer:   {}".format(pstatus, sstatus))
+        pstatus, sstatus, ppid, spid = _parse_status(response)
+        print("Portal:   {} (pid {})\nServer:   {} (pid {})".format(
+            wmap[pstatus], ppid, wmap[sstatus], spid))
+        reactor.stop()
 
     def _errback(fail):
-        pstatus, sstatus = "NOT RUNNING", "NOT RUNNING"
-        print("Portal:   {}\nServer:   {}".format(pstatus, sstatus))
+        print("status fail: %s", fail)
+        pstatus, sstatus = False, False
+        print("Portal:   {}\nServer:   {}".format(wmap[pstatus], wmap[sstatus]))
+        reactor.stop()
 
-    send_instruction(PSTATUS, None, _callback, _errback, autostop=True)
+    send_instruction(PSTATUS, None, _callback, _errback)
     reactor.run()
 
 
@@ -550,7 +578,7 @@ def wait_for_status(portal_running=True, server_running=True, callback=None, err
         retries (int): How many times to retry before timing out and calling `errback`.
     """
     def _callback(response):
-        prun, srun = [stat == 'RUNNING' for stat in response['status'].split("|")]
+        prun, srun, _, _ = _parse_status(response)
         if ((portal_running is None or prun == portal_running) and
             (server_running is None or srun == server_running)):
             # the correct state was achieved
@@ -594,52 +622,34 @@ def wait_for_status(portal_running=True, server_running=True, callback=None, err
 
     return send_instruction(PSTATUS, None, _callback, _errback)
 
+
+
 # ------------------------------------------------------------
 #
-#  Helper functions
+#  Operational functions
 #
 # ------------------------------------------------------------
 
-
-def get_twistd_cmdline(pprofiler, sprofiler):
-
-    portal_cmd = [TWISTED_BINARY,
-                  "--logfile={}".format(PORTAL_LOGFILE),
-                  "--python={}".format(PORTAL_PY_FILE)]
-    server_cmd = [TWISTED_BINARY,
-                  "--logfile={}".format(PORTAL_LOGFILE),
-                  "--python={}".format(PORTAL_PY_FILE)]
-    if pprofiler:
-        portal_cmd.extend(["--savestats",
-                           "--profiler=cprofiler",
-                           "--profile={}".format(PPROFILER_LOGFILE)])
-    if sprofiler:
-        server_cmd.extend(["--savestats",
-                           "--profiler=cprofiler",
-                           "--profile={}".format(SPROFILER_LOGFILE)])
-    return portal_cmd, server_cmd
-
-
 def start_evennia(pprofiler=False, sprofiler=False):
     """
     This will start Evennia anew by launching the Evennia Portal (which in turn
     will start the Server)
 
     """
-    portal_cmd, server_cmd = get_twistd_cmdline(pprofiler, sprofiler)
+    portal_cmd, server_cmd = _get_twistd_cmdline(pprofiler, sprofiler)
 
     def _server_started(*args):
-        print("... Server started.\nEvennia running.")
+        print("... Server started.\nEvennia running.", args)
         reactor.stop()
 
     def _portal_started(*args):
         send_instruction(SSTART, server_cmd, _server_started)
 
     def _portal_running(response):
-        _, server_running = [stat == 'RUNNING' for stat in response['status'].split("|")]
-        print("Portal is already running as process {pid}. Not restarted.".format(pid=0))  # TODO PID
-        if server_running:
-            print("Server is already running as process {pid}. Not restarted.".format(pid=0))  # TODO PID
+        prun, srun, ppid, spid = _parse_status(response)
+        print("Portal is already running as process {pid}. Not restarted.".format(pid=ppid))
+        if srun:
+            print("Server is already running as process {pid}. Not restarted.".format(pid=spid))
             reactor.stop()
         else:
             print("Server starting {}...".format("(under cProfile)" if pprofiler else ""))
@@ -648,7 +658,7 @@ def start_evennia(pprofiler=False, sprofiler=False):
     def _portal_not_running(fail):
         print("Portal starting {}...".format("(under cProfile)" if sprofiler else ""))
         try:
-            Popen(portal_cmd)
+            Popen(portal_cmd, env=getenv())
         except Exception as e:
             print(PROCESS_ERROR.format(component="Portal", traceback=e))
         wait_for_status(True, None, _portal_started)
@@ -662,7 +672,7 @@ def reload_evennia(sprofiler=False):
     This will instruct the Portal to reboot the Server component.
 
     """
-    _, server_cmd = get_twistd_cmdline(False, sprofiler)
+    _, server_cmd = _get_twistd_cmdline(False, sprofiler)
 
     def _server_restarted(*args):
         print("... Server re-started.", args)
@@ -673,8 +683,8 @@ def reload_evennia(sprofiler=False):
         reactor.stop()
 
     def _portal_running(response):
-        _, server_running = [stat == 'RUNNING' for stat in response['status'].split("|")]
-        if server_running:
+        _, srun, _, _ = _parse_status(response)
+        if srun:
             print("Server reloading ...")
             send_instruction(SRELOAD, server_cmd, _server_reloaded)
         else:
@@ -700,16 +710,17 @@ def stop_evennia():
         reactor.stop()
 
     def _server_stopped(*args):
-        print("... Server stopped.", args)
+        print("... Server stopped.\nStopping Portal ...", args)
         send_instruction(PSHUTD, {})
         wait_for_status(False, None, _portal_stopped)
 
     def _portal_running(response):
-        _, server_running = [stat == 'RUNNING' for stat in response['status'].split("|")]
-        if server_running:
+        prun, srun, ppid, spid = _parse_status(response)
+        if srun:
             print("Server stopping ...")
             send_instruction(SSHUTD, {}, _server_stopped)
         else:
+            print("Server already stopped.\nStopping Portal ...")
             send_instruction(PSHUTD, {})
             wait_for_status(False, False, _portal_stopped)
 
@@ -1647,7 +1658,7 @@ def main():
 
     if args.get_status:
         init_game_directory(CURRENT_DIR, check_db=True)
-        send_status()
+        query_status()
         sys.exit()
 
     if args.dummyrunner:
diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py
index fc6848a577..2887aab8ec 100644
--- a/evennia/server/portal/amp.py
+++ b/evennia/server/portal/amp.py
@@ -83,11 +83,12 @@ def catch_traceback(func):
     def decorator(*args, **kwargs):
         try:
             func(*args, **kwargs)
-        except Exception:
+        except Exception as err:
             global _LOGGER
             if not _LOGGER:
                 from evennia.utils import logger as _LOGGER
             _LOGGER.log_trace()
+            print("error", err)
             raise  # make sure the error is visible on the other side of the connection too
     return decorator
 
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index a9b27f639c..20a73a70a7 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -4,8 +4,25 @@ communication to the AMP clients connecting to it (by default
 these are the Evennia Server and the evennia launcher).
 
 """
+import os
+import sys
 from twisted.internet import protocol
 from evennia.server.portal import amp
+from subprocess import Popen
+
+
+def getenv():
+    """
+    Get current environment and add PYTHONPATH.
+
+    Returns:
+        env (dict): Environment global dict.
+
+    """
+    sep = ";" if os.name == 'nt' else ":"
+    env = os.environ.copy()
+    env['PYTHONPATH'] = sep.join(sys.path)
+    return env
 
 
 class AMPServerFactory(protocol.ServerFactory):
@@ -66,6 +83,20 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
                                          sessiondata=sessdata)
             self.factory.portal.sessions.at_server_connection()
 
+    def start_server(self, server_twistd_cmd):
+        """
+        (Re-)Launch the Evennia server.
+
+        Args:
+            server_twisted_cmd (list): The server start instruction
+                to pass to POpen to start the server.
+
+        """
+        # start the server
+        process = Popen(server_twistd_cmd, env=getenv())
+        # store the pid for future reference
+        self.portal.server_process_id = process.pid
+
     # sending amp data
 
     def send_MsgPortal2Server(self, session, **kwargs):
@@ -103,16 +134,25 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
     @amp.catch_traceback
     def portal_receive_status(self, status):
         """
-        Check if Server is running
+        Returns run-status for the server/portal.
+
+        Args:
+            status (str): Not used.
+        Returns:
+            status (dict): The status is a tuple
+                (portal_running, server_running, portal_pid, server_pid).
+
         """
         # check if the server is connected
         server_connected = any(1 for prtcl in self.factory.broadcasts
                                if prtcl is not self and prtcl.transport.connected)
-        # return portal|server RUNNING/NOT RUNNING
+        server_pid = self.factory.portal.server_process_id
+        portal_pid = os.getpid()
+
         if server_connected:
-            return {"status": "RUNNING|RUNNING"}
+            return {"status": amp.dumps((True, True, portal_pid, server_pid))}
         else:
-            return {"status": "RUNNING|NOT RUNNING"}
+            return {"status": amp.dumps((True, False, portal_pid, server_pid))}
 
     @amp.MsgLauncher2Portal.responder
     @amp.catch_traceback
@@ -140,10 +180,10 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         print("AMP SERVER arguments: %s" % (amp.loads(arguments)))
         return {"result": "Received."}
 
-        if operation == amp.SSTART:   # portal start (server start or reload)
+        if operation == amp.SSTART:   # portal start
             # first, check if server is already running
             if server_connected:
-                return {"result": "Server already running (PID {}).".format(0)}  # TODO store and send PID
+                return {"result": "Server already running at PID={}"}
             else:
                 self.start_server(amp.loads(arguments))
                 return {"result": "Server started with PID {}.".format(0)}  # TODO
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index 293d1d6db5..5d4c9aae19 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -105,6 +105,8 @@ class Portal(object):
         self.amp_protocol = None  # set by amp factory
         self.sessions = PORTAL_SESSIONS
         self.sessions.portal = self
+        self.process_id = os.getpid()
+        self.server_process_id = None
 
         # set a callback if the server is killed abruptly,
         # by Ctrl-C, reboot etc.
diff --git a/evennia/server/server.py b/evennia/server/server.py
index be282527f6..fab6d9675f 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -173,6 +173,7 @@ class Evennia(object):
         self.amp_protocol = None  # set by amp factory
         self.sessions = SESSIONS
         self.sessions.server = self
+        self.process_id = os.getpid()
 
         # Database-specific startup optimizations.
         self.sqlite3_prep()

From d51b1dff3fe9a48c2db00dd4d02877aa6a113ab6 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 14 Jan 2018 14:02:34 +0100
Subject: [PATCH 045/217] Parallel start/stop/reload systems, for testing

---
 evennia/commands/default/system.py  |  4 +-
 evennia/server/amp_client.py        | 27 +++++++---
 evennia/server/portal/amp.py        | 20 ++++++--
 evennia/server/portal/amp_server.py | 78 ++++++++++++++++++++---------
 evennia/server/sessionhandler.py    | 19 +++++--
 5 files changed, 109 insertions(+), 39 deletions(-)

diff --git a/evennia/commands/default/system.py b/evennia/commands/default/system.py
index fe5efa337d..7933245ae2 100644
--- a/evennia/commands/default/system.py
+++ b/evennia/commands/default/system.py
@@ -58,7 +58,7 @@ class CmdReload(COMMAND_DEFAULT_CLASS):
         if self.args:
             reason = "(Reason: %s) " % self.args.rstrip(".")
         SESSIONS.announce_all(" Server restart initiated %s..." % reason)
-        SESSIONS.server.shutdown(mode='reload')
+        SESSIONS.portal_restart_server()
 
 
 class CmdReset(COMMAND_DEFAULT_CLASS):
@@ -91,7 +91,7 @@ class CmdReset(COMMAND_DEFAULT_CLASS):
         Reload the system.
         """
         SESSIONS.announce_all(" Server resetting/restarting ...")
-        SESSIONS.server.shutdown(mode='reset')
+        SESSIONS.portal_reset_server()
 
 
 class CmdShutdown(COMMAND_DEFAULT_CLASS):
diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index a76245912b..bf6b3d9fc8 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -96,6 +96,16 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
     """
     # sending AMP data
 
+    def connectionMade(self):
+        """
+        Called when a new connection is established.
+
+        """
+        super(AMPServerClientProtocol, self).connectionMade()
+        # first thing we do is to request the Portal to sync all sessions
+        # back with the Server side
+        self.send_AdminServer2Portal(amp.DUMMYSESSION, operation=amp.PSYNC)
+
     def send_MsgServer2Portal(self, session, **kwargs):
         """
         Access method - executed on the Server for sending data
@@ -118,7 +128,7 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
             operation (char, optional): Identifier for the server
                 operation, as defined by the global variables in
                 `evennia/server/amp.py`.
-            data (str or dict, optional): Data going into the adminstrative.
+            kwargs (dict, optional): Data going into the adminstrative.
 
         """
         return self.data_out(amp.AdminServer2Portal, session.sessid, operation=operation, **kwargs)
@@ -180,12 +190,17 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
             server_sessionhandler.portal_disconnect_all()
 
         elif operation == amp.PSYNC:  # portal_session_sync
-            # force a resync of sessions when portal reconnects to
-            # server (e.g. after a server reboot) the data kwarg
-            # contains a dict {sessid: {arg1:val1,...}}
-            # representing the attributes to sync for each
-            # session.
+            # force a resync of sessions from the portal side
             server_sessionhandler.portal_sessions_sync(kwargs.get("sessiondata"))
+        elif operation == amp.SRELOAD:  # server reload
+            # shut down in reload mode
+            server_sessionhandler.server.shutdown(mode='reload')
+        elif operation == amp.SRESET:
+            # shut down in reset mode
+            server_sessionhandler.server.shutdown(mode='reset')
+        elif operation == amp.SSHUTD:  # server shutdown
+            # shutdown in stop mode
+            server_sessionhandler.server.shutdown(mode='shutdown')
         else:
             raise Exception("operation %(op)s not recognized." % {'op': operation})
         return {}
diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py
index 2887aab8ec..8f08b46b0f 100644
--- a/evennia/server/portal/amp.py
+++ b/evennia/server/portal/amp.py
@@ -37,11 +37,12 @@ SSYNC = chr(8)         # server session sync
 SCONN = chr(11)        # server creating new connection (for irc bots and etc)
 PCONNSYNC = chr(12)    # portal post-syncing a session
 PDISCONNALL = chr(13)  # portal session disconnect all
-SRELOAD = chr(14)      # server reloading (have portal start a new server)
+SRELOAD = chr(14)      # server shutdown in reload mode
 SSTART = chr(15)       # server start (portal must already be running anyway)
 PSHUTD = chr(16)       # portal (+server) shutdown
-SSHUTD = chr(17)       # server-only shutdown
+SSHUTD = chr(17)       # server shutdown
 PSTATUS = chr(18)      # ping server or portal status
+SRESET = chr(19)       # server shutdown in reset mode
 
 AMP_MAXLEN = amp.MAX_VALUE_LENGTH    # max allowed data length in AMP protocol (cannot be changed)
 BATCH_RATE = 250     # max commands/sec before switching to batch-sending
@@ -271,9 +272,22 @@ class AMPMultiConnectionProtocol(amp.AMP):
         else:
             super(AMPMultiConnectionProtocol, self).dataReceived(data)
 
+    def makeConnection(self, transport):
+        """
+        Swallow connection log message here. Copied from original
+        in the amp protocol.
+
+        """
+        # copied from original, removing the log message
+        if not self._ampInitialized:
+            amp.AMP.__init__(self)
+        self._transportPeer = transport.getPeer()
+        self._transportHost = transport.getHost()
+        amp.BinaryBoxProtocol.makeConnection(self, transport)
+
     def connectionMade(self):
         """
-        This is called when an AMP connection is (re-)established AMP calls it on both sides.
+        This is called when an AMP connection is (re-)established. AMP calls it on both sides.
 
         """
         self.factory.broadcasts.append(self)
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 20a73a70a7..8193ac0663 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -9,6 +9,7 @@ import sys
 from twisted.internet import protocol
 from evennia.server.portal import amp
 from subprocess import Popen
+from evennia.utils import logger
 
 
 def getenv():
@@ -69,20 +70,6 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
     Protocol subclass for the AMP-server run by the Portal.
 
     """
-    def connectionMade(self):
-        """
-        Called when a new connection is established.
-
-        """
-        super(AMPServerProtocol, self).connectionMade()
-
-        if len(self.factory.broadcasts) < 2:
-            sessdata = self.factory.portal.sessions.get_all_sync_data()
-            self.send_AdminPortal2Server(amp.DUMMYSESSION,
-                                         amp.PSYNC,
-                                         sessiondata=sessdata)
-            self.factory.portal.sessions.at_server_connection()
-
     def start_server(self, server_twistd_cmd):
         """
         (Re-)Launch the Evennia server.
@@ -92,10 +79,29 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
                 to pass to POpen to start the server.
 
         """
-        # start the server
+        # start the Server
         process = Popen(server_twistd_cmd, env=getenv())
         # store the pid for future reference
-        self.portal.server_process_id = process.pid
+        self.factory.portal.server_process_id = process.pid
+        self.factory.portal.server_twistd_cmd = server_twistd_cmd
+        return process.pid
+
+    def stop_server(self, mode='reload'):
+        """
+        Shut down server in one or more modes.
+
+        Args:
+            mode (str): One of 'shutdown', 'reload' or 'reset'.
+
+        """
+        if mode == 'reload':
+            self.send_AdminPortal2Server(amp.DUMMYSESSION, amp.SRELOAD)
+            return self.start_server(self.factory.portal.server_twistd_cmd)
+        if mode == 'reset':
+            self.send_AdminPortal2Server(amp.DUMMYSESSION, amp.SRESET)
+            return self.start_server(self.factory.portal.server_twistd_cmd)
+        if mode == 'shutdown':
+            self.send_AdminPortal2Server(amp.DUMMYSESSION, amp.SSHUTD)
 
     # sending amp data
 
@@ -173,28 +179,44 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
             launcher. It can obviously only accessed when the Portal is already up and running.
 
         """
+        def _retval(success, txt):
+            return {"result": amp.dumps((success, txt))}
+
         server_connected = any(1 for prtcl in self.factory.broadcasts
                                if prtcl is not self and prtcl.transport.connected)
+        server_pid = self.factory.portal.server_process_id
 
-        print("AMP SERVER operation == %s received" % (ord(operation)))
-        print("AMP SERVER arguments: %s" % (amp.loads(arguments)))
-        return {"result": "Received."}
+        logger.log_msg("AMP SERVER operation == %s received" % (ord(operation)))
+        logger.log_msg("AMP SERVER arguments: %s" % (amp.loads(arguments)))
 
         if operation == amp.SSTART:   # portal start
             # first, check if server is already running
             if server_connected:
-                return {"result": "Server already running at PID={}"}
+                return _retval(False,
+                               "Server already running at PID={spid}".format(spid=server_pid))
             else:
-                self.start_server(amp.loads(arguments))
-                return {"result": "Server started with PID {}.".format(0)}  # TODO
+                spid = self.start_server(amp.loads(arguments))
+                return _retval(True, "Server started with PID {spid}.".format(spid=spid))
         elif operation == amp.SRELOAD:  # reload server
             if server_connected:
-                self.reload_server(amp.loads(arguments))
+                spid = self.reload_server(amp.loads(arguments))
+                return _retval(True, "Server started with PID {spid}.".format(spid=spid))
             else:
                 self.start_server(amp.loads(arguments))
+                spid = self.start_server(amp.loads(arguments))
+                return _retval(True, "Server started with PID {spid}.".format(spid=spid))
+        elif operation == amp.SRESET:  # reload server
+            if server_connected:
+                spid = self.reload_server(amp.loads(arguments))
+                return _retval(True, "Server started with PID {spid}.".format(spid=spid))
+            else:
+                self.start_server(amp.loads(arguments))
+                spid = self.start_server(amp.loads(arguments))
+                return _retval(True, "Server started with PID {spid}.".format(spid=spid))
         elif operation == amp.PSHUTD:  # portal + server shutdown
             if server_connected:
-                self.stop_server(amp.loads(arguments))
+                self.stop_server()
+                return _retval(True, "Server stopped.")
             self.factory.portal.shutdown(restart=False)
         else:
             raise Exception("operation %(op)s not recognized." % {'op': operation})
@@ -257,6 +279,14 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         elif operation == amp.SRELOAD:  # server reload
             self.factory.portal.server_reload(**kwargs)
 
+        elif operation == amp.PSYNC:  # portal sync
+            # Server has (re-)connected and wants the session data from portal
+            sessdata = self.factory.portal.sessions.get_all_sync_data()
+            self.send_AdminPortal2Server(amp.DUMMYSESSION,
+                                         amp.PSYNC,
+                                         sessiondata=sessdata)
+            self.factory.portal.sessions.at_server_connection()
+
         elif operation == amp.SSYNC:  # server_session_sync
             # server wants to save session data to the portal,
             # maybe because it's about to shut down.
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index 9862f03421..20e4cd677e 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -59,7 +59,11 @@ SCONN = chr(11)        # server portal connection (for bots)
 PCONNSYNC = chr(12)   # portal post-syncing session
 PDISCONNALL = chr(13)  # portal session discnnect all
 SRELOAD = chr(14)      # server reloading (have portal start a new server)
-
+SSTART = chr(15)       # server start (portal must already be running anyway)
+PSHUTD = chr(16)       # portal (+server) shutdown
+SSHUTD = chr(17)       # server shutdown
+PSTATUS = chr(18)      # ping server or portal status
+SRESET = chr(19)       # server shutdown in reset mode
 
 # i18n
 from django.utils.translation import ugettext as _
@@ -439,10 +443,19 @@ class ServerSessionHandler(SessionHandler):
         Called by server when reloading. We tell the portal to start a new server instance.
 
         """
+        self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION, operation=SRELOAD)
+
+    def portal_reset_server(self):
+        """
+        Called by server when reloading. We tell the portal to start a new server instance.
+
+        """
+        self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION, operation=SRESET)
 
     def portal_shutdown(self):
         """
-        Called by server when shutting down the portal (usually because server is going down too).
+        Called by server when it's time to shut down (the portal will shut us down and then shut
+        itself down)
 
         """
         self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION,
@@ -572,8 +585,6 @@ class ServerSessionHandler(SessionHandler):
                                                                 sessiondata=session_data,
                                                                 clean=False)
 
-
-
     def disconnect_all_sessions(self, reason="You have been disconnected."):
         """
         Cleanly disconnect all of the connected sessions.

From ded5d106b9b77d8d153700f01b7fac6b9190ff8d Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 14 Jan 2018 14:17:36 +0100
Subject: [PATCH 046/217] Cleanup of call signatures for reloading

---
 evennia/server/portal/amp_server.py | 36 +++++++++++++++++------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 8193ac0663..1163012371 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -86,7 +86,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         self.factory.portal.server_twistd_cmd = server_twistd_cmd
         return process.pid
 
-    def stop_server(self, mode='reload'):
+    def stop_server(self, mode='shutdown'):
         """
         Shut down server in one or more modes.
 
@@ -96,10 +96,8 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         """
         if mode == 'reload':
             self.send_AdminPortal2Server(amp.DUMMYSESSION, amp.SRELOAD)
-            return self.start_server(self.factory.portal.server_twistd_cmd)
         if mode == 'reset':
             self.send_AdminPortal2Server(amp.DUMMYSESSION, amp.SRESET)
-            return self.start_server(self.factory.portal.server_twistd_cmd)
         if mode == 'shutdown':
             self.send_AdminPortal2Server(amp.DUMMYSESSION, amp.SSHUTD)
 
@@ -199,23 +197,23 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
                 return _retval(True, "Server started with PID {spid}.".format(spid=spid))
         elif operation == amp.SRELOAD:  # reload server
             if server_connected:
-                spid = self.reload_server(amp.loads(arguments))
-                return _retval(True, "Server started with PID {spid}.".format(spid=spid))
+                self.stop(mode='reload')
+                spid = self.start_server(amp.loads(arguments))
+                return _retval(True, "Server restarted with PID {spid}.".format(spid=spid))
             else:
-                self.start_server(amp.loads(arguments))
                 spid = self.start_server(amp.loads(arguments))
                 return _retval(True, "Server started with PID {spid}.".format(spid=spid))
         elif operation == amp.SRESET:  # reload server
             if server_connected:
-                spid = self.reload_server(amp.loads(arguments))
-                return _retval(True, "Server started with PID {spid}.".format(spid=spid))
+                self.stop_server(mode='reset')
+                spid = self.start_server(amp.loads(arguments))
+                return _retval(True, "Server restarted with PID {spid}.".format(spid=spid))
             else:
-                self.start_server(amp.loads(arguments))
                 spid = self.start_server(amp.loads(arguments))
                 return _retval(True, "Server started with PID {spid}.".format(spid=spid))
         elif operation == amp.PSHUTD:  # portal + server shutdown
             if server_connected:
-                self.stop_server()
+                self.stop_server(mode='shutdown')
                 return _retval(True, "Server stopped.")
             self.factory.portal.shutdown(restart=False)
         else:
@@ -272,12 +270,20 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
             # server orders all sessions to disconnect
             portal_sessionhandler.server_disconnect_all(reason=kwargs.get("reason"))
 
-        elif operation == amp.SSHUTD:  # server_shutdown
-            # the server orders the portal to shut down
-            self.factory.portal.shutdown(restart=False)
-
         elif operation == amp.SRELOAD:  # server reload
-            self.factory.portal.server_reload(**kwargs)
+            self.stop_server(mode='reload')
+            self.start(self.factory.portal.server_twisted_cmd)
+
+        elif operation == amp.SRESET:  # server reset
+            self.stop_server(mode='reset')
+            self.start(self.factory.portal.server_twisted_cmd)
+
+        elif operation == amp.SSHUTD:  # server-only shutdown
+            self.stop_server(mode='shutdown')
+
+        elif operation == amp.PSHUTD:  # full server+server shutdown
+            self.stop_server(mode='shutdown')
+            self.factory.portal.shutdown()
 
         elif operation == amp.PSYNC:  # portal sync
             # Server has (re-)connected and wants the session data from portal

From 5656b841d6ec8fb347398aec6b372f5a9fa952a0 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 14 Jan 2018 22:53:36 +0100
Subject: [PATCH 047/217] Working start/reload/reset/stop from launcher

---
 evennia/server/amp_client.py        |  6 ++
 evennia/server/evennia_launcher.py  | 76 +++++++++++++---------
 evennia/server/evennia_runner.py    |  1 +
 evennia/server/portal/amp.py        |  2 +-
 evennia/server/portal/amp_server.py | 97 ++++++++++++++++++++++-------
 evennia/server/server.py            |  1 +
 evennia/utils/logger.py             |  9 +++
 7 files changed, 136 insertions(+), 56 deletions(-)

diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index bf6b3d9fc8..5c29825d23 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -192,15 +192,21 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
         elif operation == amp.PSYNC:  # portal_session_sync
             # force a resync of sessions from the portal side
             server_sessionhandler.portal_sessions_sync(kwargs.get("sessiondata"))
+
         elif operation == amp.SRELOAD:  # server reload
             # shut down in reload mode
+            server_sessionhandler.all_sessions_portal_sync()
             server_sessionhandler.server.shutdown(mode='reload')
+
         elif operation == amp.SRESET:
             # shut down in reset mode
+            server_sessionhandler.all_sessions_portal_sync()
             server_sessionhandler.server.shutdown(mode='reset')
+
         elif operation == amp.SSHUTD:  # server shutdown
             # shutdown in stop mode
             server_sessionhandler.server.shutdown(mode='shutdown')
+
         else:
             raise Exception("operation %(op)s not recognized." % {'op': operation})
         return {}
diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 806f51b621..c2d29ad961 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -19,7 +19,7 @@ import shutil
 import importlib
 from distutils.version import LooseVersion
 from argparse import ArgumentParser
-from subprocess import Popen, check_output, call, CalledProcessError, STDOUT
+from subprocess import Popen, check_output, call, CalledProcessError, STDOUT, PIPE
 
 try:
     import cPickle as pickle
@@ -88,6 +88,7 @@ SSTART = chr(15)       # server start
 PSHUTD = chr(16)       # portal (+server) shutdown
 SSHUTD = chr(17)       # server-only shutdown
 PSTATUS = chr(18)      # ping server or portal status
+SRESET = chr(19)      # shutdown server in reset mode
 
 # requirements
 PYTHON_MIN = '2.7'
@@ -519,13 +520,18 @@ def _get_twistd_cmdline(pprofiler, sprofiler):
     Compile the command line for starting a Twisted application using the 'twistd' executable.
 
     """
-
     portal_cmd = [TWISTED_BINARY,
                   "--logfile={}".format(PORTAL_LOGFILE),
                   "--python={}".format(PORTAL_PY_FILE)]
     server_cmd = [TWISTED_BINARY,
-                  "--logfile={}".format(PORTAL_LOGFILE),
-                  "--python={}".format(PORTAL_PY_FILE)]
+                  "--logfile={}".format(SERVER_LOGFILE),
+                  "--python={}".format(SERVER_PY_FILE)]
+
+    if os.name != 'nt':
+        # PID files only for UNIX
+        portal_cmd.append("--pidfile={}".format(PORTAL_PIDFILE))
+        server_cmd.append("--pidfile={}".format(SERVER_PIDFILE))
+
     if pprofiler:
         portal_cmd.extend(["--savestats",
                            "--profiler=cprofiler",
@@ -534,6 +540,8 @@ def _get_twistd_cmdline(pprofiler, sprofiler):
         server_cmd.extend(["--savestats",
                            "--profiler=cprofiler",
                            "--profile={}".format(SPROFILER_LOGFILE)])
+
+
     return portal_cmd, server_cmd
 
 
@@ -552,7 +560,6 @@ def query_status(repeat=False):
         reactor.stop()
 
     def _errback(fail):
-        print("status fail: %s", fail)
         pstatus, sstatus = False, False
         print("Portal:   {}\nServer:   {}".format(wmap[pstatus], wmap[sstatus]))
         reactor.stop()
@@ -591,7 +598,7 @@ def wait_for_status(portal_running=True, server_running=True, callback=None, err
                 if errback:
                     errback(prun, srun)
                 else:
-                    print("Timeout.")
+                    print("Connection to Evennia timed out. Try again.")
                     reactor.stop()
             else:
                 reactor.callLater(rate, wait_for_status,
@@ -613,7 +620,7 @@ def wait_for_status(portal_running=True, server_running=True, callback=None, err
                 if errback:
                     errback(portal_running, server_running)
                 else:
-                    print("Timeout.")
+                    print("Connection to Evennia timed out. Try again.")
                     reactor.stop()
             else:
                 reactor.callLater(rate, wait_for_status,
@@ -622,14 +629,13 @@ def wait_for_status(portal_running=True, server_running=True, callback=None, err
 
     return send_instruction(PSTATUS, None, _callback, _errback)
 
-
-
 # ------------------------------------------------------------
 #
 #  Operational functions
 #
 # ------------------------------------------------------------
 
+
 def start_evennia(pprofiler=False, sprofiler=False):
     """
     This will start Evennia anew by launching the Evennia Portal (which in turn
@@ -638,8 +644,12 @@ def start_evennia(pprofiler=False, sprofiler=False):
     """
     portal_cmd, server_cmd = _get_twistd_cmdline(pprofiler, sprofiler)
 
+    def _fail(fail):
+        print(fail)
+        reactor.stop()
+
     def _server_started(*args):
-        print("... Server started.\nEvennia running.", args)
+        print("... Server started.\nEvennia running.")
         reactor.stop()
 
     def _portal_started(*args):
@@ -653,21 +663,22 @@ def start_evennia(pprofiler=False, sprofiler=False):
             reactor.stop()
         else:
             print("Server starting {}...".format("(under cProfile)" if pprofiler else ""))
-            send_instruction(SSTART, server_cmd, _server_started)
+            send_instruction(SSTART, server_cmd, _server_started, _fail)
 
     def _portal_not_running(fail):
         print("Portal starting {}...".format("(under cProfile)" if sprofiler else ""))
         try:
-            Popen(portal_cmd, env=getenv())
+            Popen(portal_cmd, env=getenv(), bufsize=-1)
         except Exception as e:
             print(PROCESS_ERROR.format(component="Portal", traceback=e))
+            reactor.stop()
         wait_for_status(True, None, _portal_started)
 
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
     reactor.run()
 
 
-def reload_evennia(sprofiler=False):
+def reload_evennia(sprofiler=False, reset=False):
     """
     This will instruct the Portal to reboot the Server component.
 
@@ -675,18 +686,23 @@ def reload_evennia(sprofiler=False):
     _, server_cmd = _get_twistd_cmdline(False, sprofiler)
 
     def _server_restarted(*args):
-        print("... Server re-started.", args)
+        print("... Server re-started.")
         reactor.stop()
 
     def _server_reloaded(*args):
-        print("... Server reloaded.", args)
+        print("... Server {}.".format("reset" if reset else "reloaded"))
         reactor.stop()
 
+    def _server_not_running(*args):
+        send_instruction(SSTART, server_cmd)
+        wait_for_status(True, True, _server_reloaded)
+
     def _portal_running(response):
         _, srun, _, _ = _parse_status(response)
         if srun:
-            print("Server reloading ...")
-            send_instruction(SRELOAD, server_cmd, _server_reloaded)
+            print("Server {}...".format("resetting" if reset else "reloading"))
+            send_instruction(SRESET if reset else SRELOAD, server_cmd)
+            wait_for_status(True, False, _server_not_running)
         else:
             print("Server down. Re-starting ...")
             send_instruction(SSTART, server_cmd, _server_restarted)
@@ -710,7 +726,7 @@ def stop_evennia():
         reactor.stop()
 
     def _server_stopped(*args):
-        print("... Server stopped.\nStopping Portal ...", args)
+        print("... Server stopped.\nStopping Portal ...")
         send_instruction(PSHUTD, {})
         wait_for_status(False, None, _portal_stopped)
 
@@ -718,7 +734,8 @@ def stop_evennia():
         prun, srun, ppid, spid = _parse_status(response)
         if srun:
             print("Server stopping ...")
-            send_instruction(SSHUTD, {}, _server_stopped)
+            send_instruction(SSHUTD, {})
+            wait_for_status(True, False, _server_stopped)
         else:
             print("Server already stopped.\nStopping Portal ...")
             send_instruction(PSHUTD, {})
@@ -726,6 +743,7 @@ def stop_evennia():
 
     def _portal_not_running(fail):
         print("Evennia is not running.")
+        reactor.stop()
 
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
     reactor.run()
@@ -741,8 +759,8 @@ def stop_server_only():
         reactor.stop()
 
     def _portal_running(response):
-        _, server_running = [stat == 'RUNNING' for stat in response['status'].split("|")]
-        if server_running:
+        _, srun, _, _ = _parse_status(response)
+        if srun:
             print("Server stopping ...")
             send_instruction(SSHUTD, {})
             wait_for_status(True, False, _server_stopped)
@@ -1239,7 +1257,7 @@ def init_game_directory(path, check_db=True):
     AMP_INTERFACE = settings.AMP_INTERFACE
 
     SERVER_PY_FILE = os.path.join(EVENNIA_LIB, "server", "server.py")
-    PORTAL_PY_FILE = os.path.join(EVENNIA_LIB, "portal", "portal", "portal.py")
+    PORTAL_PY_FILE = os.path.join(EVENNIA_LIB, "server", "portal", "portal.py")
 
     SERVER_PIDFILE = os.path.join(GAMEDIR, SERVERDIR, "server.pid")
     PORTAL_PIDFILE = os.path.join(GAMEDIR, SERVERDIR, "portal.pid")
@@ -1602,9 +1620,6 @@ def main():
         "service", metavar="component", nargs='?', default="all",
         help=("Which component to operate on: "
               "'server', 'portal' or 'all' (default if not set)."))
-    parser.add_argument(
-        "--status", action='store_true', dest='get_status',
-        default=None, help='Get current server status.')
     parser.epilog = (
         "Common usage: evennia start|stop|reload. Django-admin database commands:"
         "evennia migration|flush|shell|dbshell (see the django documentation for more "
@@ -1656,11 +1671,6 @@ def main():
             print(ERROR_INITSETTINGS)
         sys.exit()
 
-    if args.get_status:
-        init_game_directory(CURRENT_DIR, check_db=True)
-        query_status()
-        sys.exit()
-
     if args.dummyrunner:
         # launch the dummy runner
         init_game_directory(CURRENT_DIR, check_db=True)
@@ -1673,13 +1683,17 @@ def main():
         # launch menu for operation
         init_game_directory(CURRENT_DIR, check_db=True)
         run_menu()
-    elif option in ('sstart', 'sreload', 'sstop', 'ssstop', 'start', 'reload', 'stop'):
+    elif option in ('status', 'sstart', 'sreload', 'sreset', 'sstop', 'ssstop', 'start', 'reload', 'stop'):
         # operate the server directly
         init_game_directory(CURRENT_DIR, check_db=True)
+        if option == "status":
+            query_status()
         if option == "sstart":
             start_evennia(False, args.profiler)
         elif option == 'sreload':
             reload_evennia(args.profiler)
+        elif option == 'sreset':
+            reload_evennia(args.profiler, reset=True)
         elif option == 'sstop':
             stop_evennia()
         elif option == 'ssstop':
diff --git a/evennia/server/evennia_runner.py b/evennia/server/evennia_runner.py
index 27fc187211..d920c181e8 100644
--- a/evennia/server/evennia_runner.py
+++ b/evennia/server/evennia_runner.py
@@ -346,6 +346,7 @@ def main():
             del portal_argv[-2]
 
     # Start processes
+    print("server_argv:", server_argv, portal_argv)
     start_services(server_argv, portal_argv, doexit=args.doexit)
 
 
diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py
index 8f08b46b0f..6da13905c2 100644
--- a/evennia/server/portal/amp.py
+++ b/evennia/server/portal/amp.py
@@ -89,8 +89,8 @@ def catch_traceback(func):
             if not _LOGGER:
                 from evennia.utils import logger as _LOGGER
             _LOGGER.log_trace()
-            print("error", err)
             raise  # make sure the error is visible on the other side of the connection too
+            print(err)
     return decorator
 
 
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 1163012371..6b746c10a8 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -8,7 +8,7 @@ import os
 import sys
 from twisted.internet import protocol
 from evennia.server.portal import amp
-from subprocess import Popen
+from subprocess import Popen, STDOUT, PIPE
 from evennia.utils import logger
 
 
@@ -48,6 +48,8 @@ class AMPServerFactory(protocol.ServerFactory):
         self.portal = portal
         self.protocol = AMPServerProtocol
         self.broadcasts = []
+        self.server_connection = None
+        self.disconnect_callbacks = {}
 
     def buildProtocol(self, addr):
         """
@@ -80,12 +82,45 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
         """
         # start the Server
-        process = Popen(server_twistd_cmd, env=getenv())
-        # store the pid for future reference
+        try:
+            process = Popen(server_twistd_cmd, env=getenv(), bufsize=-1, stdout=PIPE, stderr=STDOUT)
+        except Exception:
+            self.factory.portal.server_process_id = None
+            logger.log_trace()
+            return 0
+        # there is a short window before the server logger is up where we must
+        # catch the stdout of the Server or eventual tracebacks will be lost.
+        with process.stdout as out:
+            logger.log_server(out.read())
+
+        # store the pid and launch argument for future reference
         self.factory.portal.server_process_id = process.pid
         self.factory.portal.server_twistd_cmd = server_twistd_cmd
         return process.pid
 
+    def connectionLost(self, reason):
+        """
+        Set up a simple callback mechanism to let the amp-server wait for a connection to close.
+
+        """
+        callback, args, kwargs = self.factory.disconnect_callbacks.pop(self, (None, None, None))
+        if callback:
+            try:
+                callback(*args, **kwargs)
+            except Exception:
+                logger.log_trace()
+
+    def wait_for_disconnect(self, callback, *args, **kwargs):
+        """
+        Add a callback for when this connection is lost.
+
+        Args:
+            callback (callable): Will be called with *args, **kwargs
+                once this protocol is disconnected.
+
+        """
+        self.factory.disconnect_callbacks[self] = (callback, args, kwargs)
+
     def stop_server(self, mode='shutdown'):
         """
         Shut down server in one or more modes.
@@ -95,11 +130,11 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
         """
         if mode == 'reload':
-            self.send_AdminPortal2Server(amp.DUMMYSESSION, amp.SRELOAD)
-        if mode == 'reset':
-            self.send_AdminPortal2Server(amp.DUMMYSESSION, amp.SRESET)
-        if mode == 'shutdown':
-            self.send_AdminPortal2Server(amp.DUMMYSESSION, amp.SSHUTD)
+            self.send_AdminPortal2Server(amp.DUMMYSESSION, operation=amp.SRELOAD)
+        elif mode == 'reset':
+            self.send_AdminPortal2Server(amp.DUMMYSESSION, operation=amp.SRESET)
+        elif mode == 'shutdown':
+            self.send_AdminPortal2Server(amp.DUMMYSESSION, operation=amp.SSHUTD)
 
     # sending amp data
 
@@ -148,8 +183,8 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
         """
         # check if the server is connected
-        server_connected = any(1 for prtcl in self.factory.broadcasts
-                               if prtcl is not self and prtcl.transport.connected)
+        server_connected = (self.factory.server_connection and
+                            self.factory.server_connection.transport.connected)
         server_pid = self.factory.portal.server_process_id
         portal_pid = os.getpid()
 
@@ -180,14 +215,14 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         def _retval(success, txt):
             return {"result": amp.dumps((success, txt))}
 
-        server_connected = any(1 for prtcl in self.factory.broadcasts
-                               if prtcl is not self and prtcl.transport.connected)
+        server_connected = (self.factory.server_connection and
+                            self.factory.server_connection.transport.connected)
         server_pid = self.factory.portal.server_process_id
 
         logger.log_msg("AMP SERVER operation == %s received" % (ord(operation)))
         logger.log_msg("AMP SERVER arguments: %s" % (amp.loads(arguments)))
 
-        if operation == amp.SSTART:   # portal start
+        if operation == amp.SSTART:   # portal start  #15
             # first, check if server is already running
             if server_connected:
                 return _retval(False,
@@ -195,27 +230,36 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
             else:
                 spid = self.start_server(amp.loads(arguments))
                 return _retval(True, "Server started with PID {spid}.".format(spid=spid))
-        elif operation == amp.SRELOAD:  # reload server
+
+        elif operation == amp.SRELOAD:  # reload server #14
             if server_connected:
-                self.stop(mode='reload')
-                spid = self.start_server(amp.loads(arguments))
-                return _retval(True, "Server restarted with PID {spid}.".format(spid=spid))
+                # don't restart until the server connection goes down
+                self.stop_server(mode='reload')
             else:
                 spid = self.start_server(amp.loads(arguments))
                 return _retval(True, "Server started with PID {spid}.".format(spid=spid))
-        elif operation == amp.SRESET:  # reload server
+
+        elif operation == amp.SRESET:  # reload server #19
             if server_connected:
                 self.stop_server(mode='reset')
-                spid = self.start_server(amp.loads(arguments))
                 return _retval(True, "Server restarted with PID {spid}.".format(spid=spid))
             else:
                 spid = self.start_server(amp.loads(arguments))
                 return _retval(True, "Server started with PID {spid}.".format(spid=spid))
-        elif operation == amp.PSHUTD:  # portal + server shutdown
+
+        elif operation == amp.SSHUTD:  # server-only shutdown #17
+            if server_connected:
+                self.stop_server(mode='shutdown')
+                return _retval(True, "Server stopped.")
+            else:
+                return _retval(False, "Server not running")
+
+        elif operation == amp.PSHUTD:  # portal + server shutdown  #16
             if server_connected:
                 self.stop_server(mode='shutdown')
                 return _retval(True, "Server stopped.")
             self.factory.portal.shutdown(restart=False)
+
         else:
             raise Exception("operation %(op)s not recognized." % {'op': operation})
         # fallback
@@ -254,6 +298,9 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         operation = kwargs.pop("operation")
         portal_sessionhandler = self.factory.portal.sessions
 
+        # store this transport since we know it comes from the Server
+        self.factory.server_connection = self
+
         if operation == amp.SLOGIN:  # server_session_login
             # a session has authenticated; sync it.
             session = portal_sessionhandler.get(sessid)
@@ -271,12 +318,14 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
             portal_sessionhandler.server_disconnect_all(reason=kwargs.get("reason"))
 
         elif operation == amp.SRELOAD:  # server reload
-            self.stop_server(mode='reload')
-            self.start(self.factory.portal.server_twisted_cmd)
+                self.factory.server_connection.wait_for_disconnect(
+                    self.start_server, self.factory.portal.server_twisted_cmd)
+                self.stop_server(mode='reload')
 
         elif operation == amp.SRESET:  # server reset
-            self.stop_server(mode='reset')
-            self.start(self.factory.portal.server_twisted_cmd)
+                self.factory.server_connection.wait_for_disconnect(
+                    self.start_server, self.factory.portal.server_twisted_cmd)
+                self.stop_server(mode='reset')
 
         elif operation == amp.SSHUTD:  # server-only shutdown
             self.stop_server(mode='shutdown')
diff --git a/evennia/server/server.py b/evennia/server/server.py
index fab6d9675f..070ddd4695 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -366,6 +366,7 @@ class Evennia(object):
                              once - in both cases the reactor is
                              dead/stopping already.
         """
+        print("server.shutdown mode=", mode)
         if _reactor_stopping and hasattr(self, "shutdown_complete"):
             # this means we have already passed through this method
             # once; we don't need to run the shutdown procedure again.
diff --git a/evennia/utils/logger.py b/evennia/utils/logger.py
index b248278ce1..a8bcfb00e7 100644
--- a/evennia/utils/logger.py
+++ b/evennia/utils/logger.py
@@ -124,6 +124,15 @@ def log_err(errmsg):
 log_errmsg = log_err
 
 
+def log_server(servermsg):
+    try:
+        servermsg = str(servermsg)
+    except Exception as e:
+        servermsg = str(e)
+    for line in servermsg.splitlines():
+        log_msg('[SRV] %s' % line)
+
+
 def log_warn(warnmsg):
     """
     Prints/logs any warnings that aren't critical but should be noted.

From aa7b57e92f7ddfa3fcf7d9977d5b8b1dfcc1fbef Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 14 Jan 2018 23:11:59 +0100
Subject: [PATCH 048/217] Support in-game server-control commands

---
 evennia/commands/default/system.py  |  1 -
 evennia/server/amp_client.py        |  2 +-
 evennia/server/portal/amp_server.py | 32 +++++++++++++++--------------
 evennia/server/portal/portal.py     |  1 +
 evennia/server/sessionhandler.py    |  2 +-
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/evennia/commands/default/system.py b/evennia/commands/default/system.py
index 7933245ae2..7bd092bad5 100644
--- a/evennia/commands/default/system.py
+++ b/evennia/commands/default/system.py
@@ -119,7 +119,6 @@ class CmdShutdown(COMMAND_DEFAULT_CLASS):
             announcement += "%s\n" % self.args
         logger.log_info('Server shutdown by %s.' % self.caller.name)
         SESSIONS.announce_all(announcement)
-        SESSIONS.server.shutdown(mode='shutdown')
         SESSIONS.portal_shutdown()
 
 
diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index 5c29825d23..b490d8393b 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -71,7 +71,7 @@ class AMPClientFactory(protocol.ReconnectingClientFactory):
             reason (str): Eventual text describing why connection was lost.
 
         """
-        logger.log_info("Server lost connection to the Portal. Reconnecting ...")
+        logger.log_info("Server disconnected from the portal.")
         protocol.ReconnectingClientFactory.clientConnectionLost(self, connector, reason)
 
     def clientConnectionFailed(self, connector, reason):
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 6b746c10a8..024454fc7a 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -72,6 +72,19 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
     Protocol subclass for the AMP-server run by the Portal.
 
     """
+
+    def connectionLost(self, reason):
+        """
+        Set up a simple callback mechanism to let the amp-server wait for a connection to close.
+
+        """
+        callback, args, kwargs = self.factory.disconnect_callbacks.pop(self, (None, None, None))
+        if callback:
+            try:
+                callback(*args, **kwargs)
+            except Exception:
+                logger.log_trace()
+
     def start_server(self, server_twistd_cmd):
         """
         (Re-)Launch the Evennia server.
@@ -98,18 +111,6 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         self.factory.portal.server_twistd_cmd = server_twistd_cmd
         return process.pid
 
-    def connectionLost(self, reason):
-        """
-        Set up a simple callback mechanism to let the amp-server wait for a connection to close.
-
-        """
-        callback, args, kwargs = self.factory.disconnect_callbacks.pop(self, (None, None, None))
-        if callback:
-            try:
-                callback(*args, **kwargs)
-            except Exception:
-                logger.log_trace()
-
     def wait_for_disconnect(self, callback, *args, **kwargs):
         """
         Add a callback for when this connection is lost.
@@ -319,20 +320,21 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
         elif operation == amp.SRELOAD:  # server reload
                 self.factory.server_connection.wait_for_disconnect(
-                    self.start_server, self.factory.portal.server_twisted_cmd)
+                    self.start_server, self.factory.portal.server_twistd_cmd)
                 self.stop_server(mode='reload')
 
         elif operation == amp.SRESET:  # server reset
                 self.factory.server_connection.wait_for_disconnect(
-                    self.start_server, self.factory.portal.server_twisted_cmd)
+                    self.start_server, self.factory.portal.server_twistd_cmd)
                 self.stop_server(mode='reset')
 
         elif operation == amp.SSHUTD:  # server-only shutdown
             self.stop_server(mode='shutdown')
 
         elif operation == amp.PSHUTD:  # full server+server shutdown
+            self.factory.server_connection.wait_for_disconnect(
+                self.factory.portal.shutdown, restart=False)
             self.stop_server(mode='shutdown')
-            self.factory.portal.shutdown()
 
         elif operation == amp.PSYNC:  # portal sync
             # Server has (re-)connected and wants the session data from portal
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index 5d4c9aae19..5bdd65d39e 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -148,6 +148,7 @@ class Portal(object):
         case it always needs to be restarted manually.
 
         """
+        print("portal.shutdown: restart=", restart)
         if _reactor_stopping and hasattr(self, "shutdown_complete"):
             # we get here due to us calling reactor.stop below. No need
             # to do the shutdown procedure again.
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index 20e4cd677e..e76efd7405 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -459,7 +459,7 @@ class ServerSessionHandler(SessionHandler):
 
         """
         self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION,
-                                                         operation=SSHUTD)
+                                                         operation=PSHUTD)
 
     def login(self, session, account, force=False, testmode=False):
         """

From ee37070422f8682791e0406549de63b8b34f5aa9 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 15 Jan 2018 13:50:08 -0500
Subject: [PATCH 049/217] `@locate` alias of CmdFind shows location of find

If using `@locate` alias and only one object is found and the found object has a location, display that information.
---
 evennia/commands/default/building.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index 445ec082a9..9a7caf8567 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -2315,6 +2315,8 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
             else:
                 result = result[0]
                 string += "\n|g   %s - %s|n" % (result.get_display_name(caller), result.path)
+                if self.cmdstring == "@locate" and not is_account and result.location:
+                    string += "  Location: {}".format(result.location.get_display_name(caller))
         else:
             # Not an account/dbref search but a wider search; build a queryset.
             # Searchs for key and aliases
@@ -2350,6 +2352,8 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
                 else:
                     string = "|wOne Match|n(#%i-#%i%s):" % (low, high, restrictions)
                     string += "\n   |g%s - %s|n" % (results[0].get_display_name(caller), results[0].path)
+                    if self.cmdstring == "@locate" and nresults == 1 and results[0].location:
+                        string += "  Location: {}".format(results[0].location.get_display_name(caller))
             else:
                 string = "|wMatch|n(#%i-#%i%s):" % (low, high, restrictions)
                 string += "\n   |RNo matches found for '%s'|n" % searchstring

From 0abaf90b6a86d146962ce8e2005a86b9faf8a45e Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 15 Jan 2018 13:53:19 -0500
Subject: [PATCH 050/217] Typo fix in CmdWhisper help docstring

---
 evennia/commands/default/general.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 612a798167..195ad9a7d1 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -439,7 +439,7 @@ class CmdWhisper(COMMAND_DEFAULT_CLASS):
 
     Usage:
       whisper <character> = <message>
-      whisper <char1>, <char2> = <message?
+      whisper <char1>, <char2> = <message>
 
     Talk privately to one or more characters in your current location, without
     others in the room being informed.

From 66c209a314e38d1eb946692dcdf24aa3a680ce67 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 16 Jan 2018 00:11:46 +0100
Subject: [PATCH 051/217] Rework launcher with persistent connection for better
 server status reporting. Still some errors.

---
 evennia/server/amp_client.py        |  25 ++++-
 evennia/server/evennia_launcher.py  | 146 ++++++++++++++++++---------
 evennia/server/portal/amp.py        |  12 +--
 evennia/server/portal/amp_server.py | 151 ++++++++++++++++++++--------
 4 files changed, 238 insertions(+), 96 deletions(-)

diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index b490d8393b..70ec00a3a7 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -106,6 +106,26 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
         # back with the Server side
         self.send_AdminServer2Portal(amp.DUMMYSESSION, operation=amp.PSYNC)
 
+    def data_to_portal(self, command, sessid, **kwargs):
+        """
+        Send data across the wire to the Portal
+
+        Args:
+            command (AMP Command): A protocol send command.
+            sessid (int): A unique Session id.
+            kwargs (any): Any data to pickle into the command.
+
+        Returns:
+            deferred (deferred or None): A deferred with an errback.
+
+        Notes:
+            Data will be sent across the wire pickled as a tuple
+            (sessid, kwargs).
+
+        """
+        return self.callRemote(command, packed_data=amp.dumps((sessid, kwargs))).addErrback(
+                self.errback, command.key)
+
     def send_MsgServer2Portal(self, session, **kwargs):
         """
         Access method - executed on the Server for sending data
@@ -116,7 +136,7 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
             kwargs (any, optiona): Extra data.
 
         """
-        return self.data_out(amp.MsgServer2Portal, session.sessid, **kwargs)
+        return self.data_to_portal(amp.MsgServer2Portal, session.sessid, **kwargs)
 
     def send_AdminServer2Portal(self, session, operation="", **kwargs):
         """
@@ -131,7 +151,8 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
             kwargs (dict, optional): Data going into the adminstrative.
 
         """
-        return self.data_out(amp.AdminServer2Portal, session.sessid, operation=operation, **kwargs)
+        return self.data_to_portal(amp.AdminServer2Portal, session.sessid,
+                                   operation=operation, **kwargs)
 
     # receiving AMP data
 
diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index c2d29ad961..b90c43b1f0 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -19,7 +19,7 @@ import shutil
 import importlib
 from distutils.version import LooseVersion
 from argparse import ArgumentParser
-from subprocess import Popen, check_output, call, CalledProcessError, STDOUT, PIPE
+from subprocess import Popen, check_output, call, CalledProcessError, STDOUT
 
 try:
     import cPickle as pickle
@@ -57,9 +57,6 @@ CURRENT_DIR = os.getcwd()
 GAMEDIR = CURRENT_DIR
 
 # Operational setup
-AMP_PORT = None
-AMP_HOST = None
-AMP_INTERFACE = None
 
 SERVER_LOGFILE = None
 PORTAL_LOGFILE = None
@@ -81,6 +78,9 @@ ENFORCED_SETTING = False
 
 # communication constants
 
+AMP_PORT = None
+AMP_HOST = None
+AMP_INTERFACE = None
 AMP_CONNECTION = None
 
 SRELOAD = chr(14)      # server reloading (have portal start a new server)
@@ -461,7 +461,35 @@ class MsgLauncher2Portal(amp.Command):
     arguments = [('operation', amp.String()),
                  ('arguments', amp.String())]
     errors = {Exception: 'EXCEPTION'}
-    response = [('result', amp.String())]
+    response = []
+
+
+class AMPLauncherProtocol(amp.AMP):
+    """
+    Defines callbacks to the launcher
+
+    """
+    def __init__(self):
+        self.on_status = []
+
+    def wait_for_status(self, callback):
+        """
+        Register a waiter for a status return.
+
+        """
+        self.on_status.append(callback)
+
+    @MsgStatus.responder
+    def receive_status_from_portal(self, status):
+        """
+        Get a status signal from portal - fire callbacks
+
+        """
+        status = pickle.loads(status)
+        for callback in self.on_status:
+            callback(status)
+        self.on_status = []
+        return {"status": ""}
 
 
 def send_instruction(operation, arguments, callback=None, errback=None):
@@ -475,39 +503,54 @@ def send_instruction(operation, arguments, callback=None, errback=None):
         print(ERROR_AMP_UNCONFIGURED)
         sys.exit()
 
+    def _timeout(*args):
+        print("Client timed out.")
+        reactor.stop()
+
+    def _callback(result):
+        if callback:
+            callback(result)
+        # prot.transport.loseConnection()
+
+    def _errback(fail):
+        if errback:
+            errback(fail)
+        # prot.transport.loseConnection()
+
     def _on_connect(prot):
         """
         This fires with the protocol when connection is established. We
-        immediately send off the instruction then shut down.
+        immediately send off the instruction
 
         """
-        def _callback(result):
-            if callback:
-                callback(result)
-            prot.transport.loseConnection()
-
-        def _errback(fail):
-            if errback:
-                errback(fail)
-            prot.transport.loseConnection()
-
-        if operation == PSTATUS:
-            prot.callRemote(MsgStatus, status="").addCallbacks(_callback, _errback)
-        else:
-            prot.callRemote(
-                MsgLauncher2Portal,
-                operation=operation,
-                arguments=pickle.dumps(arguments, pickle.HIGHEST_PROTOCOL)).addCallbacks(
-                    _callback, _errback)
+        global AMP_CONNECTION
+        AMP_CONNECTION = prot
+        _send()
 
     def _on_connect_fail(fail):
         "This is called if portal is not reachable."
         errback(fail)
 
-    point = endpoints.TCP4ClientEndpoint(reactor, AMP_HOST, AMP_PORT)
-    deferred = endpoints.connectProtocol(point, amp.AMP())
-    deferred.addCallbacks(_on_connect, _on_connect_fail)
-    return deferred
+    def _send():
+        if operation == PSTATUS:
+            return AMP_CONNECTION.callRemote(MsgStatus, status="").addCallbacks(_callback, _errback)
+        else:
+            return AMP_CONNECTION.callRemote(
+                MsgLauncher2Portal,
+                operation=operation,
+                arguments=pickle.dumps(arguments, pickle.HIGHEST_PROTOCOL)).addCallbacks(
+                    _callback, _errback)
+
+    if AMP_CONNECTION:
+        # already connected - send right away
+        _send()
+    else:
+        # we must connect first, send once connected
+        point = endpoints.TCP4ClientEndpoint(reactor, AMP_HOST, AMP_PORT)
+        deferred = endpoints.connectProtocol(point, AMPLauncherProtocol())
+        deferred.addCallbacks(_on_connect, _on_connect_fail)
+        if not reactor.running:
+            reactor.run()
 
 
 def _parse_status(response):
@@ -541,7 +584,6 @@ def _get_twistd_cmdline(pprofiler, sprofiler):
                            "--profiler=cprofiler",
                            "--profile={}".format(SPROFILER_LOGFILE)])
 
-
     return portal_cmd, server_cmd
 
 
@@ -565,7 +607,16 @@ def query_status(repeat=False):
         reactor.stop()
 
     send_instruction(PSTATUS, None, _callback, _errback)
-    reactor.run()
+
+
+def wait_for_status_reply(callback):
+    """
+    Wait for an explicit STATUS signal to be sent back from Evennia.
+    """
+    if AMP_CONNECTION:
+        AMP_CONNECTION.wait_for_status(callback)
+    else:
+        print("No Evennia connection established.")
 
 
 def wait_for_status(portal_running=True, server_running=True, callback=None, errback=None,
@@ -587,7 +638,7 @@ def wait_for_status(portal_running=True, server_running=True, callback=None, err
     def _callback(response):
         prun, srun, _, _ = _parse_status(response)
         if ((portal_running is None or prun == portal_running) and
-            (server_running is None or srun == server_running)):
+                (server_running is None or srun == server_running)):
             # the correct state was achieved
             if callback:
                 callback(prun, srun)
@@ -653,7 +704,8 @@ def start_evennia(pprofiler=False, sprofiler=False):
         reactor.stop()
 
     def _portal_started(*args):
-        send_instruction(SSTART, server_cmd, _server_started)
+        wait_for_status_reply(_server_started)
+        send_instruction(SSTART, server_cmd)
 
     def _portal_running(response):
         prun, srun, ppid, spid = _parse_status(response)
@@ -675,12 +727,14 @@ def start_evennia(pprofiler=False, sprofiler=False):
         wait_for_status(True, None, _portal_started)
 
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
-    reactor.run()
 
 
 def reload_evennia(sprofiler=False, reset=False):
     """
-    This will instruct the Portal to reboot the Server component.
+    This will instruct the Portal to reboot the Server component. We
+    do this manually by telling the server to shutdown (in reload mode)
+    and wait for the portal to report back, at which point we start the
+    server again. This way we control the process exactly.
 
     """
     _, server_cmd = _get_twistd_cmdline(False, sprofiler)
@@ -689,23 +743,24 @@ def reload_evennia(sprofiler=False, reset=False):
         print("... Server re-started.")
         reactor.stop()
 
-    def _server_reloaded(*args):
-        print("... Server {}.".format("reset" if reset else "reloaded"))
+    def _server_reloaded(status):
+        print("{} ... Server {}.".format(status, "reset" if reset else "reloaded"))
         reactor.stop()
 
-    def _server_not_running(*args):
+    def _server_stopped(status):
+        wait_for_status_reply(_server_reloaded)
         send_instruction(SSTART, server_cmd)
-        wait_for_status(True, True, _server_reloaded)
 
     def _portal_running(response):
         _, srun, _, _ = _parse_status(response)
         if srun:
             print("Server {}...".format("resetting" if reset else "reloading"))
-            send_instruction(SRESET if reset else SRELOAD, server_cmd)
-            wait_for_status(True, False, _server_not_running)
+            wait_for_status_reply(_server_stopped)
+            send_instruction(SRESET if reset else SRELOAD, {})
         else:
             print("Server down. Re-starting ...")
-            send_instruction(SSTART, server_cmd, _server_restarted)
+            wait_for_status_reply(_server_restarted)
+            send_instruction(SSTART, server_cmd)
 
     def _portal_not_running(fail):
         print("Evennia not running. Starting from scratch ...")
@@ -713,7 +768,6 @@ def reload_evennia(sprofiler=False, reset=False):
 
     # get portal status
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
-    reactor.run()
 
 
 def stop_evennia():
@@ -735,18 +789,17 @@ def stop_evennia():
         if srun:
             print("Server stopping ...")
             send_instruction(SSHUTD, {})
-            wait_for_status(True, False, _server_stopped)
+            wait_for_status_reply(_server_stopped)
         else:
             print("Server already stopped.\nStopping Portal ...")
             send_instruction(PSHUTD, {})
-            wait_for_status(False, False, _portal_stopped)
+            wait_for_status(False, None, _portal_stopped)
 
     def _portal_not_running(fail):
         print("Evennia is not running.")
         reactor.stop()
 
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
-    reactor.run()
 
 
 def stop_server_only():
@@ -762,8 +815,8 @@ def stop_server_only():
         _, srun, _, _ = _parse_status(response)
         if srun:
             print("Server stopping ...")
+            wait_for_status_reply(_server_stopped)
             send_instruction(SSHUTD, {})
-            wait_for_status(True, False, _server_stopped)
         else:
             print("Server is not running.")
 
@@ -771,7 +824,6 @@ def stop_server_only():
         print("Evennia is not running.")
 
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
-    reactor.run()
 
 
 def evennia_version():
diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py
index 6da13905c2..2c1d28bc1f 100644
--- a/evennia/server/portal/amp.py
+++ b/evennia/server/portal/amp.py
@@ -155,7 +155,7 @@ class MsgLauncher2Portal(amp.Command):
     arguments = [('operation', amp.String()),
                  ('arguments', amp.String())]
     errors = {Exception: 'EXCEPTION'}
-    response = [('result', amp.String())]
+    response = []
 
 
 class MsgPortal2Server(amp.Command):
@@ -335,9 +335,9 @@ class AMPMultiConnectionProtocol(amp.AMP):
         """
         return loads(packed_data)
 
-    def data_out(self, command, sessid, **kwargs):
+    def broadcast(self, command, sessid, **kwargs):
         """
-        Send data across the wire. Always use this to send.
+        Send data across the wire to all connections.
 
         Args:
             command (AMP Command): A protocol send command.
@@ -353,9 +353,9 @@ class AMPMultiConnectionProtocol(amp.AMP):
         """
         deferreds = []
         for protcl in self.factory.broadcasts:
-            deferreds.append(protcl.callRemote(command,
-                                               packed_data=dumps((sessid, kwargs))).addErrback(
-                                                    self.errback, command.key))
+            deferreds.append(protcl.callRemote(command, **kwargs).addErrback(
+                self.errback, command.key))
+
         return DeferredList(deferreds)
 
     # generic function send/recvs
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 024454fc7a..8e49bca263 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -49,7 +49,9 @@ class AMPServerFactory(protocol.ServerFactory):
         self.protocol = AMPServerProtocol
         self.broadcasts = []
         self.server_connection = None
+        self.launcher_connection = None
         self.disconnect_callbacks = {}
+        self.server_connect_callbacks = []
 
     def buildProtocol(self, addr):
         """
@@ -72,12 +74,18 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
     Protocol subclass for the AMP-server run by the Portal.
 
     """
-
     def connectionLost(self, reason):
         """
         Set up a simple callback mechanism to let the amp-server wait for a connection to close.
 
         """
+        # wipe broadcast and data memory
+        super(AMPServerProtocol, self).connectionLost(reason)
+        if self.factory.server_connection == self:
+            self.factory.server_connection = None
+        if self.factory.launcher_connection == self:
+            self.factory.launcher_connection = None
+
         callback, args, kwargs = self.factory.disconnect_callbacks.pop(self, (None, None, None))
         if callback:
             try:
@@ -85,6 +93,45 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
             except Exception:
                 logger.log_trace()
 
+    def get_status(self):
+        """
+        Return status for the Evennia infrastructure.
+
+        Returns:
+            status (tuple): The portal/server status and pids
+                (portal_live, server_live, portal_PID, server_PID).
+
+        """
+        server_connected = bool(self.factory.server_connection and
+                                self.factory.server_connection.transport.connected)
+        server_pid = self.factory.portal.server_process_id
+        portal_pid = os.getpid()
+        return (True, server_connected, portal_pid, server_pid)
+
+    def data_to_server(self, command, sessid, **kwargs):
+        """
+        Send data across the wire to the Server.
+
+        Args:
+            command (AMP Command): A protocol send command.
+            sessid (int): A unique Session id.
+
+        Returns:
+            deferred (deferred or None): A deferred with an errback.
+
+        Notes:
+            Data will be sent across the wire pickled as a tuple
+            (sessid, kwargs).
+
+        """
+        if self.factory.server_connection:
+            return self.factory.server_connection.callRemote(
+                        command, packed_data=amp.dumps((sessid, kwargs))).addErrback(
+                            self.errback, command.key)
+        else:
+            # if no server connection is available, broadcast
+            return self.broadcast(command, sessid, packed_data=amp.dumps((sessid, kwargs)))
+
     def start_server(self, server_twistd_cmd):
         """
         (Re-)Launch the Evennia server.
@@ -122,6 +169,17 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         """
         self.factory.disconnect_callbacks[self] = (callback, args, kwargs)
 
+    def wait_for_server_connect(self, callback, *args, **kwargs):
+        """
+        Add a callback for when the Server is sure to have connected.
+
+        Args:
+            callback (callable): Will be called with *args, **kwargs
+                once the Server handshake with Portal is complete.
+
+        """
+        self.factory.server_connect_callbacks.append((callback, args, kwargs))
+
     def stop_server(self, mode='shutdown'):
         """
         Shut down server in one or more modes.
@@ -139,6 +197,17 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
     # sending amp data
 
+    def send_Status2Launcher(self):
+        """
+        Send a status stanza to the launcher.
+
+        """
+        if self.factory.launcher_connection:
+            self.factory.launcher_connection.callRemote(
+                    amp.MsgStatus,
+                    status=amp.dumps(self.get_status())).addErrback(
+                            self.errback, amp.MsgStatus.key)
+
     def send_MsgPortal2Server(self, session, **kwargs):
         """
         Access method called by the Portal and executed on the Portal.
@@ -151,7 +220,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
             deferred (Deferred): Asynchronous return.
 
         """
-        return self.data_out(amp.MsgPortal2Server, session.sessid, **kwargs)
+        return self.data_to_server(amp.MsgPortal2Server, session.sessid, **kwargs)
 
     def send_AdminPortal2Server(self, session, operation="", **kwargs):
         """
@@ -166,7 +235,8 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
             data (str or dict, optional): Data used in the administrative operation.
 
         """
-        return self.data_out(amp.AdminPortal2Server, session.sessid, operation=operation, **kwargs)
+        return self.data_to_server(amp.AdminPortal2Server, session.sessid,
+                                   operation=operation, **kwargs)
 
     # receive amp data
 
@@ -183,16 +253,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
                 (portal_running, server_running, portal_pid, server_pid).
 
         """
-        # check if the server is connected
-        server_connected = (self.factory.server_connection and
-                            self.factory.server_connection.transport.connected)
-        server_pid = self.factory.portal.server_process_id
-        portal_pid = os.getpid()
-
-        if server_connected:
-            return {"status": amp.dumps((True, True, portal_pid, server_pid))}
-        else:
-            return {"status": amp.dumps((True, False, portal_pid, server_pid))}
+        return {"status": amp.dumps(self.get_status())}
 
     @amp.MsgLauncher2Portal.responder
     @amp.catch_traceback
@@ -213,58 +274,55 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
             launcher. It can obviously only accessed when the Portal is already up and running.
 
         """
-        def _retval(success, txt):
-            return {"result": amp.dumps((success, txt))}
+        self.factory.launcher_connection = self
 
-        server_connected = (self.factory.server_connection and
-                            self.factory.server_connection.transport.connected)
-        server_pid = self.factory.portal.server_process_id
+        _, server_connected, _, _ = self.get_status()
 
         logger.log_msg("AMP SERVER operation == %s received" % (ord(operation)))
         logger.log_msg("AMP SERVER arguments: %s" % (amp.loads(arguments)))
 
         if operation == amp.SSTART:   # portal start  #15
             # first, check if server is already running
-            if server_connected:
-                return _retval(False,
-                               "Server already running at PID={spid}".format(spid=server_pid))
-            else:
-                spid = self.start_server(amp.loads(arguments))
-                return _retval(True, "Server started with PID {spid}.".format(spid=spid))
+            if not server_connected:
+                self.wait_for_server_connect(self.send_Status2Launcher)
+                self.start_server(amp.loads(arguments))
 
         elif operation == amp.SRELOAD:  # reload server #14
             if server_connected:
-                # don't restart until the server connection goes down
+                # We let the launcher restart us once they get the signal
+                self.factory.server_connection.wait_for_disconnect(
+                    self.send_Status2Launcher)
                 self.stop_server(mode='reload')
             else:
-                spid = self.start_server(amp.loads(arguments))
-                return _retval(True, "Server started with PID {spid}.".format(spid=spid))
+                self.wait_for_server_connect(self.send_Status2Launcher)
+                self.start_server(amp.loads(arguments))
 
         elif operation == amp.SRESET:  # reload server #19
             if server_connected:
+                self.factory.server_connection.wait_for_disconnect(
+                    self.send_Status2Launcher)
                 self.stop_server(mode='reset')
-                return _retval(True, "Server restarted with PID {spid}.".format(spid=spid))
             else:
-                spid = self.start_server(amp.loads(arguments))
-                return _retval(True, "Server started with PID {spid}.".format(spid=spid))
+                self.wait_for_server_connect(self.send_Status2Launcher)
+                self.start_server(amp.loads(arguments))
 
         elif operation == amp.SSHUTD:  # server-only shutdown #17
             if server_connected:
+                self.factory.server_connection.wait_for_disconnect(
+                    self.send_Status2Launcher)
                 self.stop_server(mode='shutdown')
-                return _retval(True, "Server stopped.")
-            else:
-                return _retval(False, "Server not running")
 
         elif operation == amp.PSHUTD:  # portal + server shutdown  #16
             if server_connected:
-                self.stop_server(mode='shutdown')
-                return _retval(True, "Server stopped.")
-            self.factory.portal.shutdown(restart=False)
+                self.factory.server_connection.wait_for_disconnect(
+                    self.factory.portal.shutdown, restart=False)
+            else:
+                self.factory.portal.shutdown(restart=False)
 
         else:
             raise Exception("operation %(op)s not recognized." % {'op': operation})
-        # fallback
-        return {"result": ""}
+
+        return {}
 
     @amp.MsgServer2Portal.responder
     @amp.catch_traceback
@@ -295,13 +353,12 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
             packed_data (str): Data received, a pickled tuple (sessid, kwargs).
 
         """
+        self.factory.server_connection = self
+
         sessid, kwargs = self.data_in(packed_data)
         operation = kwargs.pop("operation")
         portal_sessionhandler = self.factory.portal.sessions
 
-        # store this transport since we know it comes from the Server
-        self.factory.server_connection = self
-
         if operation == amp.SLOGIN:  # server_session_login
             # a session has authenticated; sync it.
             session = portal_sessionhandler.get(sessid)
@@ -344,11 +401,23 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
                                          sessiondata=sessdata)
             self.factory.portal.sessions.at_server_connection()
 
+            print("Portal PSYNC: %s" % self.factory.server_connection)
+            if self.factory.server_connection:
+                # this is an indication the server has successfully connected, so
+                # we trigger any callbacks (usually to tell the launcher server is up)
+                for callback, args, kwargs in self.factory.server_connect_callbacks:
+                    try:
+                        callback(*args, **kwargs)
+                    except Exception:
+                        logger.log_trace()
+                self.factory.server_connect_callbacks = []
+
         elif operation == amp.SSYNC:  # server_session_sync
             # server wants to save session data to the portal,
             # maybe because it's about to shut down.
             portal_sessionhandler.server_session_sync(kwargs.get("sessiondata"),
                                                       kwargs.get("clean", True))
+
             # set a flag in case we are about to shut down soon
             self.factory.server_restart_mode = True
 

From 2b7d9b36aa2d79c0e9677ee9bbd68a8dd0da9986 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Tue, 16 Jan 2018 09:59:03 -0500
Subject: [PATCH 052/217]  CmdWall docstring and message change

Notes that message will also be sent to unlogged in sessions
---
 evennia/commands/default/admin.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/evennia/commands/default/admin.py b/evennia/commands/default/admin.py
index 9da061cc04..8b694ffd8f 100644
--- a/evennia/commands/default/admin.py
+++ b/evennia/commands/default/admin.py
@@ -544,7 +544,8 @@ class CmdWall(COMMAND_DEFAULT_CLASS):
     Usage:
       @wall <message>
 
-    Announces a message to all connected accounts.
+    Announces a message to all connected sessions
+    including all currently unlogged in.
     """
     key = "@wall"
     locks = "cmd:perm(wall) or perm(Admin)"
@@ -556,5 +557,5 @@ class CmdWall(COMMAND_DEFAULT_CLASS):
             self.caller.msg("Usage: @wall <message>")
             return
         message = "%s shouts \"%s\"" % (self.caller.name, self.args)
-        self.msg("Announcing to all connected accounts ...")
+        self.msg("Announcing to all connected sessions ...")
         SESSIONS.announce_all(message)

From 3e37dca1bb701c89f70cdfaea6f9ca2bac2311d4 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Tue, 16 Jan 2018 10:20:19 -0500
Subject: [PATCH 053/217] Update CmdWall test to reflect message change

---
 evennia/commands/default/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 61bcf46a8c..41654077a4 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -185,7 +185,7 @@ class TestAdmin(CommandTest):
         self.call(admin.CmdPerm(), "Char2 = Builder", "Permission 'Builder' given to Char2 (the Object/Character).")
 
     def test_wall(self):
-        self.call(admin.CmdWall(), "Test", "Announcing to all connected accounts ...")
+        self.call(admin.CmdWall(), "Test", "Announcing to all connected sessions ...")
 
     def test_ban(self):
         self.call(admin.CmdBan(), "Char", "NameBan char was added.")

From 53ca9c6042d180ac729513778b6b0e4d1aa5a37a Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 17 Jan 2018 00:42:40 +0100
Subject: [PATCH 054/217] Add proper status reporting and stability fixes

---
 evennia/server/amp_client.py        |   3 +-
 evennia/server/evennia_launcher.py  | 131 +++++++++++++++++++++++-----
 evennia/server/portal/amp.py        |   5 +-
 evennia/server/portal/amp_server.py |  13 +--
 evennia/server/portal/portal.py     |  43 +++++----
 evennia/server/server.py            |  66 ++++++--------
 6 files changed, 172 insertions(+), 89 deletions(-)

diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index 70ec00a3a7..603924190a 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -101,10 +101,11 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
         Called when a new connection is established.
 
         """
+        info_dict = self.factory.server.get_info_dict()
         super(AMPServerClientProtocol, self).connectionMade()
         # first thing we do is to request the Portal to sync all sessions
         # back with the Server side
-        self.send_AdminServer2Portal(amp.DUMMYSESSION, operation=amp.PSYNC)
+        self.send_AdminServer2Portal(amp.DUMMYSESSION, operation=amp.PSYNC, info_dict=info_dict)
 
     def data_to_portal(self, command, sessid, **kwargs):
         """
diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index b90c43b1f0..8056d83887 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -434,6 +434,66 @@ PROCESS_ERROR = \
     {component} process error: {traceback}.
     """
 
+PORTAL_INFO = \
+    """{servername} Portal {version}
+    external ports:
+        {telnet}
+        {telnet_ssl}
+        {ssh}
+        {webserver_proxy}
+        {webclient}
+    internal_ports (to Server):
+        {amp}
+        {webserver_internal}
+"""
+
+
+SERVER_INFO = \
+    """{servername} Server {version}
+    internal ports (to Portal):
+        {amp}
+        {webserver}
+    {irc_rss}
+    {info}
+    {errors}"""
+
+
+# Info formatting
+
+def print_info(portal_info_dict, server_info_dict):
+    """
+    Format info dicts from the Portal/Server for display
+
+    """
+    ind = " " * 7
+
+    def _prepare_dict(dct):
+        out = {}
+        for key, value in dct.iteritems():
+            if isinstance(value, list):
+                value = "\n{}".format(ind).join(value)
+            out[key] = value
+        return out
+
+    def _strip_empty_lines(string):
+        return "\n".join(line for line in string.split("\n") if line.strip())
+
+    pstr, sstr = "", ""
+    if portal_info_dict:
+        pdict = _prepare_dict(portal_info_dict)
+        pstr = _strip_empty_lines(PORTAL_INFO.format(**pdict))
+
+    if server_info_dict:
+        sdict = _prepare_dict(server_info_dict)
+        sstr = _strip_empty_lines(SERVER_INFO.format(**sdict))
+
+    info = pstr + ("\n\n" + sstr if sstr else "")
+    maxwidth = max(len(line) for line in info.split("\n"))
+    top_border = "-" * (maxwidth - 11) + " Evennia " + "--"
+    border = "-" * (maxwidth + 1)
+    print(top_border + "\n" + info + '\n' + border)
+
+
 # ------------------------------------------------------------
 #
 #  Protocol Evennia launcher - Portal/Server communication
@@ -482,13 +542,17 @@ class AMPLauncherProtocol(amp.AMP):
     @MsgStatus.responder
     def receive_status_from_portal(self, status):
         """
-        Get a status signal from portal - fire callbacks
+        Get a status signal from portal - fire next queued
+        callback
 
         """
-        status = pickle.loads(status)
-        for callback in self.on_status:
+        try:
+            callback = self.on_status.pop()
+        except IndexError:
+            pass
+        else:
+            status = pickle.loads(status)
             callback(status)
-        self.on_status = []
         return {"status": ""}
 
 
@@ -503,10 +567,6 @@ def send_instruction(operation, arguments, callback=None, errback=None):
         print(ERROR_AMP_UNCONFIGURED)
         sys.exit()
 
-    def _timeout(*args):
-        print("Client timed out.")
-        reactor.stop()
-
     def _callback(result):
         if callback:
             callback(result)
@@ -587,7 +647,7 @@ def _get_twistd_cmdline(pprofiler, sprofiler):
     return portal_cmd, server_cmd
 
 
-def query_status(repeat=False):
+def query_status(callback=None):
     """
     Send status ping to portal
 
@@ -596,10 +656,13 @@ def query_status(repeat=False):
             False: "NOT RUNNING"}
 
     def _callback(response):
-        pstatus, sstatus, ppid, spid = _parse_status(response)
-        print("Portal:   {} (pid {})\nServer:   {} (pid {})".format(
-            wmap[pstatus], ppid, wmap[sstatus], spid))
-        reactor.stop()
+        if callback:
+            callback(response)
+        else:
+            pstatus, sstatus, ppid, spid, pinfo, sinfo = _parse_status(response)
+            print("Portal:   {} (pid {})\nServer:   {} (pid {})".format(
+                wmap[pstatus], ppid, wmap[sstatus], spid))
+            reactor.stop()
 
     def _errback(fail):
         pstatus, sstatus = False, False
@@ -636,7 +699,7 @@ def wait_for_status(portal_running=True, server_running=True, callback=None, err
         retries (int): How many times to retry before timing out and calling `errback`.
     """
     def _callback(response):
-        prun, srun, _, _ = _parse_status(response)
+        prun, srun, _, _, _, _ = _parse_status(response)
         if ((portal_running is None or prun == portal_running) and
                 (server_running is None or srun == server_running)):
             # the correct state was achieved
@@ -699,8 +762,11 @@ def start_evennia(pprofiler=False, sprofiler=False):
         print(fail)
         reactor.stop()
 
-    def _server_started(*args):
+    def _server_started(response):
         print("... Server started.\nEvennia running.")
+        if response:
+            _, _, _, _, pinfo, sinfo = response
+            print_info(pinfo, sinfo)
         reactor.stop()
 
     def _portal_started(*args):
@@ -708,7 +774,7 @@ def start_evennia(pprofiler=False, sprofiler=False):
         send_instruction(SSTART, server_cmd)
 
     def _portal_running(response):
-        prun, srun, ppid, spid = _parse_status(response)
+        prun, srun, ppid, spid, _, _ = _parse_status(response)
         print("Portal is already running as process {pid}. Not restarted.".format(pid=ppid))
         if srun:
             print("Server is already running as process {pid}. Not restarted.".format(pid=spid))
@@ -744,7 +810,7 @@ def reload_evennia(sprofiler=False, reset=False):
         reactor.stop()
 
     def _server_reloaded(status):
-        print("{} ... Server {}.".format(status, "reset" if reset else "reloaded"))
+        print("... Server {}.".format("reset" if reset else "reloaded"))
         reactor.stop()
 
     def _server_stopped(status):
@@ -752,7 +818,7 @@ def reload_evennia(sprofiler=False, reset=False):
         send_instruction(SSTART, server_cmd)
 
     def _portal_running(response):
-        _, srun, _, _ = _parse_status(response)
+        _, srun, _, _, _, _ = _parse_status(response)
         if srun:
             print("Server {}...".format("resetting" if reset else "reloading"))
             wait_for_status_reply(_server_stopped)
@@ -785,7 +851,7 @@ def stop_evennia():
         wait_for_status(False, None, _portal_stopped)
 
     def _portal_running(response):
-        prun, srun, ppid, spid = _parse_status(response)
+        prun, srun, ppid, spid, _, _ = _parse_status(response)
         if srun:
             print("Server stopping ...")
             send_instruction(SSHUTD, {})
@@ -812,7 +878,7 @@ def stop_server_only():
         reactor.stop()
 
     def _portal_running(response):
-        _, srun, _, _ = _parse_status(response)
+        _, srun, _, _, _, _ = _parse_status(response)
         if srun:
             print("Server stopping ...")
             wait_for_status_reply(_server_stopped)
@@ -826,6 +892,25 @@ def stop_server_only():
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
 
 
+def query_info():
+    """
+    Display the info strings from the running Evennia
+
+    """
+    def _got_status(status):
+        _, _, _, _, pinfo, sinfo = _parse_status(status)
+        print_info(pinfo, sinfo)
+        reactor.stop()
+
+    def _portal_running(response):
+        query_status(_got_status)
+
+    def _portal_not_running(fail):
+        print("Evennia is not running.")
+
+    send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
+
+
 def evennia_version():
     """
     Get the Evennia version info from the main package.
@@ -1735,12 +1820,14 @@ def main():
         # launch menu for operation
         init_game_directory(CURRENT_DIR, check_db=True)
         run_menu()
-    elif option in ('status', 'sstart', 'sreload', 'sreset', 'sstop', 'ssstop', 'start', 'reload', 'stop'):
+    elif option in ('status', 'info', 'sstart', 'sreload', 'sreset', 'sstop', 'ssstop', 'start', 'reload', 'stop'):
         # operate the server directly
         init_game_directory(CURRENT_DIR, check_db=True)
         if option == "status":
             query_status()
-        if option == "sstart":
+        elif option == "info":
+            query_info()
+        elif option == "sstart":
             start_evennia(False, args.profiler)
         elif option == 'sreload':
             reload_evennia(args.profiler)
diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py
index 2c1d28bc1f..4ff4732708 100644
--- a/evennia/server/portal/amp.py
+++ b/evennia/server/portal/amp.py
@@ -302,7 +302,10 @@ class AMPMultiConnectionProtocol(amp.AMP):
         portal will continuously try to reconnect, showing the problem
         that way.
         """
-        self.factory.broadcasts.remove(self)
+        try:
+            self.factory.broadcasts.remove(self)
+        except ValueError:
+            pass
 
     # Error handling
 
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 8e49bca263..98e93e7a24 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -49,6 +49,7 @@ class AMPServerFactory(protocol.ServerFactory):
         self.protocol = AMPServerProtocol
         self.broadcasts = []
         self.server_connection = None
+        self.server_info_dict = None
         self.launcher_connection = None
         self.disconnect_callbacks = {}
         self.server_connect_callbacks = []
@@ -83,6 +84,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         super(AMPServerProtocol, self).connectionLost(reason)
         if self.factory.server_connection == self:
             self.factory.server_connection = None
+            self.factory.server_info_dict = None
         if self.factory.launcher_connection == self:
             self.factory.launcher_connection = None
 
@@ -104,9 +106,11 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         """
         server_connected = bool(self.factory.server_connection and
                                 self.factory.server_connection.transport.connected)
+        portal_info_dict = self.factory.portal.get_info_dict()
+        server_info_dict = self.factory.server_info_dict
         server_pid = self.factory.portal.server_process_id
         portal_pid = os.getpid()
-        return (True, server_connected, portal_pid, server_pid)
+        return (True, server_connected, portal_pid, server_pid, portal_info_dict, server_info_dict)
 
     def data_to_server(self, command, sessid, **kwargs):
         """
@@ -276,10 +280,9 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         """
         self.factory.launcher_connection = self
 
-        _, server_connected, _, _ = self.get_status()
+        _, server_connected, _, _, _, _ = self.get_status()
 
-        logger.log_msg("AMP SERVER operation == %s received" % (ord(operation)))
-        logger.log_msg("AMP SERVER arguments: %s" % (amp.loads(arguments)))
+        logger.log_msg("Evennia Launcher->Portal operation %s received" % (ord(operation)))
 
         if operation == amp.SSTART:   # portal start  #15
             # first, check if server is already running
@@ -395,13 +398,13 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
         elif operation == amp.PSYNC:  # portal sync
             # Server has (re-)connected and wants the session data from portal
+            self.factory.server_info_dict = kwargs.get("info_dict", {})
             sessdata = self.factory.portal.sessions.get_all_sync_data()
             self.send_AdminPortal2Server(amp.DUMMYSESSION,
                                          amp.PSYNC,
                                          sessiondata=sessdata)
             self.factory.portal.sessions.at_server_connection()
 
-            print("Portal PSYNC: %s" % self.factory.server_connection)
             if self.factory.server_connection:
                 # this is an indication the server has successfully connected, so
                 # we trigger any callbacks (usually to tell the launcher server is up)
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index 5bdd65d39e..2cffbc8f55 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -7,7 +7,6 @@ sets up all the networking features.  (this is done automatically
 by game/evennia.py).
 
 """
-from __future__ import print_function
 from builtins import object
 
 import sys
@@ -77,9 +76,13 @@ AMP_PORT = settings.AMP_PORT
 AMP_INTERFACE = settings.AMP_INTERFACE
 AMP_ENABLED = AMP_HOST and AMP_PORT and AMP_INTERFACE
 
+INFO_DICT = {"servername": SERVERNAME, "version": VERSION, "errors": "", "info": "",
+             "lockdown_mode": "", "amp": "", "telnet": [], "telnet_ssl": [], "ssh": [],
+             "webclient": [], "webserver_proxy": [], "webserver_internal": []}
 
 # -------------------------------------------------------------
 # Portal Service object
+
 # -------------------------------------------------------------
 class Portal(object):
 
@@ -114,6 +117,10 @@ class Portal(object):
 
         self.game_running = False
 
+    def get_info_dict(self):
+        "Return the Portal info, for display."
+        return INFO_DICT
+
     def set_restart_mode(self, mode=None):
         """
         This manages the flag file that tells the runner if the server
@@ -127,7 +134,6 @@ class Portal(object):
         if mode is None:
             return
         with open(PORTAL_RESTART, 'w') as f:
-            print("writing mode=%(mode)s to %(portal_restart)s" % {'mode': mode, 'portal_restart': PORTAL_RESTART})
             f.write(str(mode))
 
     def shutdown(self, restart=None, _reactor_stopping=False):
@@ -148,7 +154,6 @@ class Portal(object):
         case it always needs to be restarted manually.
 
         """
-        print("portal.shutdown: restart=", restart)
         if _reactor_stopping and hasattr(self, "shutdown_complete"):
             # we get here due to us calling reactor.stop below. No need
             # to do the shutdown procedure again.
@@ -179,10 +184,9 @@ application = service.Application('Portal')
 # and is where we store all the other services.
 PORTAL = Portal(application)
 
-print('-' * 50)
-print(' %(servername)s Portal (%(version)s) started.' % {'servername': SERVERNAME, 'version': VERSION})
 if LOCKDOWN_MODE:
-    print('  LOCKDOWN_MODE active: Only local connections.')
+
+    INFO_DICT["lockdown_mode"] = '  LOCKDOWN_MODE active: Only local connections.'
 
 if AMP_ENABLED:
 
@@ -192,7 +196,7 @@ if AMP_ENABLED:
 
     from evennia.server.portal import amp_server
 
-    print('  amp (to Server): %s (internal)' % AMP_PORT)
+    INFO_DICT["amp"] = 'amp: %s)' % AMP_PORT
 
     factory = amp_server.AMPServerFactory(PORTAL)
     amp_service = internet.TCPServer(AMP_PORT, factory, interface=AMP_INTERFACE)
@@ -223,12 +227,12 @@ if TELNET_ENABLED:
             telnet_service.setName('EvenniaTelnet%s' % pstring)
             PORTAL.services.addService(telnet_service)
 
-            print('  telnet%s: %s (external)' % (ifacestr, port))
+            INFO_DICT["telnet"].append('telnet%s: %s' % (ifacestr, port))
 
 
 if SSL_ENABLED:
 
-    # Start SSL game connection (requires PyOpenSSL).
+    # Start Telnet+SSL game connection (requires PyOpenSSL).
 
     from evennia.server.portal import ssl
 
@@ -249,7 +253,7 @@ if SSL_ENABLED:
             ssl_service.setName('EvenniaSSL%s' % pstring)
             PORTAL.services.addService(ssl_service)
 
-            print("  ssl%s: %s (external)" % (ifacestr, port))
+            INFO_DICT["telnet_ssl"].append("telnet+ssl%s: %s" % (ifacestr, port))
 
 
 if SSH_ENABLED:
@@ -273,7 +277,7 @@ if SSH_ENABLED:
             ssh_service.setName('EvenniaSSH%s' % pstring)
             PORTAL.services.addService(ssh_service)
 
-            print("  ssh%s: %s (external)" % (ifacestr, port))
+            INFO_DICT["ssh"].append("ssh%s: %s" % (ifacestr, port))
 
 
 if WEBSERVER_ENABLED:
@@ -296,7 +300,7 @@ if WEBSERVER_ENABLED:
                 ajax_webclient = webclient_ajax.AjaxWebClient()
                 ajax_webclient.sessionhandler = PORTAL_SESSIONS
                 web_root.putChild("webclientdata", ajax_webclient)
-                webclientstr = "\n   + webclient (ajax only)"
+                webclientstr = "webclient (ajax only)"
 
                 if WEBSOCKET_CLIENT_ENABLED and not websocket_started:
                     # start websocket client port for the webclient
@@ -314,10 +318,11 @@ if WEBSERVER_ENABLED:
                     factory.protocol = webclient.WebSocketClient
                     factory.sessionhandler = PORTAL_SESSIONS
                     websocket_service = internet.TCPServer(port, WebSocketFactory(factory), interface=w_interface)
-                    websocket_service.setName('EvenniaWebSocket%s:%s' % (w_ifacestr, proxyport))
+                    websocket_service.setName('EvenniaWebSocket%s:%s' % (w_ifacestr, port))
                     PORTAL.services.addService(websocket_service)
                     websocket_started = True
-                    webclientstr = "\n   + webclient-websocket%s: %s (external)" % (w_ifacestr, proxyport)
+                    webclientstr = "webclient-websocket%s: %s" % (w_ifacestr, port)
+                INFO_DICT["webclient"].append(webclientstr)
 
             web_root = Website(web_root, logPath=settings.HTTP_LOG_FILE)
             proxy_service = internet.TCPServer(proxyport,
@@ -325,16 +330,10 @@ if WEBSERVER_ENABLED:
                                                interface=interface)
             proxy_service.setName('EvenniaWebProxy%s' % pstring)
             PORTAL.services.addService(proxy_service)
-            print("  website-proxy%s: %s (external) %s" % (ifacestr, proxyport, webclientstr))
+            INFO_DICT["webserver_proxy"].append("website%s: %s" % (ifacestr, proxyport))
+            INFO_DICT["webserver_internal"].append("webserver: %s" % serverport)
 
 
 for plugin_module in PORTAL_SERVICES_PLUGIN_MODULES:
     # external plugin services to start
     plugin_module.start_plugin_services(PORTAL)
-
-print('-' * 50)  # end of terminal output
-
-if os.name == 'nt':
-    # Windows only: Set PID file manually
-    with open(PORTAL_PIDFILE, 'w') as f:
-        f.write(str(os.getpid()))
diff --git a/evennia/server/server.py b/evennia/server/server.py
index 070ddd4695..3830f3c84a 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -7,7 +7,6 @@ sets up all the networking features.  (this is done automatically
 by evennia/server/server_runner.py).
 
 """
-from __future__ import print_function
 from builtins import object
 import time
 import sys
@@ -40,11 +39,6 @@ from django.utils.translation import ugettext as _
 
 _SA = object.__setattr__
 
-SERVER_PIDFILE = ""
-if os.name == 'nt':
-    # For Windows we need to handle pid files manually.
-    SERVER_PIDFILE = os.path.join(settings.GAME_DIR, "server", 'server.pid')
-
 # a file with a flag telling the server to restart after shutdown or not.
 SERVER_RESTART = os.path.join(settings.GAME_DIR, "server", 'server.restart')
 
@@ -53,12 +47,7 @@ SERVER_STARTSTOP_MODULE = mod_import(settings.AT_SERVER_STARTSTOP_MODULE)
 
 # modules containing plugin services
 SERVER_SERVICES_PLUGIN_MODULES = [mod_import(module) for module in make_iter(settings.SERVER_SERVICES_PLUGIN_MODULES)]
-try:
-    WEB_PLUGINS_MODULE = mod_import(settings.WEB_PLUGINS_MODULE)
-except ImportError:
-    WEB_PLUGINS_MODULE = None
-    print ("WARNING: settings.WEB_PLUGINS_MODULE not found - "
-           "copy 'evennia/game_template/server/conf/web_plugins.py to mygame/server/conf.")
+
 
 #------------------------------------------------------------
 # Evennia Server settings
@@ -83,6 +72,17 @@ IRC_ENABLED = settings.IRC_ENABLED
 RSS_ENABLED = settings.RSS_ENABLED
 WEBCLIENT_ENABLED = settings.WEBCLIENT_ENABLED
 
+INFO_DICT = {"servername": SERVERNAME, "version": VERSION,
+             "amp": "", "errors": "", "info": "", "webserver": "", "irc_rss": ""}
+
+try:
+    WEB_PLUGINS_MODULE = mod_import(settings.WEB_PLUGINS_MODULE)
+except ImportError:
+    WEB_PLUGINS_MODULE = None
+    INFO_DICT["errors"] = (
+            "WARNING: settings.WEB_PLUGINS_MODULE not found - "
+            "copy 'evennia/game_template/server/conf/web_plugins.py to mygame/server/conf.")
+
 
 # Maintenance function - this is called repeatedly by the server
 
@@ -231,6 +231,8 @@ class Evennia(object):
         typeclasses in the settings file and have them auto-update all
         already existing objects.
         """
+        global INFO_DICT
+
         # setting names
         settings_names = ("CMDSET_CHARACTER", "CMDSET_ACCOUNT",
                           "BASE_ACCOUNT_TYPECLASS", "BASE_OBJECT_TYPECLASS",
@@ -249,7 +251,7 @@ class Evennia(object):
             #from evennia.accounts.models import AccountDB
             for i, prev, curr in ((i, tup[0], tup[1]) for i, tup in enumerate(settings_compare) if i in mismatches):
                 # update the database
-                print(" %s:\n '%s' changed to '%s'. Updating unchanged entries in database ..." % (settings_names[i], prev, curr))
+                INFO_DICT['info'] = " %s:\n '%s' changed to '%s'. Updating unchanged entries in database ..." % (settings_names[i], prev, curr)
                 if i == 0:
                     ObjectDB.objects.filter(db_cmdset_storage__exact=prev).update(db_cmdset_storage=curr)
                 if i == 1:
@@ -279,29 +281,27 @@ class Evennia(object):
         It returns if this is not the first time the server starts.
         Once finished the last_initial_setup_step is set to -1.
         """
+        global INFO_DICT
         last_initial_setup_step = ServerConfig.objects.conf('last_initial_setup_step')
         if not last_initial_setup_step:
             # None is only returned if the config does not exist,
             # i.e. this is an empty DB that needs populating.
-            print(' Server started for the first time. Setting defaults.')
+            INFO_DICT['info'] = ' Server started for the first time. Setting defaults.'
             initial_setup.handle_setup(0)
-            print('-' * 50)
         elif int(last_initial_setup_step) >= 0:
             # a positive value means the setup crashed on one of its
             # modules and setup will resume from this step, retrying
             # the last failed module. When all are finished, the step
             # is set to -1 to show it does not need to be run again.
-            print(' Resuming initial setup from step %(last)s.' %
-                  {'last': last_initial_setup_step})
+            INFO_DICT['info'] = ' Resuming initial setup from step {last}.'.format(
+                  last=last_initial_setup_step)
             initial_setup.handle_setup(int(last_initial_setup_step))
-            print('-' * 50)
 
     def run_init_hooks(self):
         """
         Called every server start
         """
         from evennia.objects.models import ObjectDB
-        #from evennia.accounts.models import AccountDB
 
         # update eventual changed defaults
         self.update_defaults()
@@ -366,7 +366,6 @@ class Evennia(object):
                              once - in both cases the reactor is
                              dead/stopping already.
         """
-        print("server.shutdown mode=", mode)
         if _reactor_stopping and hasattr(self, "shutdown_complete"):
             # this means we have already passed through this method
             # once; we don't need to run the shutdown procedure again.
@@ -414,10 +413,6 @@ class Evennia(object):
         # always called, also for a reload
         self.at_server_stop()
 
-        if os.name == 'nt' and os.path.exists(SERVER_PIDFILE):
-            # for Windows we need to remove pid files manually
-            os.remove(SERVER_PIDFILE)
-
         if hasattr(self, "web_root"):  # not set very first start
             yield self.web_root.empty_threadpool()
 
@@ -429,6 +424,10 @@ class Evennia(object):
         # we make sure the proper gametime is saved as late as possible
         ServerConfig.objects.conf("runtime", _GAMETIME_MODULE.runtime())
 
+    def get_info_dict(self):
+        "Return the server info, for display."
+        return INFO_DICT
+
     # server start/stop hooks
 
     def at_server_start(self):
@@ -536,9 +535,6 @@ application = service.Application('Evennia')
 # and is where we store all the other services.
 EVENNIA = Evennia(application)
 
-print('-' * 50)
-print(' %(servername)s Server (%(version)s) started.' % {'servername': SERVERNAME, 'version': VERSION})
-
 if AMP_ENABLED:
 
     # The AMP protocol handles the communication between
@@ -548,7 +544,8 @@ if AMP_ENABLED:
     ifacestr = ""
     if AMP_INTERFACE != '127.0.0.1':
         ifacestr = "-%s" % AMP_INTERFACE
-    print('  amp (to Portal)%s: %s (internal)' % (ifacestr, AMP_PORT))
+
+    INFO_DICT["amp"] = 'amp %s: %s' % (ifacestr, AMP_PORT)
 
     from evennia.server import amp_client
 
@@ -561,7 +558,6 @@ if WEBSERVER_ENABLED:
 
     # Start a django-compatible webserver.
 
-    #from twisted.python import threadpool
     from evennia.server.webserver import DjangoWebRoot, WSGIWebServer, Website, LockableThreadPool
 
     # start a thread pool and define the root url (/) as a wsgi resource
@@ -582,13 +578,14 @@ if WEBSERVER_ENABLED:
 
     web_site = Website(web_root, logPath=settings.HTTP_LOG_FILE)
 
+    INFO_DICT["webserver"] = ""
     for proxyport, serverport in WEBSERVER_PORTS:
         # create the webserver (we only need the port for this)
         webserver = WSGIWebServer(threads, serverport, web_site, interface='127.0.0.1')
         webserver.setName('EvenniaWebServer%s' % serverport)
         EVENNIA.services.addService(webserver)
 
-        print("  webserver: %s (internal)" % serverport)
+        INFO_DICT["webserver"] += "webserver: %s" % serverport
 
 ENABLED = []
 if IRC_ENABLED:
@@ -600,18 +597,11 @@ if RSS_ENABLED:
     ENABLED.append('rss')
 
 if ENABLED:
-    print("  " + ", ".join(ENABLED) + " enabled.")
+    INFO_DICT["irc_rss"] = ", ".join(ENABLED) + " enabled."
 
 for plugin_module in SERVER_SERVICES_PLUGIN_MODULES:
     # external plugin protocols
     plugin_module.start_plugin_services(EVENNIA)
 
-print('-' * 50)  # end of terminal output
-
 # clear server startup mode
 ServerConfig.objects.conf("server_starting_mode", delete=True)
-
-if os.name == 'nt':
-    # Windows only: Set PID file manually
-    with open(SERVER_PIDFILE, 'w') as f:
-        f.write(str(os.getpid()))

From 8ba52361d788603f600891f3aad497b02043474c Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Wed, 17 Jan 2018 15:36:27 -0500
Subject: [PATCH 055/217] Docstring typo fix in access method of Command

---
 evennia/commands/command.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/command.py b/evennia/commands/command.py
index 48a4b132da..17902b3602 100644
--- a/evennia/commands/command.py
+++ b/evennia/commands/command.py
@@ -297,7 +297,7 @@ class Command(with_metaclass(CommandMeta, object)):
         Args:
             srcobj (Object): Object trying to gain permission
             access_type (str, optional): The lock type to check.
-            default (bool, optional): The fallbacl result if no lock
+            default (bool, optional): The fallback result if no lock
                 of matching `access_type` is found on this Command.
 
         """

From ad1767eef553ea563b4aa584da9e924a48e60601 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 17 Jan 2018 22:11:25 +0100
Subject: [PATCH 056/217] Clean up the launcher for the new functionality.

---
 evennia/server/evennia_launcher.py | 281 ++++++-----------------------
 1 file changed, 59 insertions(+), 222 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 8056d83887..4eba70e839 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -64,14 +64,12 @@ HTTP_LOGFILE = None
 
 SERVER_PIDFILE = None
 PORTAL_PIDFILE = None
-SERVER_RESTART = None
-PORTAL_RESTART = None
 
 SERVER_PY_FILE = None
 PORTAL_PY_FILE = None
 
-SPROFILER_LOGFILE = os.path.join(GAMEDIR, SERVERDIR, "logs", "server.prof")
-PPROFILER_LOGFILE = os.path.join(GAMEDIR, SERVERDIR, "logs", "portal.prof")
+SPROFILER_LOGFILE = None
+PPROFILER_LOGFILE = None
 
 TEST_MODE = False
 ENFORCED_SETTING = False
@@ -136,6 +134,12 @@ ERROR_INPUT = \
     raised an error: '{traceback}'.
 """
 
+ERROR_NO_ALT_GAMEDIR = \
+        """
+    The path {gamedir} doesn't seem to exist.
+
+"""
+
 ERROR_NO_GAMEDIR = \
     """
     ERROR: No Evennia settings file was found. Evennia looks for the
@@ -292,40 +296,26 @@ ABOUT_INFO = \
 
 HELP_ENTRY = \
     """
-    Enter 'evennia -h' for command-line options.
+    This is a convenience launcher for the most common actions. For
+    more advanced ways to operate and manage Evennia, see  'evennia -h'.
 
-    Use option (1) in a production environment.  During development (2) is
-    usually enough, portal debugging is usually only useful if you are
-    adding new protocols or are debugging Evennia itself.
-
-    Reload with (5) to update the server with your changes without
-    disconnecting any accounts.
-
-    Note: Reload and stop are sometimes poorly supported in Windows. If you
-    have issues, log into the game to stop or restart the server instead.
+    Evennia's manual is found here: https://github.com/evennia/evennia/wiki
     """
 
 MENU = \
     """
     +----Evennia Launcher-------------------------------------------+
     |                                                               |
-    +--- Starting --------------------------------------------------+
+    +--- Common operations -----------------------------------------+
     |                                                               |
-    |  1) (normal):       All output to logfiles                    |
-    |  2) (server devel): Server logs to terminal (-i option)       |
-    |  3) (portal devel): Portal logs to terminal                   |
-    |  4) (full devel):   Both Server and Portal logs to terminal   |
+    |  1) Start Portal and Server    (also restart downed Server)   |
+    |  2) Reload Server                  (update on code changes)   |
+    |  3) Stop Portal and Server                  (full shutdown)   |
     |                                                               |
-    +--- Restarting ------------------------------------------------+
+    +--- Other -----------------------------------------------------+
     |                                                               |
-    |  5) Reload the Server                                         |
-    |  6) Reload the Portal (only works with portal/full debug)     |
-    |                                                               |
-    +--- Stopping --------------------------------------------------+
-    |                                                               |
-    |  7) Stopping both Portal and Server                           |
-    |  8) Stopping only Server                                      |
-    |  9) Stopping only Portal                                      |
+    |  4) Reset Server             (Server shutdown with restart)   |
+    |  5) Stop Server only                                          |
     |                                                               |
     +---------------------------------------------------------------+
     |  h) Help              i) About info               q) Abort    |
@@ -885,9 +875,11 @@ def stop_server_only():
             send_instruction(SSHUTD, {})
         else:
             print("Server is not running.")
+            reactor.stop()
 
     def _portal_not_running(fail):
         print("Evennia is not running.")
+        reactor.stop()
 
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
 
@@ -990,7 +982,8 @@ def check_main_evennia_dependencies():
 def set_gamedir(path):
     """
     Set GAMEDIR based on path, by figuring out where the setting file
-    is inside the directory tree.
+    is inside the directory tree. This allows for running the launcher
+    from elsewhere than the top of the gamedir folder.
 
     """
     global GAMEDIR
@@ -998,7 +991,7 @@ def set_gamedir(path):
     Ndepth = 10
     settings_path = os.path.join("server", "conf", "settings.py")
     for i in range(Ndepth):
-        gpath = os.getcwd()
+        gpath = GAMEDIR
         if "server" in os.listdir(gpath):
             if os.path.isfile(settings_path):
                 GAMEDIR = gpath
@@ -1208,8 +1201,7 @@ def del_pid(pidfile):
         os.remove(pidfile)
 
 
-def kill(pidfile, killsignal=SIG, succmsg="", errmsg="",
-         restart_file=SERVER_RESTART, restart=False):
+def kill(pidfile, killsignal=SIG, succmsg="", errmsg="", restart=False):
     """
     Send a kill signal to a process based on PID. A customized
     success/error message will be returned. If clean=True, the system
@@ -1220,23 +1212,12 @@ def kill(pidfile, killsignal=SIG, succmsg="", errmsg="",
         killsignal (int, optional): Signal identifier for signal to send.
         succmsg (str, optional): Message to log on success.
         errmsg (str, optional): Message to log on failure.
-        restart_file (str, optional): Restart file location.
-        restart (bool, optional): Are we in restart mode or not.
 
     """
     pid = get_pid(pidfile)
     if pid:
         if os.name == 'nt':
             os.remove(pidfile)
-        # set restart/norestart flag
-        if restart:
-            django.core.management.call_command(
-                'collectstatic', interactive=False, verbosity=0)
-            with open(restart_file, 'w') as f:
-                f.write("reload")
-        else:
-            with open(restart_file, 'w') as f:
-                f.write("shutdown")
         try:
             if os.name == 'nt':
                 from win32api import GenerateConsoleCtrlEvent, SetConsoleCtrlHandler
@@ -1386,7 +1367,7 @@ def init_game_directory(path, check_db=True):
     global SERVER_PY_FILE, PORTAL_PY_FILE
     global SERVER_LOGFILE, PORTAL_LOGFILE, HTTP_LOGFILE
     global SERVER_PIDFILE, PORTAL_PIDFILE
-    global SERVER_RESTART, PORTAL_RESTART
+    global SPROFILER_LOGFILE, PPROFILER_LOGFILE
     global EVENNIA_VERSION
 
     AMP_PORT = settings.AMP_PORT
@@ -1399,8 +1380,8 @@ def init_game_directory(path, check_db=True):
     SERVER_PIDFILE = os.path.join(GAMEDIR, SERVERDIR, "server.pid")
     PORTAL_PIDFILE = os.path.join(GAMEDIR, SERVERDIR, "portal.pid")
 
-    SERVER_RESTART = os.path.join(GAMEDIR, SERVERDIR, "server.restart")
-    PORTAL_RESTART = os.path.join(GAMEDIR, SERVERDIR, "portal.restart")
+    SPROFILER_LOGFILE = os.path.join(GAMEDIR, SERVERDIR, "logs", "server.prof")
+    PPROFILER_LOGFILE = os.path.join(GAMEDIR, SERVERDIR, "logs", "portal.prof")
 
     SERVER_LOGFILE = settings.SERVER_LOG_FILE
     PORTAL_LOGFILE = settings.PORTAL_LOG_FILE
@@ -1548,160 +1529,21 @@ def run_menu():
             print("Not a valid option.")
             continue
         if inp == 1:
-            # start everything, log to log files
-            server_operation("start", "all", False, False)
+            start_evennia(False, False)
         elif inp == 2:
-            # start everything, server interactive start
-            server_operation("start", "all", True, False)
+            reload_evennia(False, False)
         elif inp == 3:
-            # start everything, portal interactive start
-            server_operation("start", "server", False, False)
-            server_operation("start", "portal", True, False)
+            stop_evennia()
         elif inp == 4:
-            # start both server and portal interactively
-            server_operation("start", "server", True, False)
-            server_operation("start", "portal", True, False)
+            reload_evennia(False, True)
         elif inp == 5:
-            # reload the server
-            server_operation("reload", "server", None, None)
-        elif inp == 6:
-            # reload the portal
-            server_operation("reload", "portal", None, None)
-        elif inp == 7:
-            # stop server and portal
-            server_operation("stop", "all", None, None)
-        elif inp == 8:
-            # stop server
-            server_operation("stop", "server", None, None)
-        elif inp == 9:
-            # stop portal
-            server_operation("stop", "portal", None, None)
+            stop_server_only()
         else:
             print("Not a valid option.")
             continue
         return
 
 
-def server_operation(mode, service, interactive, profiler, logserver=False, doexit=False):
-    """
-    Handle argument options given on the command line.
-
-    Args:
-        mode (str): Start/stop/restart and so on.
-        service (str): "server", "portal" or "all".
-        interactive (bool). Use interactive mode or daemon.
-        profiler (bool): Run the service under the profiler.
-        logserver (bool, optional): Log Server data to logfile
-            specified by settings.SERVER_LOG_FILE.
-        doexit (bool, optional): If True, immediately exit the runner after
-            starting the relevant processes. If the runner exits, Evennia
-            cannot be reloaded. This is meant to be used with an external
-            process manager like Linux' start-stop-daemon.
-
-    """
-
-    cmdstr = [sys.executable, EVENNIA_RUNNER]
-    errmsg = "The %s does not seem to be running."
-
-    if mode == 'start':
-
-        # launch the error checker. Best to catch the errors already here.
-        error_check_python_modules()
-
-        # starting one or many services
-        if service == 'server':
-            if profiler:
-                cmdstr.append('--pserver')
-            if interactive:
-                cmdstr.append('--iserver')
-            if logserver:
-                cmdstr.append('--logserver')
-            cmdstr.append('--noportal')
-        elif service == 'portal':
-            if profiler:
-                cmdstr.append('--pportal')
-            if interactive:
-                cmdstr.append('--iportal')
-            cmdstr.append('--noserver')
-            django.core.management.call_command(
-                'collectstatic', verbosity=1, interactive=False)
-        else:
-            # all
-            # for convenience we don't start logging of
-            # portal, only of server with this command.
-            if profiler:
-                # this is the common case
-                cmdstr.append('--pserver')
-            if interactive:
-                cmdstr.append('--iserver')
-            if logserver:
-                cmdstr.append('--logserver')
-            django.core.management.call_command(
-                'collectstatic', verbosity=1, interactive=False)
-        if doexit:
-            cmdstr.append('--doexit')
-        cmdstr.extend([
-            GAMEDIR, TWISTED_BINARY, SERVER_LOGFILE,
-            PORTAL_LOGFILE, HTTP_LOGFILE])
-        # start the server
-        process = Popen(cmdstr, env=getenv())
-
-        if interactive:
-            try:
-                process.wait()
-            except KeyboardInterrupt:
-                server_operation("stop", "portal", False, False)
-                return
-            finally:
-                print(NOTE_KEYBOARDINTERRUPT)
-
-    elif mode == 'reload':
-        # restarting services
-        if os.name == 'nt':
-            print(
-                "Restarting from command line is not supported under Windows. "
-                "Use the in-game command (@reload by default) "
-                "or use 'evennia stop && evennia start' for a cold reboot.")
-            return
-        if service == 'server':
-            kill(SERVER_PIDFILE, SIG, "Server reloaded.",
-                 errmsg % 'Server', SERVER_RESTART, restart=True)
-        elif service == 'portal':
-            print(
-                "Note: Portal usually doesnt't need to be reloaded unless you "
-                "are debugging in interactive mode. If Portal was running in "
-                "default Daemon mode, it cannot be restarted. In that case "
-                "you have to restart it manually with 'evennia.py "
-                "start portal'")
-            kill(PORTAL_PIDFILE, SIG,
-                 "Portal reloaded (or stopped, if it was in daemon mode).",
-                 errmsg % 'Portal', PORTAL_RESTART, restart=True)
-        else:
-            # all
-            # default mode, only restart server
-            kill(SERVER_PIDFILE, SIG,
-                 "Server reload.",
-                 errmsg % 'Server', SERVER_RESTART, restart=True)
-
-    elif mode == 'stop':
-        if os.name == "nt":
-            print(
-                "(Obs: You can use a single Ctrl-C to skip "
-                "Windows' annoying 'Terminate batch job (Y/N)?' prompts.)")
-        # stop processes, avoiding reload
-        if service == 'server':
-            kill(SERVER_PIDFILE, SIG,
-                 "Server stopped.", errmsg % 'Server', SERVER_RESTART)
-        elif service == 'portal':
-            kill(PORTAL_PIDFILE, SIG,
-                 "Portal stopped.", errmsg % 'Portal', PORTAL_RESTART)
-        else:
-            kill(PORTAL_PIDFILE, SIG,
-                 "Portal stopped.", errmsg % 'Portal', PORTAL_RESTART)
-            kill(SERVER_PIDFILE, SIG,
-                 "Server stopped.", errmsg % 'Server', SERVER_RESTART)
-
-
 def main():
     """
     Run the evennia launcher main program.
@@ -1715,14 +1557,6 @@ def main():
         '-v', '--version', action='store_true',
         dest='show_version', default=False,
         help="Show version info.")
-    parser.add_argument(
-        '-i', '--interactive', action='store_true',
-        dest='interactive', default=False,
-        help="Start given processes in interactive mode.")
-    parser.add_argument(
-        '-l', '--log', action='store_true',
-        dest="logserver", default=False,
-        help="Log Server data to log file.")
     parser.add_argument(
         '--init', action='store', dest="init", metavar="name",
         help="Creates a new game directory 'name' at the current location.")
@@ -1737,6 +1571,10 @@ def main():
         '--dummyrunner', nargs=1, action='store', dest='dummyrunner',
         metavar="N",
         help="Test a running server by connecting N dummy accounts to it.")
+    parser.add_argument(
+        '--gamedir', nargs=1, action='store', dest='altgamedir',
+        default=None, metavar="path/to/gamedir",
+        help="Supply path to gamedir, if not current location")
     parser.add_argument(
         '--settings', nargs=1, action='store', dest='altsettings',
         default=None, metavar="filename.py",
@@ -1746,17 +1584,10 @@ def main():
         '--initsettings', action='store_true', dest="initsettings",
         default=False,
         help="Create a new, empty settings file as gamedir/server/conf/settings.py.")
-    parser.add_argument(
-        '--external-runner', action='store_true', dest="doexit",
-        default=False,
-        help="Handle server restart with an external process manager.")
     parser.add_argument(
         "operation", nargs='?', default="noop",
-        help="Operation to perform: 'start', 'stop', 'reload' or 'menu'.")
-    parser.add_argument(
-        "service", metavar="component", nargs='?', default="all",
-        help=("Which component to operate on: "
-              "'server', 'portal' or 'all' (default if not set)."))
+        metavar="start|stop|reload|reset|sstart|info|status|menu",
+        help="Operation to perform. Unregognized actions are passed on to Django.")
     parser.epilog = (
         "Common usage: evennia start|stop|reload. Django-admin database commands:"
         "evennia migration|flush|shell|dbshell (see the django documentation for more "
@@ -1765,7 +1596,7 @@ def main():
     args, unknown_args = parser.parse_known_args()
 
     # handle arguments
-    option, service = args.operation, args.service
+    option = args.operation
 
     # make sure we have everything
     check_main_evennia_dependencies()
@@ -1774,7 +1605,16 @@ def main():
         # show help pane
         print(CMDLINE_HELP)
         sys.exit()
-    elif args.init:
+
+    if args.altgamedir:
+        # use alternative gamedir path
+        global GAMEDIR
+        if not os.path.isdir(args.altgamedir) and not args.init:
+            print(ERROR_NO_ALT_GAMEDIR.format(args.altgamedir))
+            sys.exit()
+        GAMEDIR = args.altgamedir
+
+    if args.init:
         # initialization of game directory
         create_game_directory(args.init)
         print(CREATED_NEW_GAMEDIR.format(
@@ -1799,8 +1639,6 @@ def main():
 
     if args.initsettings:
         # create new settings file
-        global GAMEDIR
-        GAMEDIR = os.getcwd()
         try:
             create_settings_file(init=False)
             print(RECREATED_SETTINGS)
@@ -1820,29 +1658,28 @@ def main():
         # launch menu for operation
         init_game_directory(CURRENT_DIR, check_db=True)
         run_menu()
-    elif option in ('status', 'info', 'sstart', 'sreload', 'sreset', 'sstop', 'ssstop', 'start', 'reload', 'stop'):
+    elif option in ('status', 'info', 'start', 'reload', 'reset', 'stop', 'sstop'):
         # operate the server directly
         init_game_directory(CURRENT_DIR, check_db=True)
         if option == "status":
             query_status()
         elif option == "info":
             query_info()
-        elif option == "sstart":
+        elif option == "start":
             start_evennia(False, args.profiler)
-        elif option == 'sreload':
+        elif option == 'reload':
             reload_evennia(args.profiler)
-        elif option == 'sreset':
+        elif option == 'reset':
             reload_evennia(args.profiler, reset=True)
-        elif option == 'sstop':
+        elif option == 'stop':
             stop_evennia()
-        elif option == 'ssstop':
+        elif option == 'sstop':
             stop_server_only()
-        else:
-            server_operation(option, service, args.interactive,
-                             args.profiler, args.logserver, doexit=args.doexit)
     elif option != "noop":
         # pass-through to django manager
         check_db = False
+
+        # handle special django commands
         if option in ('runserver', 'testserver'):
             print(WARNING_RUNSERVER)
         if option in ("shell", "check"):
@@ -1852,12 +1689,12 @@ def main():
         if option == "test":
             global TEST_MODE
             TEST_MODE = True
+
         init_game_directory(CURRENT_DIR, check_db=check_db)
 
+        # pass on to the manager
         args = [option]
         kwargs = {}
-        if service not in ("all", "server", "portal"):
-            args.append(service)
         if unknown_args:
             for arg in unknown_args:
                 if arg.startswith("--"):

From 5f0d320ac82c22d414b382b14ae5bed5df654c60 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 18 Jan 2018 00:44:36 +0100
Subject: [PATCH 057/217] Add --gamedir option for remote-running Evennia

---
 evennia/server/evennia_launcher.py | 49 +++++++++++++++---------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 4eba70e839..594dff7438 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -136,8 +136,7 @@ ERROR_INPUT = \
 
 ERROR_NO_ALT_GAMEDIR = \
         """
-    The path {gamedir} doesn't seem to exist.
-
+    The path '{gamedir}' could not be found.
 """
 
 ERROR_NO_GAMEDIR = \
@@ -990,8 +989,9 @@ def set_gamedir(path):
 
     Ndepth = 10
     settings_path = os.path.join("server", "conf", "settings.py")
+    os.chdir(GAMEDIR)
     for i in range(Ndepth):
-        gpath = GAMEDIR
+        gpath = os.getcwd()
         if "server" in os.listdir(gpath):
             if os.path.isfile(settings_path):
                 GAMEDIR = gpath
@@ -1554,36 +1554,36 @@ def main():
 
     parser = ArgumentParser(description=CMDLINE_HELP)
     parser.add_argument(
-        '-v', '--version', action='store_true',
-        dest='show_version', default=False,
-        help="Show version info.")
+        '--gamedir', nargs=1, action='store', dest='altgamedir',
+        metavar="<path>",
+        help="Location of gamedir (default: current location)")
     parser.add_argument(
-        '--init', action='store', dest="init", metavar="name",
-        help="Creates a new game directory 'name' at the current location.")
+        '--init', action='store', dest="init", metavar="<gamename>",
+        help="Creates a new gamedir 'name' at current location.")
     parser.add_argument(
-        '--list', nargs='+', action='store', dest='listsetting', metavar="key",
+        '--list', nargs='+', action='store', dest='listsetting', metavar="all|<key>",
         help=("List values for server settings. Use 'all' to list all "
               "available keys."))
-    parser.add_argument(
-        '--profiler', action='store_true', dest='profiler', default=False,
-        help="Start given server component under the Python profiler.")
-    parser.add_argument(
-        '--dummyrunner', nargs=1, action='store', dest='dummyrunner',
-        metavar="N",
-        help="Test a running server by connecting N dummy accounts to it.")
-    parser.add_argument(
-        '--gamedir', nargs=1, action='store', dest='altgamedir',
-        default=None, metavar="path/to/gamedir",
-        help="Supply path to gamedir, if not current location")
     parser.add_argument(
         '--settings', nargs=1, action='store', dest='altsettings',
-        default=None, metavar="filename.py",
+        default=None, metavar="<path>",
         help=("Start evennia with alternative settings file from "
               "gamedir/server/conf/. (default is settings.py)"))
     parser.add_argument(
         '--initsettings', action='store_true', dest="initsettings",
         default=False,
         help="Create a new, empty settings file as gamedir/server/conf/settings.py.")
+    parser.add_argument(
+        '--profiler', action='store_true', dest='profiler', default=False,
+        help="Start given server component under the Python profiler.")
+    parser.add_argument(
+        '--dummyrunner', nargs=1, action='store', dest='dummyrunner',
+        metavar="<N>",
+        help="Test a server by connecting <N> dummy accounts to it.")
+    parser.add_argument(
+        '-v', '--version', action='store_true',
+        dest='show_version', default=False,
+        help="Show version info.")
     parser.add_argument(
         "operation", nargs='?', default="noop",
         metavar="start|stop|reload|reset|sstart|info|status|menu",
@@ -1609,10 +1609,11 @@ def main():
     if args.altgamedir:
         # use alternative gamedir path
         global GAMEDIR
-        if not os.path.isdir(args.altgamedir) and not args.init:
-            print(ERROR_NO_ALT_GAMEDIR.format(args.altgamedir))
+        altgamedir = args.altgamedir[0]
+        if not os.path.isdir(altgamedir) and not args.init:
+            print(ERROR_NO_ALT_GAMEDIR.format(gamedir=altgamedir))
             sys.exit()
-        GAMEDIR = args.altgamedir
+        GAMEDIR = altgamedir
 
     if args.init:
         # initialization of game directory

From af7dc5cc4d10852a7166d03027d98c73ff00f0c4 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 18 Jan 2018 18:59:46 +0100
Subject: [PATCH 058/217] Remove evennia_runner.py (now managed by Portal)

---
 evennia/server/evennia_runner.py | 354 -------------------------------
 1 file changed, 354 deletions(-)
 delete mode 100644 evennia/server/evennia_runner.py

diff --git a/evennia/server/evennia_runner.py b/evennia/server/evennia_runner.py
deleted file mode 100644
index d920c181e8..0000000000
--- a/evennia/server/evennia_runner.py
+++ /dev/null
@@ -1,354 +0,0 @@
-#!/usr/bin/env python
-"""
-
-This runner is controlled by the evennia launcher and should normally
-not be launched directly.  It manages the two main Evennia processes
-(Server and Portal) and most importantly runs a passive, threaded loop
-that makes sure to restart Server whenever it shuts down.
-
-Since twistd does not allow for returning an optional exit code we
-need to handle the current reload state for server and portal with
-flag-files instead. The files, one each for server and portal either
-contains True or False indicating if the process should be restarted
-upon returning, or not. A process returning != 0 will always stop, no
-matter the value of this file.
-
-"""
-from __future__ import print_function
-import os
-import sys
-from argparse import ArgumentParser
-from subprocess import Popen
-import Queue
-import thread
-import evennia
-
-try:
-    # check if launched with pypy
-    import __pypy__ as is_pypy
-except ImportError:
-    is_pypy = False
-
-SERVER = None
-PORTAL = None
-
-EVENNIA_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-EVENNIA_BIN = os.path.join(EVENNIA_ROOT, "bin")
-EVENNIA_LIB = os.path.dirname(evennia.__file__)
-
-SERVER_PY_FILE = os.path.join(EVENNIA_LIB, 'server', 'server.py')
-PORTAL_PY_FILE = os.path.join(EVENNIA_LIB, 'server', 'portal', 'portal.py')
-
-GAMEDIR = None
-SERVERDIR = "server"
-SERVER_PIDFILE = None
-PORTAL_PIDFILE = None
-SERVER_RESTART = None
-PORTAL_RESTART = None
-SERVER_LOGFILE = None
-PORTAL_LOGFILE = None
-HTTP_LOGFILE = None
-PPROFILER_LOGFILE = None
-SPROFILER_LOGFILE = None
-
-# messages
-
-CMDLINE_HELP = \
-    """
-    This program manages the running Evennia processes. It is called
-    by evennia and should not be started manually. Its main task is to
-    sit and watch the Server and restart it whenever the user reloads.
-    The runner depends on four files for its operation, two PID files
-    and two RESTART files for Server and Portal respectively; these
-    are stored in the game's server/ directory.
-    """
-
-
-PROCESS_IOERROR = \
-    """
-    {component} IOError: {traceback}
-    One possible explanation is that 'twistd' was not found.
-    """
-
-PROCESS_RESTART = "{component} restarting ..."
-
-PROCESS_DOEXIT = "Deferring to external runner."
-
-# Functions
-
-
-def set_restart_mode(restart_file, flag="reload"):
-    """
-    This sets a flag file for the restart mode.
-    """
-    with open(restart_file, 'w') as f:
-        f.write(str(flag))
-
-
-def getenv():
-    """
-    Get current environment and add PYTHONPATH
-    """
-    sep = ";" if os.name == "nt" else ":"
-    env = os.environ.copy()
-    sys.path.insert(0, GAMEDIR)
-    env['PYTHONPATH'] = sep.join(sys.path)
-    return env
-
-
-def get_restart_mode(restart_file):
-    """
-    Parse the server/portal restart status
-    """
-    if os.path.exists(restart_file):
-        with open(restart_file, 'r') as f:
-            return f.read()
-    return "shutdown"
-
-
-def get_pid(pidfile):
-    """
-    Get the PID (Process ID) by trying to access
-    an PID file.
-    """
-    pid = None
-    if os.path.exists(pidfile):
-        with open(pidfile, 'r') as f:
-            pid = f.read()
-    return pid
-
-
-def cycle_logfile(logfile):
-    """
-    Rotate the old log files to <filename>.old
-    """
-    logfile_old = logfile + '.old'
-    if os.path.exists(logfile):
-        # Cycle the old logfiles to *.old
-        if os.path.exists(logfile_old):
-            # E.g. Windows don't support rename-replace
-            os.remove(logfile_old)
-        os.rename(logfile, logfile_old)
-
-# Start program management
-
-
-def start_services(server_argv, portal_argv, doexit=False):
-    """
-    This calls a threaded loop that launches the Portal and Server
-    and then restarts them when they finish.
-    """
-    global SERVER, PORTAL
-    processes = Queue.Queue()
-
-    def server_waiter(queue):
-        try:
-            rc = Popen(server_argv, env=getenv()).wait()
-        except Exception as e:
-            print(PROCESS_ERROR.format(component="Server", traceback=e))
-            return
-        # this signals the controller that the program finished
-        queue.put(("server_stopped", rc))
-
-    def portal_waiter(queue):
-        try:
-            rc = Popen(portal_argv, env=getenv()).wait()
-        except Exception as e:
-            print(PROCESS_ERROR.format(component="Portal", traceback=e))
-            return
-        # this signals the controller that the program finished
-        queue.put(("portal_stopped", rc))
-
-    if portal_argv:
-        try:
-            if not doexit and get_restart_mode(PORTAL_RESTART) == "True":
-                # start portal as interactive, reloadable thread
-                PORTAL = thread.start_new_thread(portal_waiter, (processes, ))
-            else:
-                # normal operation: start portal as a daemon;
-                # we don't care to monitor it for restart
-                PORTAL = Popen(portal_argv, env=getenv())
-        except IOError as e:
-            print(PROCESS_IOERROR.format(component="Portal", traceback=e))
-            return
-
-    try:
-        if server_argv:
-            if doexit:
-                SERVER = Popen(server_argv, env=getenv())
-            else:
-                # start server as a reloadable thread
-                SERVER = thread.start_new_thread(server_waiter, (processes, ))
-    except IOError as e:
-        print(PROCESS_IOERROR.format(component="Server", traceback=e))
-        return
-
-    if doexit:
-        # Exit immediately
-        return
-
-    # Reload loop
-    while True:
-
-        # this blocks until something is actually returned.
-        from twisted.internet.error import ReactorNotRunning
-        try:
-            try:
-                message, rc = processes.get()
-            except KeyboardInterrupt:
-                # this only matters in interactive mode
-                break
-
-            # restart only if process stopped cleanly
-            if (message == "server_stopped" and int(rc) == 0 and
-                    get_restart_mode(SERVER_RESTART) in ("True", "reload", "reset")):
-                print(PROCESS_RESTART.format(component="Server"))
-                SERVER = thread.start_new_thread(server_waiter, (processes, ))
-                continue
-
-            # normally the portal is not reloaded since it's run as a daemon.
-            if (message == "portal_stopped" and int(rc) == 0 and
-                    get_restart_mode(PORTAL_RESTART) == "True"):
-                print(PROCESS_RESTART.format(component="Portal"))
-                PORTAL = thread.start_new_thread(portal_waiter, (processes, ))
-                continue
-            break
-        except ReactorNotRunning:
-            break
-
-
-def main():
-    """
-    This handles the command line input of the runner, usually created by
-    the evennia launcher
-    """
-
-    parser = ArgumentParser(description=CMDLINE_HELP)
-    parser.add_argument('--noserver', action='store_true', dest='noserver',
-                        default=False, help='Do not start Server process')
-    parser.add_argument('--noportal', action='store_true', dest='noportal',
-                        default=False, help='Do not start Portal process')
-    parser.add_argument('--logserver', action='store_true', dest='logserver',
-                        default=False, help='Log Server output to logfile')
-    parser.add_argument('--iserver', action='store_true', dest='iserver',
-                        default=False, help='Server in interactive mode')
-    parser.add_argument('--iportal', action='store_true', dest='iportal',
-                        default=False, help='Portal in interactive mode')
-    parser.add_argument('--pserver', action='store_true', dest='pserver',
-                        default=False, help='Profile Server')
-    parser.add_argument('--pportal', action='store_true', dest='pportal',
-                        default=False, help='Profile Portal')
-    parser.add_argument('--nologcycle', action='store_false', dest='nologcycle',
-                        default=True, help='Do not cycle log files')
-    parser.add_argument('--doexit', action='store_true', dest='doexit',
-                        default=False, help='Immediately exit after processes have started.')
-    parser.add_argument('gamedir', help="path to game dir")
-    parser.add_argument('twistdbinary', help="path to twistd binary")
-    parser.add_argument('slogfile', help="path to server log file")
-    parser.add_argument('plogfile', help="path to portal log file")
-    parser.add_argument('hlogfile', help="path to http log file")
-
-    args = parser.parse_args()
-
-    global GAMEDIR
-    global SERVER_LOGFILE, PORTAL_LOGFILE, HTTP_LOGFILE
-    global SERVER_PIDFILE, PORTAL_PIDFILE
-    global SERVER_RESTART, PORTAL_RESTART
-    global SPROFILER_LOGFILE, PPROFILER_LOGFILE
-
-    GAMEDIR = args.gamedir
-    sys.path.insert(1, os.path.join(GAMEDIR, SERVERDIR))
-
-    SERVER_PIDFILE = os.path.join(GAMEDIR, SERVERDIR, "server.pid")
-    PORTAL_PIDFILE = os.path.join(GAMEDIR, SERVERDIR, "portal.pid")
-    SERVER_RESTART = os.path.join(GAMEDIR, SERVERDIR, "server.restart")
-    PORTAL_RESTART = os.path.join(GAMEDIR, SERVERDIR, "portal.restart")
-    SERVER_LOGFILE = args.slogfile
-    PORTAL_LOGFILE = args.plogfile
-    HTTP_LOGFILE = args.hlogfile
-    TWISTED_BINARY = args.twistdbinary
-    SPROFILER_LOGFILE = os.path.join(GAMEDIR, SERVERDIR, "logs", "server.prof")
-    PPROFILER_LOGFILE = os.path.join(GAMEDIR, SERVERDIR, "logs", "portal.prof")
-
-    # set up default project calls
-    server_argv = [TWISTED_BINARY,
-                   '--nodaemon',
-                   '--logfile=%s' % SERVER_LOGFILE,
-                   '--pidfile=%s' % SERVER_PIDFILE,
-                   '--python=%s' % SERVER_PY_FILE]
-    portal_argv = [TWISTED_BINARY,
-                   '--logfile=%s' % PORTAL_LOGFILE,
-                   '--pidfile=%s' % PORTAL_PIDFILE,
-                   '--python=%s' % PORTAL_PY_FILE]
-
-    # Profiling settings (read file from python shell e.g with
-    # p = pstats.Stats('server.prof')
-    pserver_argv = ['--savestats',
-                    '--profiler=cprofile',
-                    '--profile=%s' % SPROFILER_LOGFILE]
-    pportal_argv = ['--savestats',
-                    '--profiler=cprofile',
-                    '--profile=%s' % PPROFILER_LOGFILE]
-
-    # Server
-
-    pid = get_pid(SERVER_PIDFILE)
-    if pid and not args.noserver:
-        print("\nEvennia Server is already running as process %(pid)s. Not restarted." % {'pid': pid})
-        args.noserver = True
-    if args.noserver:
-        server_argv = None
-    else:
-        set_restart_mode(SERVER_RESTART, "shutdown")
-        if not args.logserver:
-            # don't log to server logfile
-            del server_argv[2]
-            print("\nStarting Evennia Server (output to stdout).")
-        else:
-            if not args.nologcycle:
-                cycle_logfile(SERVER_LOGFILE)
-            print("\nStarting Evennia Server (output to server logfile).")
-        if args.pserver:
-            server_argv.extend(pserver_argv)
-            print("\nRunning Evennia Server under cProfile.")
-
-    # Portal
-
-    pid = get_pid(PORTAL_PIDFILE)
-    if pid and not args.noportal:
-        print("\nEvennia Portal is already running as process %(pid)s. Not restarted." % {'pid': pid})
-        args.noportal = True
-    if args.noportal:
-        portal_argv = None
-    else:
-        if args.iportal:
-            # make portal interactive
-            portal_argv[1] = '--nodaemon'
-            set_restart_mode(PORTAL_RESTART, True)
-            print("\nStarting Evennia Portal in non-Daemon mode (output to stdout).")
-        else:
-            if not args.nologcycle:
-                cycle_logfile(PORTAL_LOGFILE)
-                cycle_logfile(HTTP_LOGFILE)
-            set_restart_mode(PORTAL_RESTART, False)
-            print("\nStarting Evennia Portal in Daemon mode (output to portal logfile).")
-        if args.pportal:
-            portal_argv.extend(pportal_argv)
-            print("\nRunning Evennia Portal under cProfile.")
-    if args.doexit:
-        print(PROCESS_DOEXIT)
-
-    # Windows fixes (Windows don't support pidfiles natively)
-    if os.name == 'nt':
-        if server_argv:
-            del server_argv[-2]
-        if portal_argv:
-            del portal_argv[-2]
-
-    # Start processes
-    print("server_argv:", server_argv, portal_argv)
-    start_services(server_argv, portal_argv, doexit=args.doexit)
-
-
-if __name__ == '__main__':
-    main()

From a1666228abe405e57da22b11b6a295ee2f169664 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 18 Jan 2018 20:07:38 +0100
Subject: [PATCH 059/217] Clean up launcher help strings

---
 evennia/server/evennia_launcher.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 594dff7438..3fcfd71aa2 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -1,12 +1,13 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 """
-EVENNIA SERVER LAUNCHER SCRIPT
+Evennia launcher program
 
 This is the start point for running Evennia.
 
-Sets the appropriate environmental variables and launches the server
-and portal through the evennia_runner. Run without arguments to get a
-menu. Run the script with the -h flag to see usage information.
+Sets the appropriate environmental variables for managing an Evennia game. It will start and connect
+to the Portal, through which the Server is also controlled. This pprogram
+
+Run the script with the -h flag to see usage information.
 
 """
 from __future__ import print_function
@@ -19,6 +20,7 @@ import shutil
 import importlib
 from distutils.version import LooseVersion
 from argparse import ArgumentParser
+import argparse
 from subprocess import Popen, check_output, call, CalledProcessError, STDOUT
 
 try:
@@ -1201,7 +1203,7 @@ def del_pid(pidfile):
         os.remove(pidfile)
 
 
-def kill(pidfile, killsignal=SIG, succmsg="", errmsg="", restart=False):
+def kill(pidfile, killsignal=SIG, succmsg="", errmsg=""):
     """
     Send a kill signal to a process based on PID. A customized
     success/error message will be returned. If clean=True, the system
@@ -1562,7 +1564,7 @@ def main():
         help="Creates a new gamedir 'name' at current location.")
     parser.add_argument(
         '--list', nargs='+', action='store', dest='listsetting', metavar="all|<key>",
-        help=("List values for server settings. Use 'all' to list all "
+        help=("List values for one or more server settings. Use 'all' to list all "
               "available keys."))
     parser.add_argument(
         '--settings', nargs=1, action='store', dest='altsettings',
@@ -1584,17 +1586,18 @@ def main():
         '-v', '--version', action='store_true',
         dest='show_version', default=False,
         help="Show version info.")
+
     parser.add_argument(
         "operation", nargs='?', default="noop",
-        metavar="start|stop|reload|reset|sstart|info|status|menu",
-        help="Operation to perform. Unregognized actions are passed on to Django.")
+        help=("One of start, stop, reload, reset, sstart, info, status and menu. "
+              "Unregognized input is passed on to Django."))
     parser.epilog = (
-        "Common usage: evennia start|stop|reload. Django-admin database commands:"
-        "evennia migration|flush|shell|dbshell (see the django documentation for more "
-        "django-admin commands.)")
+        "Common Django-admin commands are shell, dbshell, migrate and flush. "
+        "See the django documentation for more django-admin commands.")
 
     args, unknown_args = parser.parse_known_args()
 
+    print(args.rest)
     # handle arguments
     option = args.operation
 

From ea13b61dc09d87d95ea16ce25006f4175235ab30 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 18 Jan 2018 20:39:08 +0100
Subject: [PATCH 060/217] Better formatting in evennia launcher help

---
 evennia/server/evennia_launcher.py | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 3fcfd71aa2..8e3645f82b 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -449,6 +449,19 @@ SERVER_INFO = \
     {errors}"""
 
 
+ARG_OPTIONS = \
+    """Actions on installed server. One of:
+ start  - launch server+portal if not running
+ stop   - shutdown server+portal
+ reload - restart server (code refresh)
+ reset  - mimic server shutdown but with auto-restart
+ sstart - start only server (requires portal)
+ status - server and portal run state
+ info   - get server and portal port info
+ menu   - show a menu of options
+Unregognized input is passed on to Django."""
+
+
 # Info formatting
 
 def print_info(portal_info_dict, server_info_dict):
@@ -1554,7 +1567,7 @@ def main():
 
     # set up argument parser
 
-    parser = ArgumentParser(description=CMDLINE_HELP)
+    parser = ArgumentParser(description=CMDLINE_HELP, formatter_class=argparse.RawTextHelpFormatter)
     parser.add_argument(
         '--gamedir', nargs=1, action='store', dest='altgamedir',
         metavar="<path>",
@@ -1564,17 +1577,17 @@ def main():
         help="Creates a new gamedir 'name' at current location.")
     parser.add_argument(
         '--list', nargs='+', action='store', dest='listsetting', metavar="all|<key>",
-        help=("List values for one or more server settings. Use 'all' to list all "
+        help=("List values for one or more server settings. Use 'all' to \n list all "
               "available keys."))
     parser.add_argument(
         '--settings', nargs=1, action='store', dest='altsettings',
         default=None, metavar="<path>",
-        help=("Start evennia with alternative settings file from "
-              "gamedir/server/conf/. (default is settings.py)"))
+        help=("Start evennia with alternative settings file from\n"
+              " gamedir/server/conf/. (default is settings.py)"))
     parser.add_argument(
         '--initsettings', action='store_true', dest="initsettings",
         default=False,
-        help="Create a new, empty settings file as gamedir/server/conf/settings.py.")
+        help="Create a new, empty settings file as\n gamedir/server/conf/settings.py.")
     parser.add_argument(
         '--profiler', action='store_true', dest='profiler', default=False,
         help="Start given server component under the Python profiler.")
@@ -1589,10 +1602,9 @@ def main():
 
     parser.add_argument(
         "operation", nargs='?', default="noop",
-        help=("One of start, stop, reload, reset, sstart, info, status and menu. "
-              "Unregognized input is passed on to Django."))
+        help=ARG_OPTIONS)
     parser.epilog = (
-        "Common Django-admin commands are shell, dbshell, migrate and flush. "
+        "Common Django-admin commands are shell, dbshell, migrate and flush.\n"
         "See the django documentation for more django-admin commands.")
 
     args, unknown_args = parser.parse_known_args()

From eff318674686fb68f4668d94d07924542a570632 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 18 Jan 2018 20:43:11 +0100
Subject: [PATCH 061/217] Further cleanup of launcher docs

---
 evennia/server/evennia_launcher.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 8e3645f82b..3088b7dbd7 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -264,12 +264,8 @@ INFO_WINDOWS_BATFILE = \
     """
 
 CMDLINE_HELP = \
-    """
-    Starts or operates the Evennia MU* server.  Allows for
-    initializing a new game directory and manages the game's database.
-    Most standard django-admin arguments and options can also be
-    passed.
-    """
+    """Starts, initializes, manages and operates the Evennia MU* server.
+Most standard django management commands are also accepted."""
 
 
 VERSION_INFO = \
@@ -1605,7 +1601,7 @@ def main():
         help=ARG_OPTIONS)
     parser.epilog = (
         "Common Django-admin commands are shell, dbshell, migrate and flush.\n"
-        "See the django documentation for more django-admin commands.")
+        "See the Django documentation for more management commands.")
 
     args, unknown_args = parser.parse_known_args()
 

From e3dc57d6ac9283fc8e5df8d5c66bb27591ab5926 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 18 Jan 2018 20:44:16 +0100
Subject: [PATCH 062/217] fix leftover debug causing error

---
 evennia/server/evennia_launcher.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 3088b7dbd7..7b109d049c 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -1605,7 +1605,6 @@ def main():
 
     args, unknown_args = parser.parse_known_args()
 
-    print(args.rest)
     # handle arguments
     option = args.operation
 

From 8c98549457fbf1cababccf125e5110440d672d52 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 18 Jan 2018 21:02:24 +0100
Subject: [PATCH 063/217] Add kill signal handling to launcher

---
 evennia/server/evennia_launcher.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 7b109d049c..3dc58be73b 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -1212,7 +1212,7 @@ def del_pid(pidfile):
         os.remove(pidfile)
 
 
-def kill(pidfile, killsignal=SIG, succmsg="", errmsg=""):
+def kill(pidfile, component='Server', killsignal=SIG):
     """
     Send a kill signal to a process based on PID. A customized
     success/error message will be returned. If clean=True, the system
@@ -1220,9 +1220,8 @@ def kill(pidfile, killsignal=SIG, succmsg="", errmsg=""):
 
     Args:
         pidfile (str): The path of the pidfile to get the PID from.
+        component (str, optional): Usually one of 'Server' or 'Portal'.
         killsignal (int, optional): Signal identifier for signal to send.
-        succmsg (str, optional): Message to log on success.
-        errmsg (str, optional): Message to log on failure.
 
     """
     pid = get_pid(pidfile)
@@ -1247,13 +1246,15 @@ def kill(pidfile, killsignal=SIG, succmsg="", errmsg=""):
                 os.kill(int(pid), killsignal)
 
         except OSError:
-            print("Process %(pid)s cannot be stopped. "
-                  "The PID file 'server/%(pidfile)s' seems stale. "
-                  "Try removing it." % {'pid': pid, 'pidfile': pidfile})
+            print("{component} ({pid}) cannot be stopped. "
+                  "The PID file '{pidfile}' seems stale. "
+                  "Try removing it manually.".format(
+                      component=component, pid=pid, pidfile=pidfile))
             return
-        print("Evennia:", succmsg)
+        print("Sent kill signal to {component}.".format(component=component))
         return
-    print("Evennia:", errmsg)
+    print("Could not send kill signal - {component} does "
+          "not appear to be running.".format(component=component))
 
 
 def show_version_info(about=False):
@@ -1669,7 +1670,7 @@ def main():
         # launch menu for operation
         init_game_directory(CURRENT_DIR, check_db=True)
         run_menu()
-    elif option in ('status', 'info', 'start', 'reload', 'reset', 'stop', 'sstop'):
+    elif option in ('status', 'info', 'start', 'reload', 'reset', 'stop', 'sstop', 'kill', 'skill'):
         # operate the server directly
         init_game_directory(CURRENT_DIR, check_db=True)
         if option == "status":
@@ -1686,6 +1687,11 @@ def main():
             stop_evennia()
         elif option == 'sstop':
             stop_server_only()
+        elif option == 'kill':
+            kill(PORTAL_PIDFILE, 'Portal')
+            kill(SERVER_PIDFILE, 'Server')
+        elif option == 'skill':
+            kill(SERVER_PIDFILE, 'Server')
     elif option != "noop":
         # pass-through to django manager
         check_db = False

From 7ff1946159ddfb858c5aeab2b5d3ffa6d00f816c Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 18 Jan 2018 21:18:34 +0100
Subject: [PATCH 064/217] Expand menu with new functionality

---
 evennia/server/evennia_launcher.py | 33 +++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 3dc58be73b..b753c79e93 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -304,20 +304,20 @@ MENU = \
     +----Evennia Launcher-------------------------------------------+
     |                                                               |
     +--- Common operations -----------------------------------------+
-    |                                                               |
     |  1) Start Portal and Server    (also restart downed Server)   |
     |  2) Reload Server                  (update on code changes)   |
     |  3) Stop Portal and Server                  (full shutdown)   |
-    |                                                               |
     +--- Other -----------------------------------------------------+
-    |                                                               |
     |  4) Reset Server             (Server shutdown with restart)   |
     |  5) Stop Server only                                          |
-    |                                                               |
+    |  6) Kill Portal + Server      (send kill signal to process)   |
+    |  7) Kill Server only                                          |
+    +--- Information -----------------------------------------------+
+    |  8) Run status                                                |
+    |  9) Port info                                                 |
     +---------------------------------------------------------------+
     |  h) Help              i) About info               q) Abort    |
-    +---------------------------------------------------------------+
-    """
+    +---------------------------------------------------------------+"""
 
 ERROR_AMP_UNCONFIGURED = \
     """
@@ -325,7 +325,6 @@ ERROR_AMP_UNCONFIGURED = \
     the game dir (it will then use the game's settings file) or specify
     the path to your game's settings file manually with the --settings
     option.
-
     """
 
 ERROR_LOGDIR_MISSING = \
@@ -344,7 +343,6 @@ ERROR_LOGDIR_MISSING = \
     you used git to clone a pre-created game directory - since log
     files are in .gitignore they will not be cloned, which leads to
     the log directory also not being created.)
-
     """
 
 ERROR_PYTHON_VERSION = \
@@ -448,14 +446,16 @@ SERVER_INFO = \
 ARG_OPTIONS = \
     """Actions on installed server. One of:
  start  - launch server+portal if not running
- stop   - shutdown server+portal
  reload - restart server (code refresh)
+ stop   - shutdown server+portal
  reset  - mimic server shutdown but with auto-restart
  sstart - start only server (requires portal)
- status - server and portal run state
- info   - get server and portal port info
+ kill   - send kill signal to portal+server (force)
+ skill  = send kill signal only to server
+ status - show server and portal run state
+ info   - show server and portal port info
  menu   - show a menu of options
-Unregognized input is passed on to Django."""
+Other input, like migrate and shell is passed on to Django."""
 
 
 # Info formatting
@@ -1550,6 +1550,15 @@ def run_menu():
             reload_evennia(False, True)
         elif inp == 5:
             stop_server_only()
+        elif inp == 6:
+            kill(PORTAL_PIDFILE, 'Portal')
+            kill(SERVER_PIDFILE, 'Server')
+        elif inp == 7:
+            kill(SERVER_PIDFILE, 'Server')
+        elif inp == 8:
+            query_status()
+        elif inp == 9:
+            query_info()
         else:
             print("Not a valid option.")
             continue

From 056c8f05b6faa3a6a79ae6b29d507bea26374c6b Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 18 Jan 2018 21:55:06 +0100
Subject: [PATCH 065/217] Enabled profile, change default websocket port

---
 evennia/server/evennia_launcher.py | 16 +++++++++-------
 evennia/server/portal/portal.py    |  4 ++--
 evennia/settings_default.py        |  6 +++---
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index b753c79e93..5e2dc065c2 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -428,16 +428,16 @@ PORTAL_INFO = \
         {webserver_proxy}
         {webclient}
     internal_ports (to Server):
-        {amp}
         {webserver_internal}
+        {amp}
 """
 
 
 SERVER_INFO = \
     """{servername} Server {version}
     internal ports (to Portal):
-        {amp}
         {webserver}
+        {amp}
     {irc_rss}
     {info}
     {errors}"""
@@ -637,11 +637,11 @@ def _get_twistd_cmdline(pprofiler, sprofiler):
 
     if pprofiler:
         portal_cmd.extend(["--savestats",
-                           "--profiler=cprofiler",
+                           "--profiler=cprofile",
                            "--profile={}".format(PPROFILER_LOGFILE)])
     if sprofiler:
         server_cmd.extend(["--savestats",
-                           "--profiler=cprofiler",
+                           "--profiler=cprofile",
                            "--profile={}".format(SPROFILER_LOGFILE)])
 
     return portal_cmd, server_cmd
@@ -770,6 +770,8 @@ def start_evennia(pprofiler=False, sprofiler=False):
         reactor.stop()
 
     def _portal_started(*args):
+        print("... Portal started.\nServer starting {} ...".format(
+            "(under cProfile)" if sprofiler else ""))
         wait_for_status_reply(_server_started)
         send_instruction(SSTART, server_cmd)
 
@@ -780,11 +782,11 @@ def start_evennia(pprofiler=False, sprofiler=False):
             print("Server is already running as process {pid}. Not restarted.".format(pid=spid))
             reactor.stop()
         else:
-            print("Server starting {}...".format("(under cProfile)" if pprofiler else ""))
+            print("Server starting {}...".format("(under cProfile)" if sprofiler else ""))
             send_instruction(SSTART, server_cmd, _server_started, _fail)
 
     def _portal_not_running(fail):
-        print("Portal starting {}...".format("(under cProfile)" if sprofiler else ""))
+        print("Portal starting {}...".format("(under cProfile)" if pprofiler else ""))
         try:
             Popen(portal_cmd, env=getenv(), bufsize=-1)
         except Exception as e:
@@ -1687,7 +1689,7 @@ def main():
         elif option == "info":
             query_info()
         elif option == "start":
-            start_evennia(False, args.profiler)
+            start_evennia(args.profiler, args.profiler)
         elif option == 'reload':
             reload_evennia(args.profiler)
         elif option == 'reset':
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index 2cffbc8f55..edd71e163c 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -196,7 +196,7 @@ if AMP_ENABLED:
 
     from evennia.server.portal import amp_server
 
-    INFO_DICT["amp"] = 'amp: %s)' % AMP_PORT
+    INFO_DICT["amp"] = 'amp: %s' % AMP_PORT
 
     factory = amp_server.AMPServerFactory(PORTAL)
     amp_service = internet.TCPServer(AMP_PORT, factory, interface=AMP_INTERFACE)
@@ -330,7 +330,7 @@ if WEBSERVER_ENABLED:
                                                interface=interface)
             proxy_service.setName('EvenniaWebProxy%s' % pstring)
             PORTAL.services.addService(proxy_service)
-            INFO_DICT["webserver_proxy"].append("website%s: %s" % (ifacestr, proxyport))
+            INFO_DICT["webserver_proxy"].append("webserver-proxy%s: %s" % (ifacestr, proxyport))
             INFO_DICT["webserver_internal"].append("webserver: %s" % serverport)
 
 
diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index 19666b8bf1..2b6bb55584 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -65,7 +65,7 @@ ALLOWED_HOSTS = ["*"]
 # the Portal proxy presents to the world. The serverports are
 # the internal ports the proxy uses to forward data to the Server-side
 # webserver (these should not be publicly open)
-WEBSERVER_PORTS = [(4001, 4002)]
+WEBSERVER_PORTS = [(4001, 4005)]
 # Interface addresses to listen to. If 0.0.0.0, listen to all. Use :: for IPv6.
 WEBSERVER_INTERFACES = ['0.0.0.0']
 # IP addresses that may talk to the server in a reverse proxy configuration,
@@ -89,12 +89,12 @@ WEBSOCKET_CLIENT_ENABLED = True
 # working through a proxy or docker port-remapping, the environment variable
 # WEBCLIENT_CLIENT_PROXY_PORT can be used to override this port only for the
 # front-facing client's sake.
-WEBSOCKET_CLIENT_PORT = 4005
+WEBSOCKET_CLIENT_PORT = 4002
 # Interface addresses to listen to. If 0.0.0.0, listen to all. Use :: for IPv6.
 WEBSOCKET_CLIENT_INTERFACE = '0.0.0.0'
 # Actual URL for webclient component to reach the websocket. You only need
 # to set this if you know you need it, like using some sort of proxy setup.
-# If given it must be on the form "ws[s]://hostname[:port]". If left at None, 
+# If given it must be on the form "ws[s]://hostname[:port]". If left at None,
 # the client will itself figure out this url based on the server's hostname.
 # e.g. ws://external.example.com or wss://external.example.com:443
 WEBSOCKET_CLIENT_URL = None

From 4c14abe77c6b2b9c3cad604b1c60e62272a026f3 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 19 Jan 2018 01:27:52 +0100
Subject: [PATCH 066/217] Change log format, rename, join server/portal logs

---
 evennia/server/evennia_launcher.py  |  2 +-
 evennia/server/portal/amp_server.py |  6 +++-
 evennia/server/portal/portal.py     | 20 +++++++++--
 evennia/server/portal/ssh.py        | 11 +++++-
 evennia/server/portal/ssl.py        |  9 +++++
 evennia/server/portal/telnet.py     |  9 +++++
 evennia/server/server.py            |  8 +++++
 evennia/server/webserver.py         |  6 ++++
 evennia/utils/logger.py             | 53 +++++++++++++++++++++++++++++
 9 files changed, 118 insertions(+), 6 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 5e2dc065c2..a9fc76e767 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -489,7 +489,7 @@ def print_info(portal_info_dict, server_info_dict):
 
     info = pstr + ("\n\n" + sstr if sstr else "")
     maxwidth = max(len(line) for line in info.split("\n"))
-    top_border = "-" * (maxwidth - 11) + " Evennia " + "--"
+    top_border = "-" * (maxwidth - 11) + " Evennia " + "---"
     border = "-" * (maxwidth + 1)
     print(top_border + "\n" + info + '\n' + border)
 
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 98e93e7a24..ed51b8952a 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -35,6 +35,10 @@ class AMPServerFactory(protocol.ServerFactory):
     """
     noisy = False
 
+    def logPrefix(self):
+        "How this is named in logs"
+        return "AMP"
+
     def __init__(self, portal):
         """
         Initialize the factory. This is called as the Portal service starts.
@@ -282,7 +286,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
         _, server_connected, _, _, _, _ = self.get_status()
 
-        logger.log_msg("Evennia Launcher->Portal operation %s received" % (ord(operation)))
+        # logger.log_msg("Evennia Launcher->Portal operation %s received" % (ord(operation)))
 
         if operation == amp.SSTART:   # portal start  #15
             # first, check if server is already running
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index edd71e163c..db054c0e36 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -14,6 +14,8 @@ import os
 
 from twisted.application import internet, service
 from twisted.internet import protocol, reactor
+from twisted.python.log import ILogObserver
+
 import django
 django.setup()
 from django.conf import settings
@@ -23,6 +25,7 @@ evennia._init()
 
 from evennia.utils.utils import get_evennia_version, mod_import, make_iter
 from evennia.server.portal.portalsessionhandler import PORTAL_SESSIONS
+from evennia.utils import logger
 from evennia.server.webserver import EvenniaReverseProxyResource
 from django.db import connection
 
@@ -180,6 +183,11 @@ class Portal(object):
 # what to execute from.
 application = service.Application('Portal')
 
+# custom logging
+logfile = logger.WeeklyLogFile(os.path.basename(settings.PORTAL_LOG_FILE),
+                               os.path.dirname(settings.PORTAL_LOG_FILE))
+application.setComponent(ILogObserver, logger.PortalLogObserver(logfile).emit)
+
 # The main Portal server program. This sets up the database
 # and is where we store all the other services.
 PORTAL = Portal(application)
@@ -219,7 +227,7 @@ if TELNET_ENABLED:
             ifacestr = "-%s" % interface
         for port in TELNET_PORTS:
             pstring = "%s:%s" % (ifacestr, port)
-            factory = protocol.ServerFactory()
+            factory = telnet.TelnetServerFactory()
             factory.noisy = False
             factory.protocol = telnet.TelnetProtocol
             factory.sessionhandler = PORTAL_SESSIONS
@@ -242,7 +250,7 @@ if SSL_ENABLED:
             ifacestr = "-%s" % interface
         for port in SSL_PORTS:
             pstring = "%s:%s" % (ifacestr, port)
-            factory = protocol.ServerFactory()
+            factory = ssl.SSLServerFactory()
             factory.noisy = False
             factory.sessionhandler = PORTAL_SESSIONS
             factory.protocol = ssl.SSLProtocol
@@ -313,7 +321,12 @@ if WEBSERVER_ENABLED:
                     if w_interface not in ('0.0.0.0', '::') or len(WEBSERVER_INTERFACES) > 1:
                         w_ifacestr = "-%s" % interface
                     port = WEBSOCKET_CLIENT_PORT
-                    factory = protocol.ServerFactory()
+
+                    class Websocket(protocol.ServerFactory):
+                        "Only here for better naming in logs"
+                        pass
+
+                    factory = Websocket()
                     factory.noisy = False
                     factory.protocol = webclient.WebSocketClient
                     factory.sessionhandler = PORTAL_SESSIONS
@@ -325,6 +338,7 @@ if WEBSERVER_ENABLED:
                 INFO_DICT["webclient"].append(webclientstr)
 
             web_root = Website(web_root, logPath=settings.HTTP_LOG_FILE)
+            web_root.is_portal = True
             proxy_service = internet.TCPServer(proxyport,
                                                web_root,
                                                interface=interface)
diff --git a/evennia/server/portal/ssh.py b/evennia/server/portal/ssh.py
index 7dde511637..3920c795d9 100644
--- a/evennia/server/portal/ssh.py
+++ b/evennia/server/portal/ssh.py
@@ -39,7 +39,7 @@ from twisted.conch.ssh import common
 from twisted.conch.insults import insults
 from twisted.conch.manhole_ssh import TerminalRealm, _Glue, ConchFactory
 from twisted.conch.manhole import Manhole, recvline
-from twisted.internet import defer
+from twisted.internet import defer, protocol
 from twisted.conch import interfaces as iconch
 from twisted.python import components
 from django.conf import settings
@@ -59,6 +59,15 @@ CTRL_BACKSLASH = '\x1c'
 CTRL_L = '\x0c'
 
 
+# not used atm
+class SSHServerFactory(protocol.ServerFactory):
+    "This is only to name this better in logs"
+    noisy = False
+
+    def logPrefix(self):
+        return "SSH"
+
+
 class SshProtocol(Manhole, session.Session):
     """
     Each account connecting over ssh gets this protocol assigned to
diff --git a/evennia/server/portal/ssl.py b/evennia/server/portal/ssl.py
index 8b638ed23d..c2c6284c93 100644
--- a/evennia/server/portal/ssl.py
+++ b/evennia/server/portal/ssl.py
@@ -7,6 +7,7 @@ from __future__ import print_function
 
 import os
 import sys
+from twisted.internet import protocol
 try:
     import OpenSSL
     from twisted.internet import ssl as twisted_ssl
@@ -50,6 +51,14 @@ example (linux, using the openssl program):
 """
 
 
+class SSLServerFactory(protocol.ServerFactory):
+    "This is only to name this better in logs"
+    noisy = False
+
+    def logPrefix(self):
+        return "SSL"
+
+
 class SSLProtocol(TelnetProtocol):
     """
     Communication is the same as telnet, except data transfer
diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py
index a1877d15ee..357b20c81b 100644
--- a/evennia/server/portal/telnet.py
+++ b/evennia/server/portal/telnet.py
@@ -8,6 +8,7 @@ sessions etc.
 """
 
 import re
+from twisted.internet import protocol
 from twisted.internet.task import LoopingCall
 from twisted.conch.telnet import Telnet, StatefulTelnetProtocol
 from twisted.conch.telnet import IAC, NOP, LINEMODE, GA, WILL, WONT, ECHO, NULL
@@ -26,6 +27,14 @@ _RE_SCREENREADER_REGEX = re.compile(r"%s" % settings.SCREENREADER_REGEX_STRIP, r
 _IDLE_COMMAND = settings.IDLE_COMMAND + "\n"
 
 
+class TelnetServerFactory(protocol.ServerFactory):
+    "This is only to name this better in logs"
+    noisy = False
+
+    def logPrefix(self):
+        return "Telnet"
+
+
 class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
     """
     Each player connecting over telnet (ie using most traditional mud
diff --git a/evennia/server/server.py b/evennia/server/server.py
index 3830f3c84a..1ce422d19b 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -16,6 +16,7 @@ from twisted.web import static
 from twisted.application import internet, service
 from twisted.internet import reactor, defer
 from twisted.internet.task import LoopingCall
+from twisted.python.log import ILogObserver
 
 import django
 django.setup()
@@ -32,6 +33,7 @@ from evennia.server.models import ServerConfig
 from evennia.server import initial_setup
 
 from evennia.utils.utils import get_evennia_version, mod_import, make_iter
+from evennia.utils import logger
 from evennia.comms import channelhandler
 from evennia.server.sessionhandler import SESSIONS
 
@@ -531,6 +533,11 @@ ServerConfig.objects.conf("server_starting_mode", True)
 # what to execute from.
 application = service.Application('Evennia')
 
+# custom logging
+logfile = logger.WeeklyLogFile(os.path.basename(settings.PORTAL_LOG_FILE),
+                               os.path.dirname(settings.PORTAL_LOG_FILE))
+application.setComponent(ILogObserver, logger.ServerLogObserver(logfile).emit)
+
 # The main evennia server program. This sets up the database
 # and is where we store all the other services.
 EVENNIA = Evennia(application)
@@ -577,6 +584,7 @@ if WEBSERVER_ENABLED:
         web_root = WEB_PLUGINS_MODULE.at_webserver_root_creation(web_root)
 
     web_site = Website(web_root, logPath=settings.HTTP_LOG_FILE)
+    web_site.is_portal = False
 
     INFO_DICT["webserver"] = ""
     for proxyport, serverport in WEBSERVER_PORTS:
diff --git a/evennia/server/webserver.py b/evennia/server/webserver.py
index 260b38071d..b1912bf120 100644
--- a/evennia/server/webserver.py
+++ b/evennia/server/webserver.py
@@ -212,6 +212,12 @@ class Website(server.Site):
     """
     noisy = False
 
+    def logPrefix(self):
+        "How to be named in logs"
+        if hasattr(self, "is_portal") and self.is_portal:
+            return "Webserver-proxy"
+        return "Webserver"
+
     def log(self, request):
         """Conditional logging"""
         if _DEBUG:
diff --git a/evennia/utils/logger.py b/evennia/utils/logger.py
index a8bcfb00e7..f288f533d6 100644
--- a/evennia/utils/logger.py
+++ b/evennia/utils/logger.py
@@ -20,6 +20,7 @@ import time
 from datetime import datetime
 from traceback import format_exc
 from twisted.python import log, logfile
+from twisted.python import util as twisted_util
 from twisted.internet.threads import deferToThread
 
 
@@ -29,6 +30,58 @@ _TIMEZONE = None
 _CHANNEL_LOG_NUM_TAIL_LINES = None
 
 
+class WeeklyLogFile(logfile.DailyLogFile):
+    """
+    Log file that rotates once per week
+
+    """
+    day_rotation = 7
+
+    def shouldRotate(self):
+        """Rotate when the date has changed since last write"""
+        # all dates here are tuples (year, month, day)
+        now = self.toDate()
+        then = self.lastDate
+        return now[0] > then[0] or now[1] > then[1] or now[2] > (then[2] + self.day_rotation)
+
+    def write(self, data):
+        "Write data to log file"
+        logfile.BaseLogFile.write(self, data)
+        self.lastDate = max(self.lastDate, self.toDate())
+
+
+class PortalLogObserver(log.FileLogObserver):
+    """
+    Reformat logging
+    """
+    timeFormat = None
+    prefix = '[P]'
+
+    def emit(self, eventDict):
+        """
+        Copied from Twisted parent, to change logging output
+
+        """
+        text = log.textFromEventDict(eventDict)
+        if text is None:
+            return
+
+        timeStr = self.formatTime(eventDict["time"])
+        if timeStr.startswith("20"):
+            timeStr = timeStr[2:]
+        fmtDict = {
+            "text": text.replace("\n", "\n\t")}
+
+        msgStr = log._safeFormat("%(text)s\n", fmtDict)
+
+        twisted_util.untilConcludes(self.write, timeStr + " %s " % self.prefix + msgStr)
+        twisted_util.untilConcludes(self.flush)
+
+
+class ServerLogObserver(PortalLogObserver):
+    prefix = "|S|"
+
+
 def timeformat(when=None):
     """
     This helper function will format the current time in the same

From 65246a32e937caf79ceeb31d7a27b7f82d1d319b Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 19 Jan 2018 01:58:24 +0100
Subject: [PATCH 067/217] Homogenize log time format in logger module

---
 evennia/utils/logger.py | 76 ++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/evennia/utils/logger.py b/evennia/utils/logger.py
index f288f533d6..fe1d31bb7d 100644
--- a/evennia/utils/logger.py
+++ b/evennia/utils/logger.py
@@ -30,6 +30,41 @@ _TIMEZONE = None
 _CHANNEL_LOG_NUM_TAIL_LINES = None
 
 
+# logging overrides
+
+
+def timeformat(when=None):
+    """
+    This helper function will format the current time in the same
+    way as the twisted logger does, including time zone info. Only
+    difference from official logger is that we only use two digits
+    for the year.
+
+    Args:
+        when (int, optional): This is a time in POSIX seconds on the form
+            given by time.time(). If not given, this function will
+            use the current time.
+
+    Returns:
+        timestring (str): A formatted string of the given time.
+    """
+    when = when if when else time.time()
+
+    # time zone offset: UTC - the actual offset
+    tz_offset = datetime.utcfromtimestamp(when) - datetime.fromtimestamp(when)
+    tz_offset = tz_offset.days * 86400 + tz_offset.seconds
+    # correct given time to utc
+    when = datetime.utcfromtimestamp(when - tz_offset)
+    tz_hour = abs(int(tz_offset // 3600))
+    tz_mins = abs(int(tz_offset // 60 % 60))
+    tz_sign = "-" if tz_offset >= 0 else "+"
+
+    return '%d-%02d-%02d %02d:%02d:%02d%s%02d%02d' % (
+        when.year - 2000, when.month, when.day,
+        when.hour, when.minute, when.second,
+        tz_sign, tz_hour, tz_mins)
+
+
 class WeeklyLogFile(logfile.DailyLogFile):
     """
     Log file that rotates once per week
@@ -55,7 +90,7 @@ class PortalLogObserver(log.FileLogObserver):
     Reformat logging
     """
     timeFormat = None
-    prefix = '[P]'
+    prefix = "  |Portal| "
 
     def emit(self, eventDict):
         """
@@ -66,50 +101,19 @@ class PortalLogObserver(log.FileLogObserver):
         if text is None:
             return
 
-        timeStr = self.formatTime(eventDict["time"])
-        if timeStr.startswith("20"):
-            timeStr = timeStr[2:]
+        # timeStr = self.formatTime(eventDict["time"])
+        timeStr = timeformat(eventDict["time"])
         fmtDict = {
             "text": text.replace("\n", "\n\t")}
 
         msgStr = log._safeFormat("%(text)s\n", fmtDict)
 
-        twisted_util.untilConcludes(self.write, timeStr + " %s " % self.prefix + msgStr)
+        twisted_util.untilConcludes(self.write, timeStr + "%s" % self.prefix + msgStr)
         twisted_util.untilConcludes(self.flush)
 
 
 class ServerLogObserver(PortalLogObserver):
-    prefix = "|S|"
-
-
-def timeformat(when=None):
-    """
-    This helper function will format the current time in the same
-    way as twisted's logger does, including time zone info.
-
-    Args:
-        when (int, optional): This is a time in POSIX seconds on the form
-            given by time.time(). If not given, this function will
-            use the current time.
-
-    Returns:
-        timestring (str): A formatted string of the given time.
-    """
-    when = when if when else time.time()
-
-    # time zone offset: UTC - the actual offset
-    tz_offset = datetime.utcfromtimestamp(when) - datetime.fromtimestamp(when)
-    tz_offset = tz_offset.days * 86400 + tz_offset.seconds
-    # correct given time to utc
-    when = datetime.utcfromtimestamp(when - tz_offset)
-    tz_hour = abs(int(tz_offset // 3600))
-    tz_mins = abs(int(tz_offset // 60 % 60))
-    tz_sign = "-" if tz_offset >= 0 else "+"
-
-    return '%d-%02d-%02d %02d:%02d:%02d%s%02d%02d' % (
-        when.year, when.month, when.day,
-        when.hour, when.minute, when.second,
-        tz_sign, tz_hour, tz_mins)
+    prefix = " "
 
 
 def log_msg(msg):

From 7daf8db1202d8990e73db5a28d418e891ab305f2 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 19 Jan 2018 01:57:48 -0500
Subject: [PATCH 068/217] Whitespace formatting MULTISESSION_MODE comments

---
 evennia/settings_default.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index 19666b8bf1..dc2e064633 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -470,7 +470,7 @@ BASE_SCRIPT_TYPECLASS = "typeclasses.scripts.Script"
 DEFAULT_HOME = "#2"
 # The start position for new characters. Default is Limbo (#2).
 #  MULTISESSION_MODE = 0, 1 - used by default unloggedin create command
-#  MULTISESSION_MODE = 2,3 - used by default character_create command
+#  MULTISESSION_MODE = 2, 3 - used by default character_create command
 START_LOCATION = "#2"
 # Lookups of Attributes, Tags, Nicks, Aliases can be aggressively
 # cached to avoid repeated database hits. This often gives noticeable
@@ -545,8 +545,8 @@ INLINEFUNC_MODULES = ["evennia.utils.inlinefuncs",
 #  3 - like mode 2, except multiple sessions can puppet one character, each
 #      session getting the same data.
 MULTISESSION_MODE = 0
-# The maximum number of characters allowed for MULTISESSION_MODE 2,3. This is
-# checked by the default ooc char-creation command. Forced to 1 for
+# The maximum number of characters allowed for MULTISESSION_MODE 2, 3.
+# This is checked by the default ooc char-creation command. Forced to 1 for
 # MULTISESSION_MODE 0 and 1.
 MAX_NR_CHARACTERS = 1
 # The access hierarchy, in climbing order. A higher permission in the

From ffa860eaadd880d09ec62fd0384e34151515846a Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 19 Jan 2018 09:50:26 +0100
Subject: [PATCH 069/217] Clean tz from log if in CET time

---
 evennia/utils/logger.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/evennia/utils/logger.py b/evennia/utils/logger.py
index fe1d31bb7d..907dfe9053 100644
--- a/evennia/utils/logger.py
+++ b/evennia/utils/logger.py
@@ -38,7 +38,7 @@ def timeformat(when=None):
     This helper function will format the current time in the same
     way as the twisted logger does, including time zone info. Only
     difference from official logger is that we only use two digits
-    for the year.
+    for the year and don't show timezone for CET times.
 
     Args:
         when (int, optional): This is a time in POSIX seconds on the form
@@ -55,14 +55,19 @@ def timeformat(when=None):
     tz_offset = tz_offset.days * 86400 + tz_offset.seconds
     # correct given time to utc
     when = datetime.utcfromtimestamp(when - tz_offset)
-    tz_hour = abs(int(tz_offset // 3600))
-    tz_mins = abs(int(tz_offset // 60 % 60))
-    tz_sign = "-" if tz_offset >= 0 else "+"
 
-    return '%d-%02d-%02d %02d:%02d:%02d%s%02d%02d' % (
+    if tz_offset == 0:
+        tz = ""
+    else:
+        tz_hour = abs(int(tz_offset // 3600))
+        tz_mins = abs(int(tz_offset // 60 % 60))
+        tz_sign = "-" if tz_offset >= 0 else "+"
+        tz = "%s%02d%s" % (tz_sign, tz_hour,
+                           (":%02d" % tz_mins if tz_mins else ""))
+
+    return '%d-%02d-%02d %02d:%02d:%02d%s' % (
         when.year - 2000, when.month, when.day,
-        when.hour, when.minute, when.second,
-        tz_sign, tz_hour, tz_mins)
+        when.hour, when.minute, when.second, tz)
 
 
 class WeeklyLogFile(logfile.DailyLogFile):

From 01ad0f884343dada93ec62a959d040aeb92b3745 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 19 Jan 2018 05:28:03 -0500
Subject: [PATCH 070/217] Fix to catch non `@` version of command

---
 evennia/commands/default/building.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index 9a7caf8567..de263fa4ff 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -2315,7 +2315,7 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
             else:
                 result = result[0]
                 string += "\n|g   %s - %s|n" % (result.get_display_name(caller), result.path)
-                if self.cmdstring == "@locate" and not is_account and result.location:
+                if "locate" in self.cmdstring and not is_account and result.location:
                     string += "  Location: {}".format(result.location.get_display_name(caller))
         else:
             # Not an account/dbref search but a wider search; build a queryset.
@@ -2352,7 +2352,7 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
                 else:
                     string = "|wOne Match|n(#%i-#%i%s):" % (low, high, restrictions)
                     string += "\n   |g%s - %s|n" % (results[0].get_display_name(caller), results[0].path)
-                    if self.cmdstring == "@locate" and nresults == 1 and results[0].location:
+                    if "locate" in self.cmdstring and nresults == 1 and results[0].location:
                         string += "  Location: {}".format(results[0].location.get_display_name(caller))
             else:
                 string = "|wMatch|n(#%i-#%i%s):" % (low, high, restrictions)

From 9aa4bec2ef8a99f6ccd0cdaa67bb65829845cada Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 19 Jan 2018 23:47:14 +0100
Subject: [PATCH 071/217] Add log-tailing to launcher options

---
 evennia/server/evennia_launcher.py | 120 ++++++++++++++++++++++++++++-
 evennia/server/portal/portal.py    |   4 +-
 evennia/server/server.py           |   4 +-
 evennia/utils/logger.py            |   5 ++
 4 files changed, 125 insertions(+), 8 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index a9fc76e767..de4ee0591a 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -75,6 +75,7 @@ PPROFILER_LOGFILE = None
 
 TEST_MODE = False
 ENFORCED_SETTING = False
+TAIL_LOG_MODE = False
 
 # communication constants
 
@@ -88,7 +89,7 @@ SSTART = chr(15)       # server start
 PSHUTD = chr(16)       # portal (+server) shutdown
 SSHUTD = chr(17)       # server-only shutdown
 PSTATUS = chr(18)      # ping server or portal status
-SRESET = chr(19)      # shutdown server in reset mode
+SRESET = chr(19)       # shutdown server in reset mode
 
 # requirements
 PYTHON_MIN = '2.7'
@@ -624,10 +625,8 @@ def _get_twistd_cmdline(pprofiler, sprofiler):
 
     """
     portal_cmd = [TWISTED_BINARY,
-                  "--logfile={}".format(PORTAL_LOGFILE),
                   "--python={}".format(PORTAL_PY_FILE)]
     server_cmd = [TWISTED_BINARY,
-                  "--logfile={}".format(SERVER_LOGFILE),
                   "--python={}".format(SERVER_PY_FILE)]
 
     if os.name != 'nt':
@@ -915,6 +914,104 @@ def query_info():
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
 
 
+def tail_server_log(filename, rate=1):
+    """
+    Tail the server logfile interactively, printing to stdout
+
+    When first starting, this will display the tail of the log file. After
+    that it will poll the log file repeatedly and display changes.
+
+    Args:
+        filename (str): Path to log file.
+        rate (int, optional): How often to poll the log file.
+
+    """
+    def _file_changed(filename, prev_size):
+        "Get size of file in bytes, get diff compared with previous size"
+        new_size = os.path.getsize(filename)
+        return new_size != prev_size, new_size
+
+
+    def _get_new_lines(filehandle, old_linecount):
+        "count lines, get the ones not counted before"
+
+        def _block(filehandle, size=65536):
+            "File block generator for quick traversal"
+            while True:
+                dat = filehandle.read(size)
+                if not dat:
+                    break
+                yield dat
+
+        # count number of lines in file
+        new_linecount = sum(blck.count("\n") for blck in _block(filehandle))
+
+        if new_linecount < old_linecount:
+            # this could happen if the file was manually deleted or edited
+            print("Log file has shrunk. Restart log reader.")
+            sys.exit()
+
+        lines_to_get = max(0, new_linecount - old_linecount)
+
+        if not lines_to_get:
+            return [], old_linecount
+
+        lines_found = []
+        buffer_size = 4098
+        block_count = -1
+
+        while len(lines_found) < lines_to_get:
+            try:
+                # scan backwards in file, starting from the end
+                filehandle.seek(block_count * buffer_size, os.SEEK_END)
+            except IOError:
+                # file too small for current seek, include entire file
+                filehandle.seek(0)
+                lines_found = filehandle.readlines()
+                break
+            lines_found = filehandle.readlines()
+            block_count -= 1
+
+        # only actually return the new lines
+        return lines_found[-lines_to_get:], new_linecount
+
+    def _tail_file(filename, file_size, line_count, max_lines=None):
+        """This will cycle repeatedly, printing new lines"""
+
+        # poll for changes
+        has_changed, file_size = _file_changed(filename, file_size)
+
+        if has_changed:
+            try:
+                with open(filename, 'r') as filehandle:
+                    new_lines, line_count = _get_new_lines(filehandle, line_count)
+            except IOError:
+                # the log file might not exist yet. Wait a little, then try again ...
+                pass
+            else:
+                if max_lines:
+                    # first startup
+                    print("   Tailing logfile {} ...".format(filename))
+                    new_lines = new_lines[-max_lines:]
+
+                # print to stdout without line break (log has its own line feeds)
+                sys.stdout.write("".join(new_lines))
+                sys.stdout.flush()
+
+        # set up the next poll
+        reactor.callLater(rate, _tail_file, filename, file_size, line_count, max_lines=100)
+
+    reactor.callLater(0, _tail_file, filename, 0, 0, max_lines=20)
+    reactor.run()
+
+
+# ------------------------------------------------------------
+#
+# Environment setup
+#
+# ------------------------------------------------------------
+
+
 def evennia_version():
     """
     Get the Evennia version info from the main package.
@@ -1572,6 +1669,7 @@ def main():
     Run the evennia launcher main program.
 
     """
+    global TAIL_LOG_MODE
 
     # set up argument parser
 
@@ -1583,6 +1681,9 @@ def main():
     parser.add_argument(
         '--init', action='store', dest="init", metavar="<gamename>",
         help="Creates a new gamedir 'name' at current location.")
+    parser.add_argument(
+        '--log', '-l', action='store_true', dest='tail_log', default=False,
+        help="Tail the server logfile to standard out.")
     parser.add_argument(
         '--list', nargs='+', action='store', dest='listsetting', metavar="all|<key>",
         help=("List values for one or more server settings. Use 'all' to \n list all "
@@ -1623,6 +1724,8 @@ def main():
     # make sure we have everything
     check_main_evennia_dependencies()
 
+    TAIL_LOG_MODE = args.tail_log
+
     if not args:
         # show help pane
         print(CMDLINE_HELP)
@@ -1740,10 +1843,19 @@ def main():
             args = ", ".join(args)
             kwargs = ", ".join(["--%s" % kw for kw in kwargs])
             print(ERROR_INPUT.format(traceback=exc, args=args, kwargs=kwargs))
-    else:
+
+    elif not TAIL_LOG_MODE:
         # no input; print evennia info
         print(ABOUT_INFO)
 
+    if TAIL_LOG_MODE:
+        # start the log-tail last
+        if not SERVER_LOGFILE:
+            init_game_directory(CURRENT_DIR, check_db=False)
+        tail_server_log(SERVER_LOGFILE)
+
+
+
 
 if __name__ == '__main__':
     # start Evennia from the command line
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index db054c0e36..d522975999 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -184,8 +184,8 @@ class Portal(object):
 application = service.Application('Portal')
 
 # custom logging
-logfile = logger.WeeklyLogFile(os.path.basename(settings.PORTAL_LOG_FILE),
-                               os.path.dirname(settings.PORTAL_LOG_FILE))
+logfile = logger.WeeklyLogFile(os.path.basename(settings.SERVER_LOG_FILE),
+                               os.path.dirname(settings.SERVER_LOG_FILE))
 application.setComponent(ILogObserver, logger.PortalLogObserver(logfile).emit)
 
 # The main Portal server program. This sets up the database
diff --git a/evennia/server/server.py b/evennia/server/server.py
index 1ce422d19b..c665fc143e 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -534,8 +534,8 @@ ServerConfig.objects.conf("server_starting_mode", True)
 application = service.Application('Evennia')
 
 # custom logging
-logfile = logger.WeeklyLogFile(os.path.basename(settings.PORTAL_LOG_FILE),
-                               os.path.dirname(settings.PORTAL_LOG_FILE))
+logfile = logger.WeeklyLogFile(os.path.basename(settings.SERVER_LOG_FILE),
+                               os.path.dirname(settings.SERVER_LOG_FILE))
 application.setComponent(ILogObserver, logger.ServerLogObserver(logfile).emit)
 
 # The main evennia server program. This sets up the database
diff --git a/evennia/utils/logger.py b/evennia/utils/logger.py
index 907dfe9053..30af5d2226 100644
--- a/evennia/utils/logger.py
+++ b/evennia/utils/logger.py
@@ -187,6 +187,11 @@ log_errmsg = log_err
 
 
 def log_server(servermsg):
+    """
+    This is for the Portal to log captured Server stdout messages (it's
+    usually only used during startup, before Server log is open)
+
+    """
     try:
         servermsg = str(servermsg)
     except Exception as e:

From 1cba5f9a9f0f3c6b5b5261493f2cce83aedbd177 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Jan 2018 00:06:34 +0100
Subject: [PATCH 072/217] Make --log operate simultaneously to other commands

---
 evennia/server/evennia_launcher.py | 87 ++++++++++++++++--------------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index de4ee0591a..42bdd8cf84 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -75,7 +75,9 @@ PPROFILER_LOGFILE = None
 
 TEST_MODE = False
 ENFORCED_SETTING = False
-TAIL_LOG_MODE = False
+
+REACTOR_RUN = False
+NO_REACTOR_STOP = False
 
 # communication constants
 
@@ -557,12 +559,17 @@ class AMPLauncherProtocol(amp.AMP):
         return {"status": ""}
 
 
+def _reactor_stop():
+    if not NO_REACTOR_STOP:
+        reactor.stop()
+
+
 def send_instruction(operation, arguments, callback=None, errback=None):
     """
     Send instruction and handle the response.
 
     """
-    global AMP_CONNECTION
+    global AMP_CONNECTION, REACTOR_RUN
 
     if None in (AMP_HOST, AMP_PORT, AMP_INTERFACE):
         print(ERROR_AMP_UNCONFIGURED)
@@ -610,9 +617,7 @@ def send_instruction(operation, arguments, callback=None, errback=None):
         point = endpoints.TCP4ClientEndpoint(reactor, AMP_HOST, AMP_PORT)
         deferred = endpoints.connectProtocol(point, AMPLauncherProtocol())
         deferred.addCallbacks(_on_connect, _on_connect_fail)
-        if not reactor.running:
-            reactor.run()
-
+        REACTOR_RUN = True
 
 def _parse_status(response):
     "Unpack the status information"
@@ -661,12 +666,12 @@ def query_status(callback=None):
             pstatus, sstatus, ppid, spid, pinfo, sinfo = _parse_status(response)
             print("Portal:   {} (pid {})\nServer:   {} (pid {})".format(
                 wmap[pstatus], ppid, wmap[sstatus], spid))
-            reactor.stop()
+            _reactor_stop()
 
     def _errback(fail):
         pstatus, sstatus = False, False
         print("Portal:   {}\nServer:   {}".format(wmap[pstatus], wmap[sstatus]))
-        reactor.stop()
+        _reactor_stop()
 
     send_instruction(PSTATUS, None, _callback, _errback)
 
@@ -705,14 +710,14 @@ def wait_for_status(portal_running=True, server_running=True, callback=None, err
             if callback:
                 callback(prun, srun)
             else:
-                reactor.stop()
+                _reactor_stop()
         else:
             if retries <= 0:
                 if errback:
                     errback(prun, srun)
                 else:
                     print("Connection to Evennia timed out. Try again.")
-                    reactor.stop()
+                    _reactor_stop()
             else:
                 reactor.callLater(rate, wait_for_status,
                                   portal_running, server_running,
@@ -727,14 +732,14 @@ def wait_for_status(portal_running=True, server_running=True, callback=None, err
             if callback:
                 callback(portal_running, server_running)
             else:
-                reactor.stop()
+                _reactor_stop()
         else:
             if retries <= 0:
                 if errback:
                     errback(portal_running, server_running)
                 else:
                     print("Connection to Evennia timed out. Try again.")
-                    reactor.stop()
+                    _reactor_stop()
             else:
                 reactor.callLater(rate, wait_for_status,
                                   portal_running, server_running,
@@ -759,14 +764,14 @@ def start_evennia(pprofiler=False, sprofiler=False):
 
     def _fail(fail):
         print(fail)
-        reactor.stop()
+        _reactor_stop()
 
     def _server_started(response):
         print("... Server started.\nEvennia running.")
         if response:
             _, _, _, _, pinfo, sinfo = response
             print_info(pinfo, sinfo)
-        reactor.stop()
+        _reactor_stop()
 
     def _portal_started(*args):
         print("... Portal started.\nServer starting {} ...".format(
@@ -779,7 +784,7 @@ def start_evennia(pprofiler=False, sprofiler=False):
         print("Portal is already running as process {pid}. Not restarted.".format(pid=ppid))
         if srun:
             print("Server is already running as process {pid}. Not restarted.".format(pid=spid))
-            reactor.stop()
+            _reactor_stop()
         else:
             print("Server starting {}...".format("(under cProfile)" if sprofiler else ""))
             send_instruction(SSTART, server_cmd, _server_started, _fail)
@@ -790,7 +795,7 @@ def start_evennia(pprofiler=False, sprofiler=False):
             Popen(portal_cmd, env=getenv(), bufsize=-1)
         except Exception as e:
             print(PROCESS_ERROR.format(component="Portal", traceback=e))
-            reactor.stop()
+            _reactor_stop()
         wait_for_status(True, None, _portal_started)
 
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
@@ -808,11 +813,11 @@ def reload_evennia(sprofiler=False, reset=False):
 
     def _server_restarted(*args):
         print("... Server re-started.")
-        reactor.stop()
+        _reactor_stop()
 
     def _server_reloaded(status):
         print("... Server {}.".format("reset" if reset else "reloaded"))
-        reactor.stop()
+        _reactor_stop()
 
     def _server_stopped(status):
         wait_for_status_reply(_server_reloaded)
@@ -844,7 +849,7 @@ def stop_evennia():
     """
     def _portal_stopped(*args):
         print("... Portal stopped.\nEvennia shut down.")
-        reactor.stop()
+        _reactor_stop()
 
     def _server_stopped(*args):
         print("... Server stopped.\nStopping Portal ...")
@@ -864,7 +869,7 @@ def stop_evennia():
 
     def _portal_not_running(fail):
         print("Evennia is not running.")
-        reactor.stop()
+        _reactor_stop()
 
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
 
@@ -876,7 +881,7 @@ def stop_server_only():
     """
     def _server_stopped(*args):
         print("... Server stopped.")
-        reactor.stop()
+        _reactor_stop()
 
     def _portal_running(response):
         _, srun, _, _, _, _ = _parse_status(response)
@@ -886,11 +891,11 @@ def stop_server_only():
             send_instruction(SSHUTD, {})
         else:
             print("Server is not running.")
-            reactor.stop()
+            _reactor_stop()
 
     def _portal_not_running(fail):
         print("Evennia is not running.")
-        reactor.stop()
+        _reactor_stop()
 
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
 
@@ -903,7 +908,7 @@ def query_info():
     def _got_status(status):
         _, _, _, _, pinfo, sinfo = _parse_status(status)
         print_info(pinfo, sinfo)
-        reactor.stop()
+        _reactor_stop()
 
     def _portal_running(response):
         query_status(_got_status)
@@ -926,6 +931,8 @@ def tail_server_log(filename, rate=1):
         rate (int, optional): How often to poll the log file.
 
     """
+    global REACTOR_RUN
+
     def _file_changed(filename, prev_size):
         "Get size of file in bytes, get diff compared with previous size"
         new_size = os.path.getsize(filename)
@@ -991,7 +998,6 @@ def tail_server_log(filename, rate=1):
             else:
                 if max_lines:
                     # first startup
-                    print("   Tailing logfile {} ...".format(filename))
                     new_lines = new_lines[-max_lines:]
 
                 # print to stdout without line break (log has its own line feeds)
@@ -1002,7 +1008,7 @@ def tail_server_log(filename, rate=1):
         reactor.callLater(rate, _tail_file, filename, file_size, line_count, max_lines=100)
 
     reactor.callLater(0, _tail_file, filename, 0, 0, max_lines=20)
-    reactor.run()
+    REACTOR_RUN = True
 
 
 # ------------------------------------------------------------
@@ -1669,8 +1675,6 @@ def main():
     Run the evennia launcher main program.
 
     """
-    global TAIL_LOG_MODE
-
     # set up argument parser
 
     parser = ArgumentParser(description=CMDLINE_HELP, formatter_class=argparse.RawTextHelpFormatter)
@@ -1724,8 +1728,6 @@ def main():
     # make sure we have everything
     check_main_evennia_dependencies()
 
-    TAIL_LOG_MODE = args.tail_log
-
     if not args:
         # show help pane
         print(CMDLINE_HELP)
@@ -1755,8 +1757,8 @@ def main():
 
     if args.altsettings:
         # use alternative settings file
-        sfile = args.altsettings[0]
         global SETTINGSFILE, SETTINGS_DOTPATH, ENFORCED_SETTING
+        sfile = args.altsettings[0]
         SETTINGSFILE = sfile
         ENFORCED_SETTING = True
         SETTINGS_DOTPATH = "server.conf.%s" % sfile.rstrip(".py")
@@ -1772,6 +1774,15 @@ def main():
             print(ERROR_INITSETTINGS)
         sys.exit()
 
+    if args.tail_log:
+        # set up for tailing the server log file
+        global NO_REACTOR_STOP
+        NO_REACTOR_STOP = True
+        if not SERVER_LOGFILE:
+            init_game_directory(CURRENT_DIR, check_db=False)
+        tail_server_log(SERVER_LOGFILE)
+        print("   Tailing logfile {} ...".format(SERVER_LOGFILE))
+
     if args.dummyrunner:
         # launch the dummy runner
         init_game_directory(CURRENT_DIR, check_db=True)
@@ -1786,7 +1797,8 @@ def main():
         run_menu()
     elif option in ('status', 'info', 'start', 'reload', 'reset', 'stop', 'sstop', 'kill', 'skill'):
         # operate the server directly
-        init_game_directory(CURRENT_DIR, check_db=True)
+        if not SERVER_LOGFILE:
+            init_game_directory(CURRENT_DIR, check_db=True)
         if option == "status":
             query_status()
         elif option == "info":
@@ -1844,17 +1856,12 @@ def main():
             kwargs = ", ".join(["--%s" % kw for kw in kwargs])
             print(ERROR_INPUT.format(traceback=exc, args=args, kwargs=kwargs))
 
-    elif not TAIL_LOG_MODE:
-        # no input; print evennia info
+    elif not args.tail_log:
+        # no input; print evennia info (don't pring if we're tailing log)
         print(ABOUT_INFO)
 
-    if TAIL_LOG_MODE:
-        # start the log-tail last
-        if not SERVER_LOGFILE:
-            init_game_directory(CURRENT_DIR, check_db=False)
-        tail_server_log(SERVER_LOGFILE)
-
-
+    if REACTOR_RUN:
+        reactor.run()
 
 
 if __name__ == '__main__':

From 08cb2840b38f2daec3b8cbad9058271632b58e6a Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Jan 2018 00:14:04 +0100
Subject: [PATCH 073/217] Add MERGE_LOGS for those not wanting to merge
 server/portal logs

---
 evennia/server/portal/portal.py | 4 ++--
 evennia/settings_default.py     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index d522975999..d7fcadcbcb 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -184,8 +184,8 @@ class Portal(object):
 application = service.Application('Portal')
 
 # custom logging
-logfile = logger.WeeklyLogFile(os.path.basename(settings.SERVER_LOG_FILE),
-                               os.path.dirname(settings.SERVER_LOG_FILE))
+logfile = settings.SERVER_LOG_FILE if settings.MERGE_LOGS else settings.PORTAL_LOG_FILE
+logfile = logger.WeeklyLogFile(os.path.basename(logfile), os.path.dirname(logfile))
 application.setComponent(ILogObserver, logger.PortalLogObserver(logfile).emit)
 
 # The main Portal server program. This sets up the database
diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index 2b6bb55584..3bb2b504aa 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -134,6 +134,8 @@ LOG_DIR = os.path.join(GAME_DIR, 'server', 'logs')
 SERVER_LOG_FILE = os.path.join(LOG_DIR, 'server.log')
 PORTAL_LOG_FILE = os.path.join(LOG_DIR, 'portal.log')
 HTTP_LOG_FILE = os.path.join(LOG_DIR, 'http_requests.log')
+# if this is true, merge logs into only the SERVER_LOG_FILE location.
+MERGE_LOGS = True
 # if this is set to the empty string, lockwarnings will be turned off.
 LOCKWARNING_LOG_FILE = os.path.join(LOG_DIR, 'lockwarnings.log')
 # Rotate log files when server and/or portal stops. This will keep log

From 7e7dab24bcbee47eb7f2242857a4ed818fa94cff Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Jan 2018 00:34:13 +0100
Subject: [PATCH 074/217] Add support for tail-log in launcher menu

---
 evennia/server/evennia_launcher.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 42bdd8cf84..e33f13a4b2 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -316,8 +316,9 @@ MENU = \
     |  6) Kill Portal + Server      (send kill signal to process)   |
     |  7) Kill Server only                                          |
     +--- Information -----------------------------------------------+
-    |  8) Run status                                                |
-    |  9) Port info                                                 |
+    |  8) Tail log file
+    |  9) Run status                                                |
+    | 10) Port info                                                 |
     +---------------------------------------------------------------+
     |  h) Help              i) About info               q) Abort    |
     +---------------------------------------------------------------+"""
@@ -938,7 +939,6 @@ def tail_server_log(filename, rate=1):
         new_size = os.path.getsize(filename)
         return new_size != prev_size, new_size
 
-
     def _get_new_lines(filehandle, old_linecount):
         "count lines, get the ones not counted before"
 
@@ -1661,8 +1661,13 @@ def run_menu():
         elif inp == 7:
             kill(SERVER_PIDFILE, 'Server')
         elif inp == 8:
-            query_status()
+            if not SERVER_LOGFILE:
+                init_game_directory(CURRENT_DIR, check_db=False)
+            tail_server_log(SERVER_LOGFILE)
+            print("   Tailing logfile {} ...".format(SERVER_LOGFILE))
         elif inp == 9:
+            query_status()
+        elif inp == 10:
             query_info()
         else:
             print("Not a valid option.")

From 4a8c554ebbccef4c0c98fd9ffa5c222ee6ce97ef Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Jan 2018 00:51:41 +0100
Subject: [PATCH 075/217] Add missing border line in menu

---
 evennia/server/evennia_launcher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index e33f13a4b2..58442d2678 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -316,7 +316,7 @@ MENU = \
     |  6) Kill Portal + Server      (send kill signal to process)   |
     |  7) Kill Server only                                          |
     +--- Information -----------------------------------------------+
-    |  8) Tail log file
+    |  8) Tail log file                                             |
     |  9) Run status                                                |
     | 10) Port info                                                 |
     +---------------------------------------------------------------+

From 09d0c99a212d11f4ff0e756cf137cdee81db01cf Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Jan 2018 12:41:27 +0100
Subject: [PATCH 076/217] Remove dependence on .restart file, add reboot option
 to launcher

---
 evennia/server/amp_client.py        |   7 +-
 evennia/server/evennia_launcher.py  | 219 ++++++++++++++++++----------
 evennia/server/portal/amp_server.py |   8 +-
 evennia/server/portal/portal.py     |   6 +-
 evennia/server/server.py            |  58 ++------
 evennia/server/sessionhandler.py    |   4 +-
 evennia/utils/logger.py             |   2 +-
 7 files changed, 173 insertions(+), 131 deletions(-)

diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index 603924190a..294250b9e7 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -104,7 +104,7 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
         info_dict = self.factory.server.get_info_dict()
         super(AMPServerClientProtocol, self).connectionMade()
         # first thing we do is to request the Portal to sync all sessions
-        # back with the Server side
+        # back with the Server side. We also need the startup mode (reload, reset, shutdown)
         self.send_AdminServer2Portal(amp.DUMMYSESSION, operation=amp.PSYNC, info_dict=info_dict)
 
     def data_to_portal(self, command, sessid, **kwargs):
@@ -212,7 +212,10 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
             server_sessionhandler.portal_disconnect_all()
 
         elif operation == amp.PSYNC:  # portal_session_sync
-            # force a resync of sessions from the portal side
+            # force a resync of sessions from the portal side. This happens on
+            # first server-connect.
+            server_restart_mode = kwargs.get("server_restart_mode", "shutdown")
+            self.factory.server.run_init_hooks(server_restart_mode)
             server_sessionhandler.portal_sessions_sync(kwargs.get("sessiondata"))
 
         elif operation == amp.SRELOAD:  # server reload
diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 58442d2678..296cf61b12 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -305,20 +305,24 @@ HELP_ENTRY = \
 MENU = \
     """
     +----Evennia Launcher-------------------------------------------+
-    |                                                               |
+    {gameinfo}
     +--- Common operations -----------------------------------------+
-    |  1) Start Portal and Server    (also restart downed Server)   |
-    |  2) Reload Server                  (update on code changes)   |
-    |  3) Stop Portal and Server                  (full shutdown)   |
+    |  1) Start                     (also restart stopped Server)   |
+    |  2) Reload             (stop/start Server in 'reload' mode)   |
+    |  3) Stop                       (shutdown Portal and Server)   |
+    |  4) Reboot                          (shutdown then restart)   |
     +--- Other -----------------------------------------------------+
-    |  4) Reset Server             (Server shutdown with restart)   |
-    |  5) Stop Server only                                          |
-    |  6) Kill Portal + Server      (send kill signal to process)   |
-    |  7) Kill Server only                                          |
+    |  5) Reset            (stop/start Server in 'shutdown' mode)   |
+    |  6) Stop Server only                                          |
+    |  7) Kill Server only          (send kill signal to process)   |
+    |  8) Kill Portal + Server                                      |
     +--- Information -----------------------------------------------+
-    |  8) Tail log file                                             |
-    |  9) Run status                                                |
-    | 10) Port info                                                 |
+    |  9) Tail log file                                             |
+    | 10) Run status                                                |
+    | 11) Port info                                                 |
+    +--- Testing ---------------------------------------------------+
+    | 12) Test gamedir           (run gamedir test suite, if any)   |
+    | 13) Test Evennia                   (run evennia test suite)   |
     +---------------------------------------------------------------+
     |  h) Help              i) About info               q) Abort    |
     +---------------------------------------------------------------+"""
@@ -452,7 +456,8 @@ ARG_OPTIONS = \
  start  - launch server+portal if not running
  reload - restart server (code refresh)
  stop   - shutdown server+portal
- reset  - mimic server shutdown but with auto-restart
+ reboot - shutdown server+portal, then start again
+ reset  - restart server in shutdown-mode (not reload mode)
  sstart - start only server (requires portal)
  kill   - send kill signal to portal+server (force)
  skill  = send kill signal only to server
@@ -461,10 +466,13 @@ ARG_OPTIONS = \
  menu   - show a menu of options
 Other input, like migrate and shell is passed on to Django."""
 
+# ------------------------------------------------------------
+#
+# Private helper functions
+#
+# ------------------------------------------------------------
 
-# Info formatting
-
-def print_info(portal_info_dict, server_info_dict):
+def _print_info(portal_info_dict, server_info_dict):
     """
     Format info dicts from the Portal/Server for display
 
@@ -498,6 +506,43 @@ def print_info(portal_info_dict, server_info_dict):
     print(top_border + "\n" + info + '\n' + border)
 
 
+def _parse_status(response):
+    "Unpack the status information"
+    return pickle.loads(response['status'])
+
+
+def _get_twistd_cmdline(pprofiler, sprofiler):
+    """
+    Compile the command line for starting a Twisted application using the 'twistd' executable.
+
+    """
+    portal_cmd = [TWISTED_BINARY,
+                  "--python={}".format(PORTAL_PY_FILE)]
+    server_cmd = [TWISTED_BINARY,
+                  "--python={}".format(SERVER_PY_FILE)]
+
+    if os.name != 'nt':
+        # PID files only for UNIX
+        portal_cmd.append("--pidfile={}".format(PORTAL_PIDFILE))
+        server_cmd.append("--pidfile={}".format(SERVER_PIDFILE))
+
+    if pprofiler:
+        portal_cmd.extend(["--savestats",
+                           "--profiler=cprofile",
+                           "--profile={}".format(PPROFILER_LOGFILE)])
+    if sprofiler:
+        server_cmd.extend(["--savestats",
+                           "--profiler=cprofile",
+                           "--profile={}".format(SPROFILER_LOGFILE)])
+
+    return portal_cmd, server_cmd
+
+
+def _reactor_stop():
+    if not NO_REACTOR_STOP:
+        reactor.stop()
+
+
 # ------------------------------------------------------------
 #
 #  Protocol Evennia launcher - Portal/Server communication
@@ -560,11 +605,6 @@ class AMPLauncherProtocol(amp.AMP):
         return {"status": ""}
 
 
-def _reactor_stop():
-    if not NO_REACTOR_STOP:
-        reactor.stop()
-
-
 def send_instruction(operation, arguments, callback=None, errback=None):
     """
     Send instruction and handle the response.
@@ -579,12 +619,10 @@ def send_instruction(operation, arguments, callback=None, errback=None):
     def _callback(result):
         if callback:
             callback(result)
-        # prot.transport.loseConnection()
 
     def _errback(fail):
         if errback:
             errback(fail)
-        # prot.transport.loseConnection()
 
     def _on_connect(prot):
         """
@@ -620,37 +658,6 @@ def send_instruction(operation, arguments, callback=None, errback=None):
         deferred.addCallbacks(_on_connect, _on_connect_fail)
         REACTOR_RUN = True
 
-def _parse_status(response):
-    "Unpack the status information"
-    return pickle.loads(response['status'])
-
-
-def _get_twistd_cmdline(pprofiler, sprofiler):
-    """
-    Compile the command line for starting a Twisted application using the 'twistd' executable.
-
-    """
-    portal_cmd = [TWISTED_BINARY,
-                  "--python={}".format(PORTAL_PY_FILE)]
-    server_cmd = [TWISTED_BINARY,
-                  "--python={}".format(SERVER_PY_FILE)]
-
-    if os.name != 'nt':
-        # PID files only for UNIX
-        portal_cmd.append("--pidfile={}".format(PORTAL_PIDFILE))
-        server_cmd.append("--pidfile={}".format(SERVER_PIDFILE))
-
-    if pprofiler:
-        portal_cmd.extend(["--savestats",
-                           "--profiler=cprofile",
-                           "--profile={}".format(PPROFILER_LOGFILE)])
-    if sprofiler:
-        server_cmd.extend(["--savestats",
-                           "--profiler=cprofile",
-                           "--profile={}".format(SPROFILER_LOGFILE)])
-
-    return portal_cmd, server_cmd
-
 
 def query_status(callback=None):
     """
@@ -693,9 +700,10 @@ def wait_for_status(portal_running=True, server_running=True, callback=None, err
     Repeat the status ping until the desired state combination is achieved.
 
     Args:
-        portal_running (bool or None): Desired portal run-state. If None, any state is accepted.
-        server_running (bool or None): Desired server run-state. If None, any state is accepted.
-            the portal must be running.
+        portal_running (bool or None): Desired portal run-state. If None, any state
+            is accepted.
+        server_running (bool or None): Desired server run-state. If None, any state
+            is accepted. The portal must be running.
         callback (callable): Will be called with portal_state, server_state when
             condition is fulfilled.
         errback (callable): Will be called with portal_state, server_state if the
@@ -748,13 +756,13 @@ def wait_for_status(portal_running=True, server_running=True, callback=None, err
 
     return send_instruction(PSTATUS, None, _callback, _errback)
 
+
 # ------------------------------------------------------------
 #
 #  Operational functions
 #
 # ------------------------------------------------------------
 
-
 def start_evennia(pprofiler=False, sprofiler=False):
     """
     This will start Evennia anew by launching the Evennia Portal (which in turn
@@ -771,7 +779,7 @@ def start_evennia(pprofiler=False, sprofiler=False):
         print("... Server started.\nEvennia running.")
         if response:
             _, _, _, _, pinfo, sinfo = response
-            print_info(pinfo, sinfo)
+            _print_info(pinfo, sinfo)
         _reactor_stop()
 
     def _portal_started(*args):
@@ -836,10 +844,9 @@ def reload_evennia(sprofiler=False, reset=False):
             send_instruction(SSTART, server_cmd)
 
     def _portal_not_running(fail):
-        print("Evennia not running. Starting from scratch ...")
+        print("Evennia not running. Starting up ...")
         start_evennia()
 
-    # get portal status
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
 
 
@@ -869,12 +876,51 @@ def stop_evennia():
             wait_for_status(False, None, _portal_stopped)
 
     def _portal_not_running(fail):
-        print("Evennia is not running.")
+        print("Evennia not running.")
         _reactor_stop()
 
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
 
 
+def reboot_evennia(pprofiler=False, sprofiler=False):
+    """
+    This is essentially an evennia stop && evennia start except we make sure
+    the system has successfully shut down before starting it again.
+
+    If evennia was not running, start it.
+
+    """
+    global AMP_CONNECTION
+
+    def _portal_stopped(*args):
+        print("... Portal stopped. Evennia shut down. Rebooting ...")
+        global AMP_CONNECTION
+        AMP_CONNECTION = None
+        start_evennia(pprofiler, sprofiler)
+
+    def _server_stopped(*args):
+        print("... Server stopped.\nStopping Portal ...")
+        send_instruction(PSHUTD, {})
+        wait_for_status(False, None, _portal_stopped)
+
+    def _portal_running(response):
+        prun, srun, ppid, spid, _, _ = _parse_status(response)
+        if srun:
+            print("Server stopping ...")
+            send_instruction(SSHUTD, {})
+            wait_for_status_reply(_server_stopped)
+        else:
+            print("Server already stopped.\nStopping Portal ...")
+            send_instruction(PSHUTD, {})
+            wait_for_status(False, None, _portal_stopped)
+
+    def _portal_not_running(fail):
+        print("Evennia not running. Starting up ...")
+        start_evennia()
+
+    send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
+
+
 def stop_server_only():
     """
     Only stop the Server-component of Evennia (this is not useful except for debug)
@@ -908,7 +954,7 @@ def query_info():
     """
     def _got_status(status):
         _, _, _, _, pinfo, sinfo = _parse_status(status)
-        print_info(pinfo, sinfo)
+        _print_info(pinfo, sinfo)
         _reactor_stop()
 
     def _portal_running(response):
@@ -1435,6 +1481,12 @@ def error_check_python_modules():
     _imp(settings.BASE_SCRIPT_TYPECLASS)
 
 
+# ------------------------------------------------------------
+#
+# Options
+#
+# ------------------------------------------------------------
+
 def init_game_directory(path, check_db=True):
     """
     Try to analyze the given path to find settings.py - this defines
@@ -1623,8 +1675,11 @@ def run_menu():
     """
     while True:
         # menu loop
+        gamedir = "/{}".format(os.path.basename(GAMEDIR))
+        leninfo = len(gamedir)
+        line = "|" + " " * (60 - leninfo) + gamedir + " " * 3 + "|"
 
-        print(MENU)
+        print(MENU.format(gameinfo=line))
         inp = input(" option > ")
 
         # quitting and help
@@ -1652,22 +1707,24 @@ def run_menu():
         elif inp == 3:
             stop_evennia()
         elif inp == 4:
-            reload_evennia(False, True)
+            reboot_evennia(False, False)
         elif inp == 5:
-            stop_server_only()
+            reload_evennia(False, True)
         elif inp == 6:
-            kill(PORTAL_PIDFILE, 'Portal')
-            kill(SERVER_PIDFILE, 'Server')
+            stop_server_only()
         elif inp == 7:
             kill(SERVER_PIDFILE, 'Server')
         elif inp == 8:
+            kill(PORTAL_PIDFILE, 'Portal')
+            kill(SERVER_PIDFILE, 'Server')
+        elif inp == 9:
             if not SERVER_LOGFILE:
                 init_game_directory(CURRENT_DIR, check_db=False)
             tail_server_log(SERVER_LOGFILE)
             print("   Tailing logfile {} ...".format(SERVER_LOGFILE))
-        elif inp == 9:
-            query_status()
         elif inp == 10:
+            query_status()
+        elif inp == 11:
             query_info()
         else:
             print("Not a valid option.")
@@ -1686,37 +1743,36 @@ def main():
     parser.add_argument(
         '--gamedir', nargs=1, action='store', dest='altgamedir',
         metavar="<path>",
-        help="Location of gamedir (default: current location)")
+        help="location of gamedir (default: current location)")
     parser.add_argument(
         '--init', action='store', dest="init", metavar="<gamename>",
-        help="Creates a new gamedir 'name' at current location.")
+        help="creates a new gamedir 'name' at current location")
     parser.add_argument(
         '--log', '-l', action='store_true', dest='tail_log', default=False,
-        help="Tail the server logfile to standard out.")
+        help="tail the server logfile to console")
     parser.add_argument(
         '--list', nargs='+', action='store', dest='listsetting', metavar="all|<key>",
-        help=("List values for one or more server settings. Use 'all' to \n list all "
-              "available keys."))
+        help=("list settings, use 'all' to list all available keys"))
     parser.add_argument(
         '--settings', nargs=1, action='store', dest='altsettings',
         default=None, metavar="<path>",
-        help=("Start evennia with alternative settings file from\n"
+        help=("start evennia with alternative settings file from\n"
               " gamedir/server/conf/. (default is settings.py)"))
     parser.add_argument(
         '--initsettings', action='store_true', dest="initsettings",
         default=False,
-        help="Create a new, empty settings file as\n gamedir/server/conf/settings.py.")
+        help="create a new, empty settings file as\n gamedir/server/conf/settings.py")
     parser.add_argument(
         '--profiler', action='store_true', dest='profiler', default=False,
-        help="Start given server component under the Python profiler.")
+        help="start given server component under the Python profiler")
     parser.add_argument(
         '--dummyrunner', nargs=1, action='store', dest='dummyrunner',
         metavar="<N>",
-        help="Test a server by connecting <N> dummy accounts to it.")
+        help="test a server by connecting <N> dummy accounts to it")
     parser.add_argument(
         '-v', '--version', action='store_true',
         dest='show_version', default=False,
-        help="Show version info.")
+        help="show version info")
 
     parser.add_argument(
         "operation", nargs='?', default="noop",
@@ -1800,7 +1856,8 @@ def main():
         # launch menu for operation
         init_game_directory(CURRENT_DIR, check_db=True)
         run_menu()
-    elif option in ('status', 'info', 'start', 'reload', 'reset', 'stop', 'sstop', 'kill', 'skill'):
+    elif option in ('status', 'info', 'start', 'reload', 'reboot',
+                    'reset', 'stop', 'sstop', 'kill', 'skill'):
         # operate the server directly
         if not SERVER_LOGFILE:
             init_game_directory(CURRENT_DIR, check_db=True)
@@ -1812,6 +1869,8 @@ def main():
             start_evennia(args.profiler, args.profiler)
         elif option == 'reload':
             reload_evennia(args.profiler)
+        elif option == 'reboot':
+            reboot_evennia(args.profiler, args.profiler)
         elif option == 'reset':
             reload_evennia(args.profiler, reset=True)
         elif option == 'stop':
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index ed51b8952a..6fa671e886 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -202,6 +202,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
             self.send_AdminPortal2Server(amp.DUMMYSESSION, operation=amp.SRESET)
         elif mode == 'shutdown':
             self.send_AdminPortal2Server(amp.DUMMYSESSION, operation=amp.SSHUTD)
+        self.factory.portal.server_restart_mode = mode
 
     # sending amp data
 
@@ -233,8 +234,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
     def send_AdminPortal2Server(self, session, operation="", **kwargs):
         """
         Send Admin instructions from the Portal to the Server.
-        Executed
-        on the Portal.
+        Executed on the Portal.
 
         Args:
             session (Session): Session.
@@ -403,9 +403,13 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         elif operation == amp.PSYNC:  # portal sync
             # Server has (re-)connected and wants the session data from portal
             self.factory.server_info_dict = kwargs.get("info_dict", {})
+            # this defaults to 'shutdown' or whatever value set in server_stop
+            server_restart_mode = self.factory.portal.server_restart_mode
+
             sessdata = self.factory.portal.sessions.get_all_sync_data()
             self.send_AdminPortal2Server(amp.DUMMYSESSION,
                                          amp.PSYNC,
+                                         server_restart_mode=server_restart_mode,
                                          sessiondata=sessdata)
             self.factory.portal.sessions.at_server_connection()
 
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index d7fcadcbcb..27034f5785 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -85,8 +85,9 @@ INFO_DICT = {"servername": SERVERNAME, "version": VERSION, "errors": "", "info":
 
 # -------------------------------------------------------------
 # Portal Service object
-
 # -------------------------------------------------------------
+
+
 class Portal(object):
 
     """
@@ -113,13 +114,12 @@ class Portal(object):
         self.sessions.portal = self
         self.process_id = os.getpid()
         self.server_process_id = None
+        self.server_restart_mode = "shutdown"
 
         # set a callback if the server is killed abruptly,
         # by Ctrl-C, reboot etc.
         reactor.addSystemEventTrigger('before', 'shutdown', self.shutdown, _reactor_stopping=True)
 
-        self.game_running = False
-
     def get_info_dict(self):
         "Return the Portal info, for display."
         return INFO_DICT
diff --git a/evennia/server/server.py b/evennia/server/server.py
index c665fc143e..6ba5f32ef8 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -203,11 +203,6 @@ class Evennia(object):
             reactor.callLater(1, d.callback, None)
         reactor.sigInt = _wrap_sigint_handler
 
-        self.game_running = True
-
-        # track the server time
-        self.run_init_hooks()
-
     # Server startup methods
 
     def sqlite3_prep(self):
@@ -299,9 +294,13 @@ class Evennia(object):
                   last=last_initial_setup_step)
             initial_setup.handle_setup(int(last_initial_setup_step))
 
-    def run_init_hooks(self):
+    def run_init_hooks(self, mode):
         """
-        Called every server start
+        Called by the amp client once receiving sync back from Portal
+
+        Args:
+            mode (str): One of shutdown, reload or reset
+
         """
         from evennia.objects.models import ObjectDB
 
@@ -311,47 +310,24 @@ class Evennia(object):
         [o.at_init() for o in ObjectDB.get_all_cached_instances()]
         [p.at_init() for p in AccountDB.get_all_cached_instances()]
 
-        mode = self.getset_restart_mode()
-
         # call correct server hook based on start file value
         if mode == 'reload':
-            # True was the old reload flag, kept for compatibilty
+            logger.log_msg("Server successfully reloaded.")
             self.at_server_reload_start()
         elif mode == 'reset':
             # only run hook, don't purge sessions
             self.at_server_cold_start()
-        elif mode in ('reset', 'shutdown'):
+            logger.log_msg("Evennia Server successfully restarted in 'reset' mode.")
+        elif mode == 'shutdown':
             self.at_server_cold_start()
             # clear eventual lingering session storages
             ObjectDB.objects.clear_all_sessids()
+            logger.log_msg("Evennia Server successfully started.")
         # always call this regardless of start type
         self.at_server_start()
 
-    def getset_restart_mode(self, mode=None):
-        """
-        This manages the flag file that tells the runner if the server is
-        reloading, resetting or shutting down.
-
-        Args:
-            mode (string or None, optional): Valid values are
-                'reload', 'reset', 'shutdown' and `None`. If mode is `None`,
-                no change will be done to the flag file.
-        Returns:
-            mode (str): The currently active restart mode, either just
-                set or previously set.
-
-        """
-        if mode is None:
-            with open(SERVER_RESTART, 'r') as f:
-                # mode is either shutdown, reset or reload
-                mode = f.read()
-        else:
-            with open(SERVER_RESTART, 'w') as f:
-                f.write(str(mode))
-        return mode
-
     @defer.inlineCallbacks
-    def shutdown(self, mode=None, _reactor_stopping=False):
+    def shutdown(self, mode='reload', _reactor_stopping=False):
         """
         Shuts down the server from inside it.
 
@@ -362,7 +338,6 @@ class Evennia(object):
                          at_shutdown hooks called but sessions will not
                          be disconnected.
                'shutdown' - like reset, but server will not auto-restart.
-               None - keep currently set flag from flag file.
         _reactor_stopping - this is set if server is stopped by a kill
                             command OR this method was already called
                              once - in both cases the reactor is
@@ -373,10 +348,7 @@ class Evennia(object):
             # once; we don't need to run the shutdown procedure again.
             defer.returnValue(None)
 
-        mode = self.getset_restart_mode(mode)
-
         from evennia.objects.models import ObjectDB
-        #from evennia.accounts.models import AccountDB
         from evennia.server.models import ServerConfig
         from evennia.utils import gametime as _GAMETIME_MODULE
 
@@ -455,13 +427,15 @@ class Evennia(object):
         if SERVER_STARTSTOP_MODULE:
             SERVER_STARTSTOP_MODULE.at_server_reload_start()
 
-    def at_post_portal_sync(self):
+    def at_post_portal_sync(self, mode):
         """
         This is called just after the portal has finished syncing back data to the server
         after reconnecting.
+
+        Args:
+            mode (str): One of reload, reset or shutdown.
+
         """
-        # one of reload, reset or shutdown
-        mode = self.getset_restart_mode()
 
         from evennia.scripts.monitorhandler import MONITOR_HANDLER
         MONITOR_HANDLER.restore(mode == 'reload')
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index e76efd7405..8c6f6193b8 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -379,8 +379,10 @@ class ServerSessionHandler(SessionHandler):
             self[sessid] = sess
             sess.at_sync()
 
+        mode = 'reload'
+
         # tell the server hook we synced
-        self.server.at_post_portal_sync()
+        self.server.at_post_portal_sync(mode)
         # announce the reconnection
         self.announce_all(_(" ... Server restarted."))
 
diff --git a/evennia/utils/logger.py b/evennia/utils/logger.py
index 30af5d2226..4b9307819c 100644
--- a/evennia/utils/logger.py
+++ b/evennia/utils/logger.py
@@ -197,7 +197,7 @@ def log_server(servermsg):
     except Exception as e:
         servermsg = str(e)
     for line in servermsg.splitlines():
-        log_msg('[SRV] %s' % line)
+        log_msg('[Server] %s' % line)
 
 
 def log_warn(warnmsg):

From e944a6f16f7831d8af2a673a5a540d5ff73fa657 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Jan 2018 13:19:06 +0100
Subject: [PATCH 077/217] Prevent server from reconnecting to Portal
 mid-shutdown

---
 evennia/server/amp_client.py       |  7 ++++---
 evennia/server/evennia_launcher.py | 24 +++++++++++++++++-------
 evennia/server/server.py           |  3 ++-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index 294250b9e7..24fc7a91f5 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -5,7 +5,7 @@ Portal. This module sets up the Client-side communication.
 """
 
 from evennia.server.portal import amp
-from twisted.internet import protocol
+from twisted.internet import protocol, reactor
 from evennia.utils import logger
 
 
@@ -84,8 +84,9 @@ class AMPClientFactory(protocol.ReconnectingClientFactory):
             reason (str): Eventual text describing why connection failed.
 
         """
-        logger.log_info("Attempting to reconnect to Portal ...")
-        protocol.ReconnectingClientFactory.clientConnectionFailed(self, connector, reason)
+        if reactor.running:
+            logger.log_info("Attempting to reconnect to Portal ...")
+            protocol.ReconnectingClientFactory.clientConnectionFailed(self, connector, reason)
 
 
 class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 296cf61b12..db14037ae3 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -1363,7 +1363,7 @@ def del_pid(pidfile):
         os.remove(pidfile)
 
 
-def kill(pidfile, component='Server', killsignal=SIG):
+def kill(pidfile, component='Server', callback=None, errback=None, killsignal=SIG):
     """
     Send a kill signal to a process based on PID. A customized
     success/error message will be returned. If clean=True, the system
@@ -1372,6 +1372,8 @@ def kill(pidfile, component='Server', killsignal=SIG):
     Args:
         pidfile (str): The path of the pidfile to get the PID from.
         component (str, optional): Usually one of 'Server' or 'Portal'.
+        errback (callable, optional): Called if signal failed to send.
+        callback (callable, optional): Called if kill signal was sent successfully.
         killsignal (int, optional): Signal identifier for signal to send.
 
     """
@@ -1402,10 +1404,16 @@ def kill(pidfile, component='Server', killsignal=SIG):
                   "Try removing it manually.".format(
                       component=component, pid=pid, pidfile=pidfile))
             return
-        print("Sent kill signal to {component}.".format(component=component))
-        return
-    print("Could not send kill signal - {component} does "
-          "not appear to be running.".format(component=component))
+        if callback:
+            callback()
+        else:
+            print("Sent kill signal to {component}.".format(component=component))
+            return
+    if errback:
+        errback()
+    else:
+        print("Could not send kill signal - {component} does "
+              "not appear to be running.".format(component=component))
 
 
 def show_version_info(about=False):
@@ -1715,8 +1723,10 @@ def run_menu():
         elif inp == 7:
             kill(SERVER_PIDFILE, 'Server')
         elif inp == 8:
-            kill(PORTAL_PIDFILE, 'Portal')
+            global REACTOR_RUN
             kill(SERVER_PIDFILE, 'Server')
+            reactor.callLater(5, kill, PORTAL_PIDFILE, 'Portal')
+            REACTOR_RUN = True
         elif inp == 9:
             if not SERVER_LOGFILE:
                 init_game_directory(CURRENT_DIR, check_db=False)
@@ -1878,7 +1888,7 @@ def main():
         elif option == 'sstop':
             stop_server_only()
         elif option == 'kill':
-            kill(PORTAL_PIDFILE, 'Portal')
+            kill(SERVER_PIDFILE, 'Server')
             kill(SERVER_PIDFILE, 'Server')
         elif option == 'skill':
             kill(SERVER_PIDFILE, 'Server')
diff --git a/evennia/server/server.py b/evennia/server/server.py
index 6ba5f32ef8..2cabb58f37 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -210,7 +210,8 @@ class Evennia(object):
         Optimize some SQLite stuff at startup since we
         can't save it to the database.
         """
-        if ((".".join(str(i) for i in django.VERSION) < "1.2" and settings.DATABASES.get('default', {}).get('ENGINE') == "sqlite3") or
+        if ((".".join(str(i) for i in django.VERSION) < "1.2" and
+             settings.DATABASES.get('default', {}).get('ENGINE') == "sqlite3") or
             (hasattr(settings, 'DATABASES') and
              settings.DATABASES.get("default", {}).get('ENGINE', None) ==
              'django.db.backends.sqlite3')):

From d3904028bd639eb14258160b3254fe6d79a66a99 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Jan 2018 15:50:24 +0100
Subject: [PATCH 078/217] Add support for running tests from menu, fix bug in
 kill

---
 evennia/server/amp_client.py       |  5 ++-
 evennia/server/evennia_launcher.py | 52 ++++++++++++++++++------------
 evennia/server/server.py           |  7 ++--
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index 24fc7a91f5..ea43402eb3 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -84,9 +84,8 @@ class AMPClientFactory(protocol.ReconnectingClientFactory):
             reason (str): Eventual text describing why connection failed.
 
         """
-        if reactor.running:
-            logger.log_info("Attempting to reconnect to Portal ...")
-            protocol.ReconnectingClientFactory.clientConnectionFailed(self, connector, reason)
+        logger.log_msg("Attempting to reconnect to Portal ...")
+        protocol.ReconnectingClientFactory.clientConnectionFailed(self, connector, reason)
 
 
 class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index db14037ae3..a2c255ec19 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -296,10 +296,17 @@ ABOUT_INFO = \
 
 HELP_ENTRY = \
     """
-    This is a convenience launcher for the most common actions. For
-    more advanced ways to operate and manage Evennia, see  'evennia -h'.
+    Evennia has two processes, the 'Server' and the 'Portal'.
+    External users connect to the Portal while the Server runs the
+    game/database. Restarting the Server will refresh code but not
+    disconnect users.
 
-    Evennia's manual is found here: https://github.com/evennia/evennia/wiki
+    For more ways to operate and manage Evennia, use 'evennia -h'.
+
+    If you want to add unit tests to your game, see
+        https://github.com/evennia/evennia/wiki/Unit-Testing
+    Evennia's manual is found here:
+        https://github.com/evennia/evennia/wiki
     """
 
 MENU = \
@@ -307,24 +314,24 @@ MENU = \
     +----Evennia Launcher-------------------------------------------+
     {gameinfo}
     +--- Common operations -----------------------------------------+
-    |  1) Start                     (also restart stopped Server)   |
-    |  2) Reload             (stop/start Server in 'reload' mode)   |
-    |  3) Stop                       (shutdown Portal and Server)   |
-    |  4) Reboot                          (shutdown then restart)   |
+    |  1) Start                       (also restart stopped Server) |
+    |  2) Reload               (stop/start Server in 'reload' mode) |
+    |  3) Stop                         (shutdown Portal and Server) |
+    |  4) Reboot                            (shutdown then restart) |
     +--- Other -----------------------------------------------------+
-    |  5) Reset            (stop/start Server in 'shutdown' mode)   |
+    |  5) Reset              (stop/start Server in 'shutdown' mode) |
     |  6) Stop Server only                                          |
-    |  7) Kill Server only          (send kill signal to process)   |
+    |  7) Kill Server only            (send kill signal to process) |
     |  8) Kill Portal + Server                                      |
     +--- Information -----------------------------------------------+
-    |  9) Tail log file                                             |
-    | 10) Run status                                                |
+    |  9) Tail log file                        (quickly see errors) |
+    | 10) Status                                                    |
     | 11) Port info                                                 |
     +--- Testing ---------------------------------------------------+
-    | 12) Test gamedir           (run gamedir test suite, if any)   |
-    | 13) Test Evennia                   (run evennia test suite)   |
+    | 12) Test gamedir             (run gamedir test suite, if any) |
+    | 13) Test Evennia                     (run evennia test suite) |
     +---------------------------------------------------------------+
-    |  h) Help              i) About info               q) Abort    |
+    |  h) Help               i) About info                q) Abort  |
     +---------------------------------------------------------------+"""
 
 ERROR_AMP_UNCONFIGURED = \
@@ -672,8 +679,11 @@ def query_status(callback=None):
             callback(response)
         else:
             pstatus, sstatus, ppid, spid, pinfo, sinfo = _parse_status(response)
+            # note - the server reports its pid, but this is likely to be a
+            # thread and can't be relied on, so we use the pid file instead
             print("Portal:   {} (pid {})\nServer:   {} (pid {})".format(
-                wmap[pstatus], ppid, wmap[sstatus], spid))
+                wmap[pstatus], get_pid(PORTAL_PIDFILE),
+                wmap[sstatus], get_pid(SERVER_PIDFILE)))
             _reactor_stop()
 
     def _errback(fail):
@@ -1685,7 +1695,7 @@ def run_menu():
         # menu loop
         gamedir = "/{}".format(os.path.basename(GAMEDIR))
         leninfo = len(gamedir)
-        line = "|" + " " * (60 - leninfo) + gamedir + " " * 3 + "|"
+        line = "|" + " " * (61 - leninfo) + gamedir + " " * 2 + "|"
 
         print(MENU.format(gameinfo=line))
         inp = input(" option > ")
@@ -1723,10 +1733,8 @@ def run_menu():
         elif inp == 7:
             kill(SERVER_PIDFILE, 'Server')
         elif inp == 8:
-            global REACTOR_RUN
             kill(SERVER_PIDFILE, 'Server')
-            reactor.callLater(5, kill, PORTAL_PIDFILE, 'Portal')
-            REACTOR_RUN = True
+            kill(PORTAL_PIDFILE, 'Portal')
         elif inp == 9:
             if not SERVER_LOGFILE:
                 init_game_directory(CURRENT_DIR, check_db=False)
@@ -1736,6 +1744,10 @@ def run_menu():
             query_status()
         elif inp == 11:
             query_info()
+        elif inp == 12:
+            Popen(['evennia', '--settings', 'settings.py', 'test', '.'], env=getenv()).wait()
+        elif inp == 13:
+            Popen(['evennia', 'test', 'evennia'], env=getenv()).wait()
         else:
             print("Not a valid option.")
             continue
@@ -1889,7 +1901,7 @@ def main():
             stop_server_only()
         elif option == 'kill':
             kill(SERVER_PIDFILE, 'Server')
-            kill(SERVER_PIDFILE, 'Server')
+            kill(PORTAL_PIDFILE, 'Portal')
         elif option == 'skill':
             kill(SERVER_PIDFILE, 'Server')
     elif option != "noop":
diff --git a/evennia/server/server.py b/evennia/server/server.py
index 2cabb58f37..ba17015022 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -196,9 +196,9 @@ class Evennia(object):
             from twisted.internet.defer import Deferred
             if hasattr(self, "web_root"):
                 d = self.web_root.empty_threadpool()
-                d.addCallback(lambda _: self.shutdown(_reactor_stopping=True))
+                d.addCallback(lambda _: self.shutdown("shutdown", _reactor_stopping=True))
             else:
-                d = Deferred(lambda _: self.shutdown(_reactor_stopping=True))
+                d = Deferred(lambda _: self.shutdown("shutdown", _reactor_stopping=True))
             d.addCallback(lambda _: reactor.stop())
             reactor.callLater(1, d.callback, None)
         reactor.sigInt = _wrap_sigint_handler
@@ -358,7 +358,8 @@ class Evennia(object):
             ServerConfig.objects.conf("server_restart_mode", "reload")
             yield [o.at_server_reload() for o in ObjectDB.get_all_cached_instances()]
             yield [p.at_server_reload() for p in AccountDB.get_all_cached_instances()]
-            yield [(s.pause(manual_pause=False), s.at_server_reload()) for s in ScriptDB.get_all_cached_instances() if s.is_active]
+            yield [(s.pause(manual_pause=False), s.at_server_reload())
+                   for s in ScriptDB.get_all_cached_instances() if s.is_active]
             yield self.sessions.all_sessions_portal_sync()
             self.at_server_reload_stop()
             # only save monitor state on reload, not on shutdown/reset

From 443c2af89632f46aa0eaa4ba3d115976c433b095 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Jan 2018 15:53:53 +0100
Subject: [PATCH 079/217] Wording fixes

---
 evennia/server/evennia_launcher.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index a2c255ec19..d00388a1f0 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -288,8 +288,8 @@ ABOUT_INFO = \
     Web: http://www.evennia.com
     Irc: #evennia on FreeNode
     Forum: http://www.evennia.com/discussions
-    Maintainer (2010-):   Griatch (griatch AT gmail DOT com)
     Maintainer (2006-10): Greg Taylor
+    Maintainer (2010-):   Griatch (griatch AT gmail DOT com)
 
     Use -h for command line options.
     """
@@ -329,7 +329,7 @@ MENU = \
     | 11) Port info                                                 |
     +--- Testing ---------------------------------------------------+
     | 12) Test gamedir             (run gamedir test suite, if any) |
-    | 13) Test Evennia                     (run evennia test suite) |
+    | 13) Test Evennia                     (run Evennia test suite) |
     +---------------------------------------------------------------+
     |  h) Help               i) About info                q) Abort  |
     +---------------------------------------------------------------+"""

From 0b6e94a6bc2815c2f317b0556b54feb26fbacd85 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Jan 2018 16:00:28 +0100
Subject: [PATCH 080/217] Minor rewordings

---
 evennia/server/evennia_launcher.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index d00388a1f0..5a6c770995 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -461,17 +461,17 @@ SERVER_INFO = \
 ARG_OPTIONS = \
     """Actions on installed server. One of:
  start  - launch server+portal if not running
- reload - restart server (code refresh)
+ reload - restart server in 'reload' mode
  stop   - shutdown server+portal
  reboot - shutdown server+portal, then start again
- reset  - restart server in shutdown-mode (not reload mode)
+ reset  - restart server in 'shutdown' mode
  sstart - start only server (requires portal)
  kill   - send kill signal to portal+server (force)
  skill  = send kill signal only to server
  status - show server and portal run state
  info   - show server and portal port info
  menu   - show a menu of options
-Other input, like migrate and shell is passed on to Django."""
+Others, like migrate, test and shell is passed on to Django."""
 
 # ------------------------------------------------------------
 #
@@ -1800,7 +1800,7 @@ def main():
         "operation", nargs='?', default="noop",
         help=ARG_OPTIONS)
     parser.epilog = (
-        "Common Django-admin commands are shell, dbshell, migrate and flush.\n"
+        "Common Django-admin commands are shell, dbshell, test and migrate.\n"
         "See the Django documentation for more management commands.")
 
     args, unknown_args = parser.parse_known_args()

From d49a0059979dc8b7d0688382bfe9a90c1b381477 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Jan 2018 23:08:22 +0100
Subject: [PATCH 081/217] Fix minor indentation error in launcher info cmd

---
 evennia/server/amp_client.py       | 2 +-
 evennia/server/evennia_launcher.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index ea43402eb3..474f028e93 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -5,7 +5,7 @@ Portal. This module sets up the Client-side communication.
 """
 
 from evennia.server.portal import amp
-from twisted.internet import protocol, reactor
+from twisted.internet import protocol
 from evennia.utils import logger
 
 
diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 5a6c770995..66b5311bbf 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -484,7 +484,7 @@ def _print_info(portal_info_dict, server_info_dict):
     Format info dicts from the Portal/Server for display
 
     """
-    ind = " " * 7
+    ind = " " * 8
 
     def _prepare_dict(dct):
         out = {}

From 13f9bc4afa40c58b32bf33c75c77e74e09cdc9e4 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Jan 2018 23:59:28 +0100
Subject: [PATCH 082/217] Correctly call the parent at_sync in the
 serversession. Resolves #1555.

---
 evennia/server/serversession.py | 1 +
 evennia/server/session.py       | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/evennia/server/serversession.py b/evennia/server/serversession.py
index 2a427d591f..b7f74cef5d 100644
--- a/evennia/server/serversession.py
+++ b/evennia/server/serversession.py
@@ -188,6 +188,7 @@ class ServerSession(Session):
         if not _ObjectDB:
             from evennia.objects.models import ObjectDB as _ObjectDB
 
+        super(ServerSession, self).at_sync()
         if not self.logged_in:
             # assign the unloggedin-command set.
             self.cmdset_storage = settings.CMDSET_UNLOGGEDIN
diff --git a/evennia/server/session.py b/evennia/server/session.py
index 9853bcd366..86d7a30d76 100644
--- a/evennia/server/session.py
+++ b/evennia/server/session.py
@@ -133,7 +133,8 @@ class Session(object):
         on uid etc).
 
         """
-        self.protocol_flags.update(self.account.attributs.get("_saved_protocol_flags"), {})
+        if self.account:
+            self.protocol_flags.update(self.account.attributes.get("_saved_protocol_flags"), {})
 
     # access hooks
 

From 7e07e95004fe5be447cdade80f7736f3b481af1e Mon Sep 17 00:00:00 2001
From: Tehom <surly.mime@gmail.com>
Date: Sat, 20 Jan 2018 21:49:17 -0500
Subject: [PATCH 083/217] Fix update call to have right number of arguments.

---
 evennia/server/session.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/server/session.py b/evennia/server/session.py
index 86d7a30d76..82ff9052c8 100644
--- a/evennia/server/session.py
+++ b/evennia/server/session.py
@@ -134,7 +134,7 @@ class Session(object):
 
         """
         if self.account:
-            self.protocol_flags.update(self.account.attributes.get("_saved_protocol_flags"), {})
+            self.protocol_flags.update(self.account.attributes.get("_saved_protocol_flags") or {})
 
     # access hooks
 

From f5f11f376b04371e7a2bf43dae820e49ba554b05 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 21 Jan 2018 09:52:24 +0100
Subject: [PATCH 084/217] Move dict into attributes.get as a default

---
 evennia/server/session.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/server/session.py b/evennia/server/session.py
index 82ff9052c8..ed7dabbe8f 100644
--- a/evennia/server/session.py
+++ b/evennia/server/session.py
@@ -134,7 +134,7 @@ class Session(object):
 
         """
         if self.account:
-            self.protocol_flags.update(self.account.attributes.get("_saved_protocol_flags") or {})
+            self.protocol_flags.update(self.account.attributes.get("_saved_protocol_flags", {}))
 
     # access hooks
 

From 704eba99d0f7f1492e19f18c3f867bd3885c6d28 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 21 Jan 2018 12:29:22 +0100
Subject: [PATCH 085/217] Fix error in MULTISESSION_MODE=0 that would not
 correctly disconnect duplicate sessions but just unpuppet them

---
 evennia/server/sessionhandler.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index 423bc87f1c..5ea0d08c9f 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -593,10 +593,14 @@ class ServerSessionHandler(SessionHandler):
 
         """
         uid = curr_session.uid
+        # we can't compare sessions directly since this will compare addresses and
+        # mean connecting from the same host would not catch duplicates
+        sid = id(curr_session)
         doublet_sessions = [sess for sess in self.values()
                             if sess.logged_in and
                             sess.uid == uid and
-                            sess != curr_session]
+                            id(sess) != sid]
+
         for session in doublet_sessions:
             self.disconnect(session, reason)
 

From d5578f3ff7ef996346bceb42a3ed4a8e22012aaf Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 21 Jan 2018 16:32:00 +0100
Subject: [PATCH 086/217] Refactor the MAX_COMMAND_RATE throttle, related to
 #1556

---
 evennia/server/portal/portalsessionhandler.py | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/evennia/server/portal/portalsessionhandler.py b/evennia/server/portal/portalsessionhandler.py
index d93e54465f..9216eacaee 100644
--- a/evennia/server/portal/portalsessionhandler.py
+++ b/evennia/server/portal/portalsessionhandler.py
@@ -15,12 +15,15 @@ from evennia.utils.logger import log_trace
 # module import
 _MOD_IMPORT = None
 
-# throttles
+# global throttles
 _MAX_CONNECTION_RATE = float(settings.MAX_CONNECTION_RATE)
+# per-session throttles
 _MAX_COMMAND_RATE = float(settings.MAX_COMMAND_RATE)
 _MAX_CHAR_LIMIT = int(settings.MAX_CHAR_LIMIT)
 
-_MIN_TIME_BETWEEN_CONNECTS = 1.0 / float(settings.MAX_CONNECTION_RATE)
+_MIN_TIME_BETWEEN_CONNECTS = 1.0 / float(_MAX_CONNECTION_RATE)
+_MIN_TIME_BETWEEN_COMMANDS = 1.0 / float(_MAX_COMMAND_RATE)
+
 _ERROR_COMMAND_OVERFLOW = settings.COMMAND_RATE_WARNING
 _ERROR_MAX_CHAR = settings.MAX_CHAR_LIMIT_WARNING
 
@@ -58,9 +61,6 @@ class PortalSessionHandler(SessionHandler):
 
         self.connection_last = self.uptime
         self.connection_task = None
-        self.command_counter = 0
-        self.command_counter_reset = self.uptime
-        self.command_overflow = False
 
     def at_server_connection(self):
         """
@@ -354,8 +354,6 @@ class PortalSessionHandler(SessionHandler):
             Data is serialized before passed on.
 
         """
-        # from evennia.server.profiling.timetrace import timetrace  # DEBUG
-        # text = timetrace(text, "portalsessionhandler.data_in")  # DEBUG
         try:
             text = kwargs['text']
             if (_MAX_CHAR_LIMIT > 0) and len(text) > _MAX_CHAR_LIMIT:
@@ -367,17 +365,25 @@ class PortalSessionHandler(SessionHandler):
             pass
         if session:
             now = time.time()
-            if self.command_counter > _MAX_COMMAND_RATE > 0:
-                # data throttle (anti DoS measure)
-                delta_time = now - self.command_counter_reset
-                self.command_counter = 0
-                self.command_counter_reset = now
-                self.command_overflow = delta_time < 1.0
-                if self.command_overflow:
-                    reactor.callLater(1.0, self.data_in, None)
-            if self.command_overflow:
+
+            try:
+                command_counter_reset = session.command_counter_reset
+            except AttributeError:
+                command_counter_reset = session.command_counter_reset = now
+                session.command_counter = 0
+
+            # global command-rate limit
+            if max(0, now - command_counter_reset) > 1.0:
+                # more than a second since resetting the counter. Refresh.
+                session.command_counter_reset = now
+                session.command_counter = 0
+
+            session.command_counter += 1
+
+            if session.command_counter * _MIN_TIME_BETWEEN_COMMANDS > 1.0:
                 self.data_out(session, text=[[_ERROR_COMMAND_OVERFLOW], {}])
                 return
+
             if not self.portal.amp_protocol:
                 # this can happen if someone connects before AMP connection
                 # was established (usually on first start)
@@ -388,15 +394,9 @@ class PortalSessionHandler(SessionHandler):
             kwargs = self.clean_senddata(session, kwargs)
 
             # relay data to Server
-            self.command_counter += 1
             session.cmd_last = now
             self.portal.amp_protocol.send_MsgPortal2Server(session,
                                                            **kwargs)
-        else:
-            # called by the callLater callback
-            if self.command_overflow:
-                self.command_overflow = False
-                reactor.callLater(1.0, self.data_in, None)
 
     def data_out(self, session, **kwargs):
         """

From 05b7d104eaa2281a9700650164b665138f8489c0 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 23 Jan 2018 18:08:34 +0100
Subject: [PATCH 087/217] Re-add regular database-connection drops to address
 MySQL timeouts. Resolves #1376.

---
 evennia/server/server.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/evennia/server/server.py b/evennia/server/server.py
index 27ca1fd0f8..2bafcdd979 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -127,6 +127,11 @@ def _server_maintenance():
     if _MAINTENANCE_COUNT % 3700 == 0:
         # validate channels off-sync with scripts
         evennia.CHANNEL_HANDLER.update()
+    if _MAINTENANCE_COUNT % (3600 * 7) == 0:
+        # drop database connection every 7 hrs to avoid default timeouts on MySQL
+        # (see https://github.com/evennia/evennia/issues/1376)
+        print("Dropping database connection!")
+        connection.close()
 
     # handle idle timeouts
     if _IDLE_TIMEOUT > 0:
@@ -137,11 +142,6 @@ def _server_maintenance():
                     session.account.access(session.account, "noidletimeout", default=False):
                 SESSIONS.disconnect(session, reason=reason)
 
-    # Commenting this out, it is probably not needed
-    # with CONN_MAX_AGE set. Keeping it as a reminder
-    # if database-gone-away errors appears again /Griatch
-    # if _MAINTENANCE_COUNT % 18000 == 0:
-    #    connection.close()
 maintenance_task = LoopingCall(_server_maintenance)
 maintenance_task.start(60, now=True)  # call every minute
 

From fd33a376fa8cdcbaac7993041f88f7e7f8b741f0 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 23 Jan 2018 18:12:11 +0100
Subject: [PATCH 088/217] Remove debug print

---
 evennia/server/server.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/evennia/server/server.py b/evennia/server/server.py
index 2bafcdd979..6e92b0b055 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -130,7 +130,6 @@ def _server_maintenance():
     if _MAINTENANCE_COUNT % (3600 * 7) == 0:
         # drop database connection every 7 hrs to avoid default timeouts on MySQL
         # (see https://github.com/evennia/evennia/issues/1376)
-        print("Dropping database connection!")
         connection.close()
 
     # handle idle timeouts

From d9ea3140e47ba1244da07d4f07606db4b65d6fdf Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 23 Jan 2018 19:46:55 +0100
Subject: [PATCH 089/217] Stop hard-coding examples of port settings in game
 template, it just confuses things.

---
 evennia/game_template/server/conf/settings.py | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/evennia/game_template/server/conf/settings.py b/evennia/game_template/server/conf/settings.py
index 7fe163b833..a8f9776805 100644
--- a/evennia/game_template/server/conf/settings.py
+++ b/evennia/game_template/server/conf/settings.py
@@ -34,27 +34,6 @@ from evennia.settings_default import *
 # This is the name of your game. Make it catchy!
 SERVERNAME = {servername}
 
-# Server ports. If enabled and marked as "visible", the port
-# should be visible to the outside world on a production server.
-# Note that there are many more options available beyond these.
-
-# Telnet ports. Visible.
-TELNET_ENABLED = True
-TELNET_PORTS = [4000]
-# (proxy, internal). Only proxy should be visible.
-WEBSERVER_ENABLED = True
-WEBSERVER_PORTS = [(4001, 4002)]
-# Telnet+SSL ports, for supporting clients. Visible.
-SSL_ENABLED = False
-SSL_PORTS = [4003]
-# SSH client ports. Requires crypto lib. Visible.
-SSH_ENABLED = False
-SSH_PORTS = [4004]
-# Websocket-client port. Visible.
-WEBSOCKET_CLIENT_ENABLED = True
-WEBSOCKET_CLIENT_PORT = 4005
-# Internal Server-Portal port. Not visible.
-AMP_PORT = 4006
 
 ######################################################################
 # Settings given in secret_settings.py override those in this file.
@@ -62,4 +41,4 @@ AMP_PORT = 4006
 try:
     from server.conf.secret_settings import *
 except ImportError:
-    print "secret_settings.py file not found or failed to import."
+    print("secret_settings.py file not found or failed to import.")

From 1ed115e2d107d15c50cf69ea1dfd4d256b3997aa Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 25 Jan 2018 10:41:49 +0100
Subject: [PATCH 090/217] Clarify mapping from Evennia-outputfuncs to
 GMCP-style cmdnames

---
 evennia/server/portal/telnet_oob.py | 44 ++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/evennia/server/portal/telnet_oob.py b/evennia/server/portal/telnet_oob.py
index 50c8df7713..af83d8cf23 100644
--- a/evennia/server/portal/telnet_oob.py
+++ b/evennia/server/portal/telnet_oob.py
@@ -229,24 +229,41 @@ class TelnetOOB(object):
             IRE games use, supposedly, and what clients appear
             to have adopted):
 
-            [cmdname, [], {}]          -> cmdname
-            [cmdname, [arg], {}]       -> cmdname arg
-            [cmdname, [args],{}]       -> cmdname [args]
-            [cmdname, [], {kwargs}]    -> cmdname {kwargs}
-            [cmdname, [args, {kwargs}] -> cmdname [[args],{kwargs}]
+            [cmd.name, [], {}]          -> Cmd.Name
+            [cmd.name, [arg], {}]       -> Cmd.Name arg
+            [cmd.name, [args],{}]       -> Cmd.Name [args]
+            [cmd.name, [], {kwargs}]    -> Cmd.Name {kwargs}
+            [cmdname, [args, {kwargs}] -> Custom.Cmdname [[args],{kwargs}]
+
+        Notes:
+            There are also a few default mappings between evennia outputcmds and
+            GMCP:
+                client_options -> Core.Supports.Get
+                get_inputfuncs -> Core.Commands.Get
+                get_value      -> Char.Value.Get
+                repeat         -> Char.Repeat.Update
+                monitor        -> Char.Monitor.Update
 
         """
+
+        if cmdname in EVENNIA_TO_GMCP:
+            gmcp_cmdname = EVENNIA_TO_GMCP[cmdname]
+        elif "_" in cmdname:
+            gmcp_cmdname = ".".join(word.capitalize() for word in cmdname.split("_"))
+        else:
+            gmcp_cmdname = "Custom.%s" % cmdname.capitalize()
+
         if not (args or kwargs):
-            gmcp_string = cmdname
+            gmcp_string = gmcp_cmdname
         elif args:
             if len(args) == 1:
                 args = args[0]
             if kwargs:
-                gmcp_string = "%s %s" % (cmdname, json.dumps([args, kwargs]))
+                gmcp_string = "%s %s" % (gmcp_cmdname, json.dumps([args, kwargs]))
             else:
-                gmcp_string = "%s %s" % (cmdname, json.dumps(args))
+                gmcp_string = "%s %s" % (gmcp_cmdname, json.dumps(args))
         else:  # only kwargs
-            gmcp_string = "%s %s" % (cmdname, json.dumps(kwargs))
+            gmcp_string = "%s %s" % (gmcp_cmdname, json.dumps(kwargs))
 
         # print("gmcp string", gmcp_string)  # DEBUG
         return gmcp_string
@@ -398,14 +415,9 @@ class TelnetOOB(object):
         kwargs.pop("options", None)
 
         if self.MSDP:
-            msdp_cmdname = cmdname
-            encoded_oob = self.encode_msdp(msdp_cmdname, *args, **kwargs)
+            encoded_oob = self.encode_msdp(cmdname, *args, **kwargs)
             self.protocol._write(IAC + SB + MSDP + encoded_oob + IAC + SE)
 
         if self.GMCP:
-            if cmdname in EVENNIA_TO_GMCP:
-                gmcp_cmdname = EVENNIA_TO_GMCP[cmdname]
-            else:
-                gmcp_cmdname = "Custom.Cmd"
-            encoded_oob = self.encode_gmcp(gmcp_cmdname, *args, **kwargs)
+            encoded_oob = self.encode_gmcp(cmdname, *args, **kwargs)
             self.protocol._write(IAC + SB + GMCP + encoded_oob + IAC + SE)

From 022ef7eefcc5974d500f9d20efeffb438317a8ef Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 25 Jan 2018 18:06:56 +0100
Subject: [PATCH 091/217] Change GMCP Default. to use Core. instead.

---
 evennia/server/portal/telnet_oob.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/evennia/server/portal/telnet_oob.py b/evennia/server/portal/telnet_oob.py
index af83d8cf23..8e452ec955 100644
--- a/evennia/server/portal/telnet_oob.py
+++ b/evennia/server/portal/telnet_oob.py
@@ -227,13 +227,15 @@ class TelnetOOB(object):
             GMCP messages will be outgoing on the following
             form (the non-JSON cmdname at the start is what
             IRE games use, supposedly, and what clients appear
-            to have adopted):
+            to have adopted). A cmdname without Package will end
+            up in the Core package, while Core package names will
+            be stripped on the Evennia side.
 
             [cmd.name, [], {}]          -> Cmd.Name
             [cmd.name, [arg], {}]       -> Cmd.Name arg
             [cmd.name, [args],{}]       -> Cmd.Name [args]
             [cmd.name, [], {kwargs}]    -> Cmd.Name {kwargs}
-            [cmdname, [args, {kwargs}] -> Custom.Cmdname [[args],{kwargs}]
+            [cmdname, [args, {kwargs}] -> Core.Cmdname [[args],{kwargs}]
 
         Notes:
             There are also a few default mappings between evennia outputcmds and
@@ -251,7 +253,7 @@ class TelnetOOB(object):
         elif "_" in cmdname:
             gmcp_cmdname = ".".join(word.capitalize() for word in cmdname.split("_"))
         else:
-            gmcp_cmdname = "Custom.%s" % cmdname.capitalize()
+            gmcp_cmdname = "Core.%s" % cmdname.capitalize()
 
         if not (args or kwargs):
             gmcp_string = gmcp_cmdname

From 9d31c17dd0429b2609ce4c55b9afe9e7bf4c0ec5 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 26 Jan 2018 22:12:57 +0100
Subject: [PATCH 092/217] Combining log files does not actually work, removing
 functionality

---
 evennia/server/evennia_launcher.py  |  8 +++++-
 evennia/server/portal/amp_server.py | 40 +++++++++++++++++++----------
 evennia/server/portal/portal.py     |  4 +--
 evennia/settings_default.py         |  2 --
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 66b5311bbf..1e006483af 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -811,7 +811,13 @@ def start_evennia(pprofiler=False, sprofiler=False):
     def _portal_not_running(fail):
         print("Portal starting {}...".format("(under cProfile)" if pprofiler else ""))
         try:
-            Popen(portal_cmd, env=getenv(), bufsize=-1)
+            if os.name == 'nt':
+                # Windows requires special care
+                create_no_window = 0x08000000
+                Popen(portal_cmd, env=getenv(), bufsize=-1,
+                      createflags=create_no_window)
+            else:
+                Popen(portal_cmd, env=getenv(), bufsize=-1)
         except Exception as e:
             print(PROCESS_ERROR.format(component="Portal", traceback=e))
             _reactor_stop()
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 6fa671e886..a11b52d58b 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -8,6 +8,7 @@ import os
 import sys
 from twisted.internet import protocol
 from evennia.server.portal import amp
+from django.conf import settings
 from subprocess import Popen, STDOUT, PIPE
 from evennia.utils import logger
 
@@ -150,21 +151,32 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
         """
         # start the Server
-        try:
-            process = Popen(server_twistd_cmd, env=getenv(), bufsize=-1, stdout=PIPE, stderr=STDOUT)
-        except Exception:
-            self.factory.portal.server_process_id = None
-            logger.log_trace()
-            return 0
-        # there is a short window before the server logger is up where we must
-        # catch the stdout of the Server or eventual tracebacks will be lost.
-        with process.stdout as out:
-            logger.log_server(out.read())
+        with open(settings.SERVER_LOG_FILE, 'a') as logfile:
+            try:
+                if os.name == 'nt':
+                    # Windows requires special care
+                    create_no_window = 0x08000000
+                    process = Popen(server_twistd_cmd, env=getenv(), bufsize=-1,
+                                    stdout=logfile, stderr=STDOUT,
+                                    creationflags=create_no_window)
+                else:
+                    process = Popen(server_twistd_cmd, env=getenv(), bufsize=-1,
+                                    stdout=logfile, stderr=STDOUT)
+            except Exception:
+                self.factory.portal.server_process_id = None
+                logger.log_trace()
+                logfile.flush()
+                return 0
+            # there is a short window before the server logger is up where we must
+            # catch the stdout of the Server or eventual tracebacks will be lost.
+            # with process.stdout as out:
+            #     logger.log_server(out.readlines())
 
-        # store the pid and launch argument for future reference
-        self.factory.portal.server_process_id = process.pid
-        self.factory.portal.server_twistd_cmd = server_twistd_cmd
-        return process.pid
+            # store the pid and launch argument for future reference
+            self.factory.portal.server_process_id = process.pid
+            self.factory.portal.server_twistd_cmd = server_twistd_cmd
+            logfile.flush()
+            return process.pid
 
     def wait_for_disconnect(self, callback, *args, **kwargs):
         """
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index 27034f5785..6645f8964d 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -184,8 +184,8 @@ class Portal(object):
 application = service.Application('Portal')
 
 # custom logging
-logfile = settings.SERVER_LOG_FILE if settings.MERGE_LOGS else settings.PORTAL_LOG_FILE
-logfile = logger.WeeklyLogFile(os.path.basename(logfile), os.path.dirname(logfile))
+logfile = logger.WeeklyLogFile(os.path.basename(settings.PORTAL_LOG_FILE),
+                               os.path.dirname(settings.PORTAL_LOG_FILE))
 application.setComponent(ILogObserver, logger.PortalLogObserver(logfile).emit)
 
 # The main Portal server program. This sets up the database
diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index 3bb2b504aa..2b6bb55584 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -134,8 +134,6 @@ LOG_DIR = os.path.join(GAME_DIR, 'server', 'logs')
 SERVER_LOG_FILE = os.path.join(LOG_DIR, 'server.log')
 PORTAL_LOG_FILE = os.path.join(LOG_DIR, 'portal.log')
 HTTP_LOG_FILE = os.path.join(LOG_DIR, 'http_requests.log')
-# if this is true, merge logs into only the SERVER_LOG_FILE location.
-MERGE_LOGS = True
 # if this is set to the empty string, lockwarnings will be turned off.
 LOCKWARNING_LOG_FILE = os.path.join(LOG_DIR, 'lockwarnings.log')
 # Rotate log files when server and/or portal stops. This will keep log

From 2dd02941182c51598321ed9895bfed47ed2fc8cf Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 26 Jan 2018 22:30:39 +0100
Subject: [PATCH 093/217] Let -l option merge log outputs from both log files

---
 evennia/server/evennia_launcher.py | 36 +++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 1e006483af..635b504071 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -982,15 +982,18 @@ def query_info():
     send_instruction(PSTATUS, None, _portal_running, _portal_not_running)
 
 
-def tail_server_log(filename, rate=1):
+def tail_log_files(filename1, filename2, start_lines1=20, start_lines2=20, rate=1):
     """
-    Tail the server logfile interactively, printing to stdout
+    Tail two logfiles interactively, combining their output to stdout
 
-    When first starting, this will display the tail of the log file. After
-    that it will poll the log file repeatedly and display changes.
+    When first starting, this will display the tail of the log files. After
+    that it will poll the log files repeatedly and display changes.
 
     Args:
-        filename (str): Path to log file.
+        filename1 (str): Path to first log file.
+        filename2 (str): Path to second log file.
+        start_lines1 (int): How many lines to show from existing first log.
+        start_lines2 (int): How many lines to show from existing second log.
         rate (int, optional): How often to poll the log file.
 
     """
@@ -1058,8 +1061,11 @@ def tail_server_log(filename, rate=1):
                 # the log file might not exist yet. Wait a little, then try again ...
                 pass
             else:
-                if max_lines:
-                    # first startup
+                if max_lines == 0:
+                    # don't show any lines from old file
+                    new_lines = []
+                elif max_lines:
+                    # show some lines from first startup
                     new_lines = new_lines[-max_lines:]
 
                 # print to stdout without line break (log has its own line feeds)
@@ -1069,7 +1075,9 @@ def tail_server_log(filename, rate=1):
         # set up the next poll
         reactor.callLater(rate, _tail_file, filename, file_size, line_count, max_lines=100)
 
-    reactor.callLater(0, _tail_file, filename, 0, 0, max_lines=20)
+    reactor.callLater(0, _tail_file, filename1, 0, 0, max_lines=start_lines1)
+    reactor.callLater(0, _tail_file, filename2, 0, 0, max_lines=start_lines2)
+
     REACTOR_RUN = True
 
 
@@ -1744,7 +1752,7 @@ def run_menu():
         elif inp == 9:
             if not SERVER_LOGFILE:
                 init_game_directory(CURRENT_DIR, check_db=False)
-            tail_server_log(SERVER_LOGFILE)
+            tail_log_files(PORTAL_LOGFILE, SERVER_LOGFILE, 20, 20)
             print("   Tailing logfile {} ...".format(SERVER_LOGFILE))
         elif inp == 10:
             query_status()
@@ -1864,12 +1872,18 @@ def main():
         sys.exit()
 
     if args.tail_log:
-        # set up for tailing the server log file
+        # set up for tailing the log files
         global NO_REACTOR_STOP
         NO_REACTOR_STOP = True
         if not SERVER_LOGFILE:
             init_game_directory(CURRENT_DIR, check_db=False)
-        tail_server_log(SERVER_LOGFILE)
+
+        # adjust how many lines we show from existing logs
+        start_lines1, start_lines2 = 20, 20
+        if option == 'start':
+            start_lines1, start_lines2 = 0, 0
+
+        tail_log_files(PORTAL_LOGFILE, SERVER_LOGFILE, start_lines1, start_lines2)
         print("   Tailing logfile {} ...".format(SERVER_LOGFILE))
 
     if args.dummyrunner:

From 63e3f32b9e5e1189880d9b0a358e2d4894cd2d3e Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 00:33:09 +0100
Subject: [PATCH 094/217] Make pid handling more stable, also internally

---
 evennia/server/amp_client.py        |  4 +++-
 evennia/server/evennia_launcher.py  | 19 +++++++++----------
 evennia/server/portal/amp_server.py | 26 +++++++++++++-------------
 evennia/server/portal/portal.py     | 11 +++--------
 evennia/server/server.py            |  4 ++--
 5 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index 474f028e93..8b9f9d4e8e 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -4,6 +4,7 @@ Portal. This module sets up the Client-side communication.
 
 """
 
+import os
 from evennia.server.portal import amp
 from twisted.internet import protocol
 from evennia.utils import logger
@@ -105,7 +106,8 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
         super(AMPServerClientProtocol, self).connectionMade()
         # first thing we do is to request the Portal to sync all sessions
         # back with the Server side. We also need the startup mode (reload, reset, shutdown)
-        self.send_AdminServer2Portal(amp.DUMMYSESSION, operation=amp.PSYNC, info_dict=info_dict)
+        self.send_AdminServer2Portal(
+                amp.DUMMYSESSION, operation=amp.PSYNC, spid=os.getpid(), info_dict=info_dict)
 
     def data_to_portal(self, command, sessid, **kwargs):
         """
diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 635b504071..b07e3bb562 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -679,16 +679,14 @@ def query_status(callback=None):
             callback(response)
         else:
             pstatus, sstatus, ppid, spid, pinfo, sinfo = _parse_status(response)
-            # note - the server reports its pid, but this is likely to be a
-            # thread and can't be relied on, so we use the pid file instead
-            print("Portal:   {} (pid {})\nServer:   {} (pid {})".format(
-                wmap[pstatus], get_pid(PORTAL_PIDFILE),
-                wmap[sstatus], get_pid(SERVER_PIDFILE)))
+            print("Evennia Portal: {}{}\n        Server: {}{}".format(
+                wmap[pstatus], " (pid {})".format(get_pid(PORTAL_PIDFILE, ppid)) if pstatus else "",
+                wmap[sstatus], " (pid {})".format(get_pid(SERVER_PIDFILE, spid)) if sstatus else ""))
             _reactor_stop()
 
     def _errback(fail):
         pstatus, sstatus = False, False
-        print("Portal:   {}\nServer:   {}".format(wmap[pstatus], wmap[sstatus]))
+        print("Portal: {}\nServer: {}".format(wmap[pstatus], wmap[sstatus]))
         _reactor_stop()
 
     send_instruction(PSTATUS, None, _callback, _errback)
@@ -1355,22 +1353,23 @@ def getenv():
     return env
 
 
-def get_pid(pidfile):
+def get_pid(pidfile, default=None):
     """
     Get the PID (Process ID) by trying to access an PID file.
 
     Args:
         pidfile (str): The path of the pid file.
+        default (int, optional): What to return if file does not exist.
 
     Returns:
-        pid (str or None): The process id.
+        pid (str): The process id or `default`.
 
     """
     if os.path.exists(pidfile):
         with open(pidfile, 'r') as f:
             pid = f.read()
             return pid
-    return None
+    return default
 
 
 def del_pid(pidfile):
@@ -1418,7 +1417,7 @@ def kill(pidfile, component='Server', callback=None, errback=None, killsignal=SI
                     # We must catch and ignore the interrupt sent.
                     pass
             else:
-                # Linux can send the SIGINT signal directly
+                # Linux/Unix can send the SIGINT signal directly
                 # to the specified PID.
                 os.kill(int(pid), killsignal)
 
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index a11b52d58b..9baa7ba86f 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -54,7 +54,6 @@ class AMPServerFactory(protocol.ServerFactory):
         self.protocol = AMPServerProtocol
         self.broadcasts = []
         self.server_connection = None
-        self.server_info_dict = None
         self.launcher_connection = None
         self.disconnect_callbacks = {}
         self.server_connect_callbacks = []
@@ -89,7 +88,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         super(AMPServerProtocol, self).connectionLost(reason)
         if self.factory.server_connection == self:
             self.factory.server_connection = None
-            self.factory.server_info_dict = None
+            self.factory.portal.server_info_dict = {}
         if self.factory.launcher_connection == self:
             self.factory.launcher_connection = None
 
@@ -112,7 +111,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
         server_connected = bool(self.factory.server_connection and
                                 self.factory.server_connection.transport.connected)
         portal_info_dict = self.factory.portal.get_info_dict()
-        server_info_dict = self.factory.server_info_dict
+        server_info_dict = self.factory.portal.server_info_dict
         server_pid = self.factory.portal.server_process_id
         portal_pid = os.getpid()
         return (True, server_connected, portal_pid, server_pid, portal_info_dict, server_info_dict)
@@ -151,7 +150,11 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
         """
         # start the Server
+        process = None
         with open(settings.SERVER_LOG_FILE, 'a') as logfile:
+            # we link stdout to a file in order to catch
+            # eventual errors happening before the Server has
+            # opened its logger.
             try:
                 if os.name == 'nt':
                     # Windows requires special care
@@ -159,24 +162,20 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
                     process = Popen(server_twistd_cmd, env=getenv(), bufsize=-1,
                                     stdout=logfile, stderr=STDOUT,
                                     creationflags=create_no_window)
+
                 else:
                     process = Popen(server_twistd_cmd, env=getenv(), bufsize=-1,
                                     stdout=logfile, stderr=STDOUT)
             except Exception:
-                self.factory.portal.server_process_id = None
                 logger.log_trace()
-                logfile.flush()
-                return 0
-            # there is a short window before the server logger is up where we must
-            # catch the stdout of the Server or eventual tracebacks will be lost.
-            # with process.stdout as out:
-            #     logger.log_server(out.readlines())
 
-            # store the pid and launch argument for future reference
-            self.factory.portal.server_process_id = process.pid
             self.factory.portal.server_twistd_cmd = server_twistd_cmd
             logfile.flush()
+        if process:
+            # avoid zombie-process
+            process.wait()
             return process.pid
+        return 0
 
     def wait_for_disconnect(self, callback, *args, **kwargs):
         """
@@ -414,7 +413,8 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
         elif operation == amp.PSYNC:  # portal sync
             # Server has (re-)connected and wants the session data from portal
-            self.factory.server_info_dict = kwargs.get("info_dict", {})
+            self.factory.portal.server_info_dict = kwargs.get("info_dict", {})
+            self.factory.portal.server_process_id = kwargs.get("spid", None)
             # this defaults to 'shutdown' or whatever value set in server_stop
             server_restart_mode = self.factory.portal.server_restart_mode
 
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index 6645f8964d..bbeec30fc5 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -39,11 +39,6 @@ except Exception:
 PORTAL_SERVICES_PLUGIN_MODULES = [mod_import(module) for module in make_iter(settings.PORTAL_SERVICES_PLUGIN_MODULES)]
 LOCKDOWN_MODE = settings.LOCKDOWN_MODE
 
-PORTAL_PIDFILE = ""
-if os.name == 'nt':
-    # For Windows we need to handle pid files manually.
-    PORTAL_PIDFILE = os.path.join(settings.GAME_DIR, "server", 'portal.pid')
-
 # -------------------------------------------------------------
 # Evennia Portal settings
 # -------------------------------------------------------------
@@ -113,8 +108,10 @@ class Portal(object):
         self.sessions = PORTAL_SESSIONS
         self.sessions.portal = self
         self.process_id = os.getpid()
+
         self.server_process_id = None
         self.server_restart_mode = "shutdown"
+        self.server_info_dict = {}
 
         # set a callback if the server is killed abruptly,
         # by Ctrl-C, reboot etc.
@@ -163,9 +160,7 @@ class Portal(object):
             return
         self.sessions.disconnect_all()
         self.set_restart_mode(restart)
-        if os.name == 'nt' and os.path.exists(PORTAL_PIDFILE):
-            # for Windows we need to remove pid files manually
-            os.remove(PORTAL_PIDFILE)
+
         if not _reactor_stopping:
             # shutting down the reactor will trigger another signal. We set
             # a flag to avoid loops.
diff --git a/evennia/server/server.py b/evennia/server/server.py
index ba17015022..3006245843 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -51,9 +51,9 @@ SERVER_STARTSTOP_MODULE = mod_import(settings.AT_SERVER_STARTSTOP_MODULE)
 SERVER_SERVICES_PLUGIN_MODULES = [mod_import(module) for module in make_iter(settings.SERVER_SERVICES_PLUGIN_MODULES)]
 
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 # Evennia Server settings
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 SERVERNAME = settings.SERVERNAME
 VERSION = get_evennia_version()

From 684f6a8d6222c309f71361bcd20cedac55a722b6 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 09:43:11 +0100
Subject: [PATCH 095/217] Dumb down launcher kill for Windows' sake

---
 evennia/server/evennia_launcher.py | 112 +++++++++++++++++------------
 1 file changed, 65 insertions(+), 47 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index b07e3bb562..a4fa6ba7ff 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -301,10 +301,12 @@ HELP_ENTRY = \
     game/database. Restarting the Server will refresh code but not
     disconnect users.
 
-    For more ways to operate and manage Evennia, use 'evennia -h'.
+    To start a new game, use 'evennia --init mygame'.
+    For more ways to operate and manage Evennia, see 'evennia -h'.
 
     If you want to add unit tests to your game, see
         https://github.com/evennia/evennia/wiki/Unit-Testing
+
     Evennia's manual is found here:
         https://github.com/evennia/evennia/wiki
     """
@@ -318,7 +320,7 @@ MENU = \
     |  2) Reload               (stop/start Server in 'reload' mode) |
     |  3) Stop                         (shutdown Portal and Server) |
     |  4) Reboot                            (shutdown then restart) |
-    +--- Other -----------------------------------------------------+
+    +--- Other operations ------------------------------------------+
     |  5) Reset              (stop/start Server in 'shutdown' mode) |
     |  6) Stop Server only                                          |
     |  7) Kill Server only            (send kill signal to process) |
@@ -679,7 +681,7 @@ def query_status(callback=None):
             callback(response)
         else:
             pstatus, sstatus, ppid, spid, pinfo, sinfo = _parse_status(response)
-            print("Evennia Portal: {}{}\n        Server: {}{}".format(
+            print("Portal: {}{}\nServer: {}{}".format(
                 wmap[pstatus], " (pid {})".format(get_pid(PORTAL_PIDFILE, ppid)) if pstatus else "",
                 wmap[sstatus], " (pid {})".format(get_pid(SERVER_PIDFILE, spid)) if sstatus else ""))
             _reactor_stop()
@@ -1390,53 +1392,61 @@ def kill(pidfile, component='Server', callback=None, errback=None, killsignal=SI
     """
     Send a kill signal to a process based on PID. A customized
     success/error message will be returned. If clean=True, the system
-    will attempt to manually remove the pid file.
+    will attempt to manually remove the pid file. On Windows, no arguments
+    are useful since Windows has no ability to direct signals except to all
+    children of a console.
 
     Args:
-        pidfile (str): The path of the pidfile to get the PID from.
-        component (str, optional): Usually one of 'Server' or 'Portal'.
-        errback (callable, optional): Called if signal failed to send.
+        pidfile (str): The path of the pidfile to get the PID from. This is ignored
+            on Windows.
+        component (str, optional): Usually one of 'Server' or 'Portal'. This is
+            ignored on Windows.
+        errback (callable, optional): Called if signal failed to send. This
+            is ignored on Windows.
         callback (callable, optional): Called if kill signal was sent successfully.
-        killsignal (int, optional): Signal identifier for signal to send.
+            This is ignored on Windows.
+        killsignal (int, optional): Signal identifier for signal to send. This is
+            Ignored on Windows.
 
     """
-    pid = get_pid(pidfile)
-    if pid:
-        if os.name == 'nt':
-            os.remove(pidfile)
+    if os.name == 'nt':
+        # Windows signal sending is very limited.
+        from win32api import GenerateConsoleCtrlEvent, SetConsoleCtrlHandler
         try:
-            if os.name == 'nt':
-                from win32api import GenerateConsoleCtrlEvent, SetConsoleCtrlHandler
-                try:
-                    # Windows can only send a SIGINT-like signal to
-                    # *every* process spawned off the same console, so we must
-                    # avoid killing ourselves here.
-                    SetConsoleCtrlHandler(None, True)
-                    GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0)
-                except KeyboardInterrupt:
-                    # We must catch and ignore the interrupt sent.
-                    pass
-            else:
-                # Linux/Unix can send the SIGINT signal directly
-                # to the specified PID.
-                os.kill(int(pid), killsignal)
+            # Windows can only send a SIGINT-like signal to
+            # *every* process spawned off the same console, so we must
+            # avoid killing ourselves here.
+            SetConsoleCtrlHandler(None, True)
+            GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0)
+        except KeyboardInterrupt:
+            # We must catch and ignore the interrupt sent.
+            pass
+        print("Sent kill signal to all spawned processes")
 
-        except OSError:
-            print("{component} ({pid}) cannot be stopped. "
-                  "The PID file '{pidfile}' seems stale. "
-                  "Try removing it manually.".format(
-                      component=component, pid=pid, pidfile=pidfile))
-            return
-        if callback:
-            callback()
-        else:
-            print("Sent kill signal to {component}.".format(component=component))
-            return
-    if errback:
-        errback()
     else:
-        print("Could not send kill signal - {component} does "
-              "not appear to be running.".format(component=component))
+        # Linux/Unix/Mac can send kill signal directly to specific PIDs.
+        pid = get_pid(pidfile)
+        if pid:
+            if os.name == 'nt':
+                os.remove(pidfile)
+            try:
+                os.kill(int(pid), killsignal)
+            except OSError:
+                print("{component} ({pid}) cannot be stopped. "
+                      "The PID file '{pidfile}' seems stale. "
+                      "Try removing it manually.".format(
+                          component=component, pid=pid, pidfile=pidfile))
+                return
+            if callback:
+                callback()
+            else:
+                print("Sent kill signal to {component}.".format(component=component))
+                return
+        if errback:
+            errback()
+        else:
+            print("Could not send kill signal - {component} does "
+                  "not appear to be running.".format(component=component))
 
 
 def show_version_info(about=False):
@@ -1744,10 +1754,16 @@ def run_menu():
         elif inp == 6:
             stop_server_only()
         elif inp == 7:
-            kill(SERVER_PIDFILE, 'Server')
+            if os.name == 'nt':
+                print("Windows can't send kill signals by PID. Use option 8 instead.")
+            else:
+                kill(SERVER_PIDFILE, 'Server')
         elif inp == 8:
-            kill(SERVER_PIDFILE, 'Server')
-            kill(PORTAL_PIDFILE, 'Portal')
+            if os.name == 'nt':
+                kill(None)
+            else:
+                kill(SERVER_PIDFILE, 'Server')
+                kill(PORTAL_PIDFILE, 'Portal')
         elif inp == 9:
             if not SERVER_LOGFILE:
                 init_game_directory(CURRENT_DIR, check_db=False)
@@ -1758,8 +1774,10 @@ def run_menu():
         elif inp == 11:
             query_info()
         elif inp == 12:
+            print("Running 'evennia --settings settings.py test .' ...")
             Popen(['evennia', '--settings', 'settings.py', 'test', '.'], env=getenv()).wait()
         elif inp == 13:
+            print("Running 'evennia test evennia' ...")
             Popen(['evennia', 'test', 'evennia'], env=getenv()).wait()
         else:
             print("Not a valid option.")
@@ -1879,11 +1897,11 @@ def main():
 
         # adjust how many lines we show from existing logs
         start_lines1, start_lines2 = 20, 20
-        if option == 'start':
+        if option not in ('reload', 'reset', 'noop'):
             start_lines1, start_lines2 = 0, 0
 
         tail_log_files(PORTAL_LOGFILE, SERVER_LOGFILE, start_lines1, start_lines2)
-        print("   Tailing logfile {} ...".format(SERVER_LOGFILE))
+        print("   Tailing logfile {} (Ctrl-C to exit) ...".format(SERVER_LOGFILE))
 
     if args.dummyrunner:
         # launch the dummy runner

From 582c2a377ef8e393ca773eba6d1a02e26d9ae332 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 10:14:26 +0100
Subject: [PATCH 096/217] Rename Windows argument correctly

---
 evennia/server/evennia_launcher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index a4fa6ba7ff..48c2bd3839 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -815,7 +815,7 @@ def start_evennia(pprofiler=False, sprofiler=False):
                 # Windows requires special care
                 create_no_window = 0x08000000
                 Popen(portal_cmd, env=getenv(), bufsize=-1,
-                      createflags=create_no_window)
+                      creationflags=create_no_window)
             else:
                 Popen(portal_cmd, env=getenv(), bufsize=-1)
         except Exception as e:

From 8dce90408dbd37139bd11b73cd25cb99fb8be019 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 10:57:33 +0100
Subject: [PATCH 097/217] Remove Unix-centric Zombie-process removal that eats
 Windows

---
 evennia/server/evennia_launcher.py  | 31 +++++++++++++++++++----------
 evennia/server/portal/amp_server.py | 17 +++++++++-------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 48c2bd3839..f3e6f1c28d 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -481,6 +481,11 @@ Others, like migrate, test and shell is passed on to Django."""
 #
 # ------------------------------------------------------------
 
+
+def _is_windows():
+    return os.name == 'nt'
+
+
 def _print_info(portal_info_dict, server_info_dict):
     """
     Format info dicts from the Portal/Server for display
@@ -811,7 +816,7 @@ def start_evennia(pprofiler=False, sprofiler=False):
     def _portal_not_running(fail):
         print("Portal starting {}...".format("(under cProfile)" if pprofiler else ""))
         try:
-            if os.name == 'nt':
+            if _is_windows():
                 # Windows requires special care
                 create_no_window = 0x08000000
                 Popen(portal_cmd, env=getenv(), bufsize=-1,
@@ -1349,7 +1354,7 @@ def getenv():
         env (dict): Environment global dict.
 
     """
-    sep = ";" if os.name == 'nt' else ":"
+    sep = ";" if _is_windows() else ":"
     env = os.environ.copy()
     env['PYTHONPATH'] = sep.join(sys.path)
     return env
@@ -1409,7 +1414,7 @@ def kill(pidfile, component='Server', callback=None, errback=None, killsignal=SI
             Ignored on Windows.
 
     """
-    if os.name == 'nt':
+    if _is_windows():
         # Windows signal sending is very limited.
         from win32api import GenerateConsoleCtrlEvent, SetConsoleCtrlHandler
         try:
@@ -1427,7 +1432,7 @@ def kill(pidfile, component='Server', callback=None, errback=None, killsignal=SI
         # Linux/Unix/Mac can send kill signal directly to specific PIDs.
         pid = get_pid(pidfile)
         if pid:
-            if os.name == 'nt':
+            if _is_windows():
                 os.remove(pidfile)
             try:
                 os.kill(int(pid), killsignal)
@@ -1607,7 +1612,7 @@ def init_game_directory(path, check_db=True):
         print(ERROR_LOGDIR_MISSING.format(logfiles=errstr))
         sys.exit()
 
-    if os.name == 'nt':
+    if _is_windows():
         # We need to handle Windows twisted separately. We create a
         # batchfile in game/server, linking to the actual binary
 
@@ -1754,12 +1759,12 @@ def run_menu():
         elif inp == 6:
             stop_server_only()
         elif inp == 7:
-            if os.name == 'nt':
+            if _is_windows():
                 print("Windows can't send kill signals by PID. Use option 8 instead.")
             else:
                 kill(SERVER_PIDFILE, 'Server')
         elif inp == 8:
-            if os.name == 'nt':
+            if _is_windows():
                 kill(None)
             else:
                 kill(SERVER_PIDFILE, 'Server')
@@ -1937,10 +1942,16 @@ def main():
         elif option == 'sstop':
             stop_server_only()
         elif option == 'kill':
-            kill(SERVER_PIDFILE, 'Server')
-            kill(PORTAL_PIDFILE, 'Portal')
+            if _is_windows():
+                kill(None)
+            else:
+                kill(SERVER_PIDFILE, 'Server')
+                kill(PORTAL_PIDFILE, 'Portal')
         elif option == 'skill':
-            kill(SERVER_PIDFILE, 'Server')
+            if _is_windows():
+                print("This is not supported on Windows. Use 'evennia kill' instead.")
+            else:
+                kill(SERVER_PIDFILE, 'Server')
     elif option != "noop":
         # pass-through to django manager
         check_db = False
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 9baa7ba86f..c550a648c3 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -9,10 +9,14 @@ import sys
 from twisted.internet import protocol
 from evennia.server.portal import amp
 from django.conf import settings
-from subprocess import Popen, STDOUT, PIPE
+from subprocess import Popen, STDOUT
 from evennia.utils import logger
 
 
+def _is_windows():
+    return os.name == 'nt'
+
+
 def getenv():
     """
     Get current environment and add PYTHONPATH.
@@ -21,7 +25,7 @@ def getenv():
         env (dict): Environment global dict.
 
     """
-    sep = ";" if os.name == 'nt' else ":"
+    sep = ";" if _is_windows() else ":"
     env = os.environ.copy()
     env['PYTHONPATH'] = sep.join(sys.path)
     return env
@@ -156,7 +160,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
             # eventual errors happening before the Server has
             # opened its logger.
             try:
-                if os.name == 'nt':
+                if _is_windows():
                     # Windows requires special care
                     create_no_window = 0x08000000
                     process = Popen(server_twistd_cmd, env=getenv(), bufsize=-1,
@@ -171,11 +175,10 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
 
             self.factory.portal.server_twistd_cmd = server_twistd_cmd
             logfile.flush()
-        if process:
-            # avoid zombie-process
+        if process and not _is_windows():
+            # avoid zombie-process on Unix/BSD
             process.wait()
-            return process.pid
-        return 0
+        return
 
     def wait_for_disconnect(self, callback, *args, **kwargs):
         """

From 621b6a670b1ae2c620b2d51b1521ca2dd58498f7 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 11:10:28 +0100
Subject: [PATCH 098/217] Make evennia call explicit for Windows' sake

---
 evennia/server/evennia_launcher.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index f3e6f1c28d..b2f75761d0 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -39,7 +39,7 @@ CTRL_C_EVENT = 0  # Windows SIGINT-like signal
 # Set up the main python paths to Evennia
 EVENNIA_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-import evennia
+import evennia  # noqa
 EVENNIA_LIB = os.path.join(os.path.dirname(os.path.abspath(evennia.__file__)))
 EVENNIA_SERVER = os.path.join(EVENNIA_LIB, "server")
 EVENNIA_RUNNER = os.path.join(EVENNIA_SERVER, "evennia_runner.py")
@@ -687,8 +687,10 @@ def query_status(callback=None):
         else:
             pstatus, sstatus, ppid, spid, pinfo, sinfo = _parse_status(response)
             print("Portal: {}{}\nServer: {}{}".format(
-                wmap[pstatus], " (pid {})".format(get_pid(PORTAL_PIDFILE, ppid)) if pstatus else "",
-                wmap[sstatus], " (pid {})".format(get_pid(SERVER_PIDFILE, spid)) if sstatus else ""))
+                wmap[pstatus], " (pid {})".format(
+                    get_pid(PORTAL_PIDFILE, ppid)) if pstatus else "",
+                wmap[sstatus], " (pid {})".format(
+                    get_pid(SERVER_PIDFILE, spid)) if sstatus else ""))
             _reactor_stop()
 
     def _errback(fail):
@@ -1780,10 +1782,11 @@ def run_menu():
             query_info()
         elif inp == 12:
             print("Running 'evennia --settings settings.py test .' ...")
-            Popen(['evennia', '--settings', 'settings.py', 'test', '.'], env=getenv()).wait()
+            Popen([sys.executable, __file__, '--settings', 'settings.py', 'test', '.'],
+                  env=getenv()).wait()
         elif inp == 13:
             print("Running 'evennia test evennia' ...")
-            Popen(['evennia', 'test', 'evennia'], env=getenv()).wait()
+            Popen([sys.executable, __file__, 'test', 'evennia'], env=getenv()).wait()
         else:
             print("Not a valid option.")
             continue

From 21646006d75e05667f0d3bef5932e9f849478c91 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 11:21:42 +0100
Subject: [PATCH 099/217] Turn off kill/skill on Windows since it has no PID
 management

---
 evennia/server/evennia_launcher.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index b2f75761d0..f81eed176f 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -1762,12 +1762,12 @@ def run_menu():
             stop_server_only()
         elif inp == 7:
             if _is_windows():
-                print("Windows can't send kill signals by PID. Use option 8 instead.")
+                print("This option is not supported on Windows.")
             else:
                 kill(SERVER_PIDFILE, 'Server')
         elif inp == 8:
             if _is_windows():
-                kill(None)
+                print("This option is not supported on Windows.")
             else:
                 kill(SERVER_PIDFILE, 'Server')
                 kill(PORTAL_PIDFILE, 'Portal')
@@ -1946,13 +1946,13 @@ def main():
             stop_server_only()
         elif option == 'kill':
             if _is_windows():
-                kill(None)
+                print("This option is not supported on Windows.")
             else:
                 kill(SERVER_PIDFILE, 'Server')
                 kill(PORTAL_PIDFILE, 'Portal')
         elif option == 'skill':
             if _is_windows():
-                print("This is not supported on Windows. Use 'evennia kill' instead.")
+                print("This option is not supported on Windows.")
             else:
                 kill(SERVER_PIDFILE, 'Server')
     elif option != "noop":

From 27eabe924c979ae038a9d86d594cf4e9e92d2d64 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 11:28:20 +0100
Subject: [PATCH 100/217] Correct some language

---
 evennia/server/profiling/dummyrunner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/server/profiling/dummyrunner.py b/evennia/server/profiling/dummyrunner.py
index 34b6acafba..30201be5f1 100644
--- a/evennia/server/profiling/dummyrunner.py
+++ b/evennia/server/profiling/dummyrunner.py
@@ -106,7 +106,7 @@ ERROR_NO_MIXIN = \
     error completely.
 
     Warning: Don't run dummyrunner on a production database! It will
-    create a lot of spammy objects and account accounts!
+    create a lot of spammy objects and accounts!
     """
 
 

From be58590768c42750767ced5d5913fdc79ff3c4b5 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 14:19:06 +0100
Subject: [PATCH 101/217] Have log_file file handles refresh after a certain
 number of accesses. Possibly related to #1305

---
 evennia/utils/logger.py | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/evennia/utils/logger.py b/evennia/utils/logger.py
index b248278ce1..ac8c358a76 100644
--- a/evennia/utils/logger.py
+++ b/evennia/utils/logger.py
@@ -235,6 +235,8 @@ class EvenniaLogFile(logfile.LogFile):
 
 
 _LOG_FILE_HANDLES = {}  # holds open log handles
+_LOG_FILE_HANDLE_COUNTS = {}
+_LOG_FILE_HANDLE_RESET = 500
 
 
 def _open_log_file(filename):
@@ -242,10 +244,15 @@ def _open_log_file(filename):
     Helper to open the log file (always in the log dir) and cache its
     handle.  Will create a new file in the log dir if one didn't
     exist.
+
+    To avoid keeping the filehandle open indefinitely we reset it every
+    _LOG_FILE_HANDLE_RESET accesses. This may help resolve issues for very
+    long uptimes and heavy log use.
+
     """
     # we delay import of settings to keep logger module as free
     # from django as possible.
-    global _LOG_FILE_HANDLES, _LOGDIR, _LOG_ROTATE_SIZE
+    global _LOG_FILE_HANDLES, _LOG_FILE_HANDLE_COUNTS, _LOGDIR, _LOG_ROTATE_SIZE
     if not _LOGDIR:
         from django.conf import settings
         _LOGDIR = settings.LOG_DIR
@@ -253,16 +260,22 @@ def _open_log_file(filename):
 
     filename = os.path.join(_LOGDIR, filename)
     if filename in _LOG_FILE_HANDLES:
-        # cache the handle
-        return _LOG_FILE_HANDLES[filename]
-    else:
-        try:
-            filehandle = EvenniaLogFile.fromFullPath(filename, rotateLength=_LOG_ROTATE_SIZE)
-            # filehandle = open(filename, "a+")  # append mode + reading
-            _LOG_FILE_HANDLES[filename] = filehandle
-            return filehandle
-        except IOError:
-            log_trace()
+        _LOG_FILE_HANDLE_COUNTS[filename] += 1
+        if _LOG_FILE_HANDLE_COUNTS[filename] > _LOG_FILE_HANDLE_RESET:
+            # close/refresh handle
+            _LOG_FILE_HANDLES[filename].close()
+            del _LOG_FILE_HANDLES[filename]
+        else:
+            # return cached handle
+            return _LOG_FILE_HANDLES[filename]
+    try:
+        filehandle = EvenniaLogFile.fromFullPath(filename, rotateLength=_LOG_ROTATE_SIZE)
+        # filehandle = open(filename, "a+")  # append mode + reading
+        _LOG_FILE_HANDLES[filename] = filehandle
+        _LOG_FILE_HANDLE_COUNTS[filename] = 0
+        return filehandle
+    except IOError:
+        log_trace()
     return None
 
 

From 9c7326da88b1e748142a6e99c7cd769c585c84f5 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 15:35:27 +0100
Subject: [PATCH 102/217] Fix output error in ssh protocol. Resolves #1427

---
 evennia/server/portal/ssh.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/evennia/server/portal/ssh.py b/evennia/server/portal/ssh.py
index e993e74bc3..6ac61e7026 100644
--- a/evennia/server/portal/ssh.py
+++ b/evennia/server/portal/ssh.py
@@ -66,6 +66,7 @@ class SshProtocol(Manhole, session.Session):
     here.
 
     """
+    noisy = False
 
     def __init__(self, starttuple):
         """
@@ -104,7 +105,7 @@ class SshProtocol(Manhole, session.Session):
         # since we might have authenticated already, we might set this here.
         if self.authenticated_account:
             self.logged_in = True
-            self.uid = self.authenticated_account.user.id
+            self.uid = self.authenticated_account.id
         self.sessionhandler.connect(self)
 
     def connectionMade(self):
@@ -228,7 +229,7 @@ class SshProtocol(Manhole, session.Session):
 
         """
         if reason:
-            self.data_out(text=reason)
+            self.data_out(text=((reason, ), {}))
         self.connectionLost(reason)
 
     def data_out(self, **kwargs):
@@ -302,6 +303,9 @@ class SshProtocol(Manhole, session.Session):
 
 
 class ExtraInfoAuthServer(SSHUserAuthServer):
+
+    noisy = False
+
     def auth_password(self, packet):
         """
         Password authentication.
@@ -327,6 +331,7 @@ class AccountDBPasswordChecker(object):
     useful for the Realm.
 
     """
+    noisy = False
     credentialInterfaces = (credentials.IUsernamePassword,)
 
     def __init__(self, factory):
@@ -362,6 +367,8 @@ class PassAvatarIdTerminalRealm(TerminalRealm):
 
     """
 
+    noisy = False
+
     def _getAvatar(self, avatarId):
         comp = components.Componentized()
         user = self.userFactory(comp, avatarId)
@@ -383,6 +390,8 @@ class TerminalSessionTransport_getPeer(object):
 
     """
 
+    noisy = False
+
     def __init__(self, proto, chainedProtocol, avatar, width, height):
         self.proto = proto
         self.avatar = avatar
@@ -440,7 +449,6 @@ def makeFactory(configdict):
     """
     Creates the ssh server factory.
     """
-
     pubkeyfile = os.path.join(_GAME_DIR, "server", "ssh-public.key")
     privkeyfile = os.path.join(_GAME_DIR, "server", "ssh-private.key")
 

From a2549410a8079a134b2c53b6c758bd88f8a77551 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 19:50:50 +0100
Subject: [PATCH 103/217] Cleanup of telnet-ssl, creating public/private/certs
 in code rather than calling openssl in a subprocess. Also better handle
 errors and reporting.

---
 evennia/server/portal/portal.py     |  28 +++---
 evennia/server/portal/ssl.py        | 115 ----------------------
 evennia/server/portal/telnet_ssl.py | 146 ++++++++++++++++++++++++++++
 3 files changed, 161 insertions(+), 128 deletions(-)
 delete mode 100644 evennia/server/portal/ssl.py
 create mode 100644 evennia/server/portal/telnet_ssl.py

diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index e8c310cae1..3b658d54fb 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -10,14 +10,11 @@ by game/evennia.py).
 from __future__ import print_function
 from builtins import object
 
-import time
 import sys
 import os
 
 from twisted.application import internet, service
 from twisted.internet import protocol, reactor
-from twisted.internet.task import LoopingCall
-from twisted.web import server
 import django
 django.setup()
 from django.conf import settings
@@ -228,9 +225,9 @@ if TELNET_ENABLED:
 
 if SSL_ENABLED:
 
-    # Start SSL game connection (requires PyOpenSSL).
+    # Start Telnet SSL game connection (requires PyOpenSSL).
 
-    from evennia.server.portal import ssl
+    from evennia.server.portal import telnet_ssl
 
     for interface in SSL_INTERFACES:
         ifacestr = ""
@@ -241,15 +238,20 @@ if SSL_ENABLED:
             factory = protocol.ServerFactory()
             factory.noisy = False
             factory.sessionhandler = PORTAL_SESSIONS
-            factory.protocol = ssl.SSLProtocol
-            ssl_service = internet.SSLServer(port,
-                                             factory,
-                                             ssl.getSSLContext(),
-                                             interface=interface)
-            ssl_service.setName('EvenniaSSL%s' % pstring)
-            PORTAL.services.addService(ssl_service)
+            factory.protocol = telnet_ssl.SSLProtocol
 
-            print("  ssl%s: %s" % (ifacestr, port))
+            ssl_context = telnet_ssl.getSSLContext()
+            if ssl_context:
+                ssl_service = internet.SSLServer(port,
+                                                 factory,
+                                                 telnet_ssl.getSSLContext(),
+                                                 interface=interface)
+                ssl_service.setName('EvenniaSSL%s' % pstring)
+                PORTAL.services.addService(ssl_service)
+
+                print("  ssl%s: %s" % (ifacestr, port))
+            else:
+                print("  ssl%s: %s (deactivated - keys/certificate unset)" % (ifacestr, port))
 
 
 if SSH_ENABLED:
diff --git a/evennia/server/portal/ssl.py b/evennia/server/portal/ssl.py
deleted file mode 100644
index 8b638ed23d..0000000000
--- a/evennia/server/portal/ssl.py
+++ /dev/null
@@ -1,115 +0,0 @@
-"""
-This is a simple context factory for auto-creating
-SSL keys and certificates.
-
-"""
-from __future__ import print_function
-
-import os
-import sys
-try:
-    import OpenSSL
-    from twisted.internet import ssl as twisted_ssl
-except ImportError as error:
-    errstr = """
-    {err}
-    SSL requires the PyOpenSSL library and dependencies:
-
-        pip install pyopenssl pycrypto enum pyasn1 service_identity
-
-    Stop and start Evennia again. If no certificate can be generated, you'll
-    get a suggestion for a (linux) command to generate this locally.
-
-    """
-    raise ImportError(errstr.format(err=error))
-
-from django.conf import settings
-from evennia.server.portal.telnet import TelnetProtocol
-
-_GAME_DIR = settings.GAME_DIR
-
-# messages
-
-NO_AUTOGEN = """
-
-{err}
-Evennia could not auto-generate the SSL private key. If this error
-persists, create {keyfile} yourself using third-party tools.
-"""
-
-NO_AUTOCERT = """
-
-{err}
-Evennia's SSL context factory could not automatically, create an SSL
-certificate {certfile}.
-
-A private key {keyfile} was already created. Please create {certfile}
-manually using the commands valid  for your operating system, for
-example (linux, using the openssl program):
-    {exestring}
-"""
-
-
-class SSLProtocol(TelnetProtocol):
-    """
-    Communication is the same as telnet, except data transfer
-    is done with encryption.
-    """
-
-    def __init__(self, *args, **kwargs):
-        super(SSLProtocol, self).__init__(*args, **kwargs)
-        self.protocol_name = "ssl"
-
-
-def verify_SSL_key_and_cert(keyfile, certfile):
-    """
-    This function looks for RSA key and certificate in the current
-    directory. If files ssl.key and ssl.cert does not exist, they
-    are created.
-    """
-
-    if not (os.path.exists(keyfile) and os.path.exists(certfile)):
-        # key/cert does not exist. Create.
-        import subprocess
-        from Crypto.PublicKey import RSA
-        from twisted.conch.ssh.keys import Key
-
-        print("  Creating SSL key and certificate ... ", end=' ')
-
-        try:
-            # create the RSA key and store it.
-            KEY_LENGTH = 1024
-            rsaKey = Key(RSA.generate(KEY_LENGTH))
-            keyString = rsaKey.toString(type="OPENSSH")
-            file(keyfile, 'w+b').write(keyString)
-        except Exception as err:
-            print(NO_AUTOGEN.format(err=err, keyfile=keyfile))
-            sys.exit(5)
-
-        # try to create the certificate
-        CERT_EXPIRE = 365 * 20  # twenty years validity
-        # default:
-        # openssl req -new -x509 -key ssl.key -out ssl.cert -days 7300
-        exestring = "openssl req -new -x509 -key %s -out %s -days %s" % (keyfile, certfile, CERT_EXPIRE)
-        try:
-            subprocess.call(exestring)
-        except OSError as err:
-            raise OSError(NO_AUTOCERT.format(err=err, certfile=certfile, keyfile=keyfile, exestring=exestring))
-        print("done.")
-
-
-def getSSLContext():
-    """
-    This is called by the portal when creating the SSL context
-    server-side.
-
-    Returns:
-        ssl_context (tuple): A key and certificate that is either
-            existing previously or or created on the fly.
-
-    """
-    keyfile = os.path.join(_GAME_DIR, "server", "ssl.key")
-    certfile = os.path.join(_GAME_DIR, "server", "ssl.cert")
-
-    verify_SSL_key_and_cert(keyfile, certfile)
-    return twisted_ssl.DefaultOpenSSLContextFactory(keyfile, certfile)
diff --git a/evennia/server/portal/telnet_ssl.py b/evennia/server/portal/telnet_ssl.py
new file mode 100644
index 0000000000..b6869400a1
--- /dev/null
+++ b/evennia/server/portal/telnet_ssl.py
@@ -0,0 +1,146 @@
+"""
+This allows for running the telnet communication over an encrypted SSL tunnel. To use it, requires a
+client supporting Telnet SSL.
+
+The protocol will try to automatically create the private key and certificate on the server side
+when starting and will warn if this was not possible. These will appear as files ssl.key and
+ssl.cert in mygame/server/.
+
+"""
+from __future__ import print_function
+
+import os
+try:
+    from OpenSSL import crypto
+    from twisted.internet import ssl as twisted_ssl
+except ImportError as error:
+    errstr = """
+    {err}
+    Telnet-SSL requires the PyOpenSSL library and dependencies:
+
+        pip install pyopenssl pycrypto enum pyasn1 service_identity
+
+    Stop and start Evennia again. If no certificate can be generated, you'll
+    get a suggestion for a (linux) command to generate this locally.
+
+    """
+    raise ImportError(errstr.format(err=error))
+
+from django.conf import settings
+from evennia.server.portal.telnet import TelnetProtocol
+
+_GAME_DIR = settings.GAME_DIR
+
+_PRIVATE_KEY_LENGTH = 2048
+_PRIVATE_KEY_FILE = os.path.join(_GAME_DIR, "server", "ssl.key")
+_PUBLIC_KEY_FILE = os.path.join(_GAME_DIR, "server", "ssl_public.key")
+_CERTIFICATE_FILE = os.path.join(_GAME_DIR, "server", "ssl.cert")
+_CERTIFICATE_EXPIRE = 365 * 24 * 60 * 60 * 20  # 20 years
+_CERTIFICATE_ISSUER = {"C": "EV", "ST": "Evennia", "L": "Evennia", "O":
+                       "Evennia Security", "OU": "Evennia Department", "CN": "evennia"}
+
+# messages
+
+NO_AUTOGEN = """
+Evennia could not auto-generate the SSL private- and public keys ({{err}}).
+If this error persists, create them manually (using the tools for your OS). The files
+should be placed and named like this:
+    {}
+    {}
+""".format(_PRIVATE_KEY_FILE, _PUBLIC_KEY_FILE)
+
+NO_AUTOCERT = """
+Evennia's could not auto-generate the SSL certificate ({{err}}).
+The private key already exists here:
+    {}
+If this error persists, create the certificate manually (using the private key and
+the tools for your OS). The file should be placed and named like this:
+    {}
+""".format(_PRIVATE_KEY_FILE, _CERTIFICATE_FILE)
+
+
+class SSLProtocol(TelnetProtocol):
+    """
+    Communication is the same as telnet, except data transfer
+    is done with encryption set up by the portal at start time.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super(SSLProtocol, self).__init__(*args, **kwargs)
+        self.protocol_name = "ssl"
+
+
+def verify_or_create_SSL_key_and_cert(keyfile, certfile):
+    """
+    Verify or create new key/certificate files.
+
+    Args:
+        keyfile (str): Path to ssl.key file.
+        certfile (str): Parth to ssl.cert file.
+
+    Notes:
+        If files don't already exist, they are created.
+
+    """
+
+    if not (os.path.exists(keyfile) and os.path.exists(certfile)):
+        # key/cert does not exist. Create.
+        try:
+            # generate the keypair
+            keypair = crypto.PKey()
+            keypair.generate_key(crypto.TYPE_RSA, _PRIVATE_KEY_LENGTH)
+
+            with open(_PRIVATE_KEY_FILE, 'wt') as pfile:
+                pfile.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, keypair))
+                print("Created SSL private key in '{}'.".format(_PRIVATE_KEY_FILE))
+
+            with open(_PUBLIC_KEY_FILE, 'wt') as pfile:
+                pfile.write(crypto.dump_publickey(crypto.FILETYPE_PEM, keypair))
+                print("Created SSL public key in '{}'.".format(_PRIVATE_KEY_FILE))
+
+        except Exception as err:
+            print(NO_AUTOGEN.format(err=err))
+            return False
+
+        else:
+
+            try:
+                # create certificate
+                cert = crypto.X509()
+                subj = cert.get_subject()
+                for key, value in _CERTIFICATE_ISSUER.items():
+                    setattr(subj, key, value)
+                cert.set_issuer(subj)
+
+                cert.set_serial_number(1000)
+                cert.gmtime_adj_notBefore(0)
+                cert.gmtime_adj_notAfter(_CERTIFICATE_EXPIRE)
+                cert.set_pubkey(keypair)
+                cert.sign(keypair, 'sha1')
+
+                with open(_CERTIFICATE_FILE, 'wt') as cfile:
+                    cfile.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert))
+                    print("Created SSL certificate in '{}'.".format(_PRIVATE_KEY_FILE))
+
+            except Exception as err:
+                print(NO_AUTOCERT.format(err=err))
+                return False
+
+    return True
+
+
+def getSSLContext():
+    """
+    This is called by the portal when creating the SSL context
+    server-side.
+
+    Returns:
+        ssl_context (tuple): A key and certificate that is either
+            existing previously or created on the fly.
+
+    """
+
+    if verify_or_create_SSL_key_and_cert(_PRIVATE_KEY_FILE, _CERTIFICATE_FILE):
+        return twisted_ssl.DefaultOpenSSLContextFactory(_PRIVATE_KEY_FILE, _CERTIFICATE_FILE)
+    else:
+        return None

From 37a5a67391d66743462fc411366bf30e9dbed889 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 21:30:10 +0100
Subject: [PATCH 104/217] Clean up SSH key generation and output.

---
 evennia/server/portal/ssh.py        | 48 +++++++++++++++++------------
 evennia/server/portal/telnet_ssl.py |  6 ++--
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/evennia/server/portal/ssh.py b/evennia/server/portal/ssh.py
index 6ac61e7026..9534a67244 100644
--- a/evennia/server/portal/ssh.py
+++ b/evennia/server/portal/ssh.py
@@ -52,12 +52,25 @@ from evennia.utils.utils import to_str
 _RE_N = re.compile(r"\|n$")
 _RE_SCREENREADER_REGEX = re.compile(r"%s" % settings.SCREENREADER_REGEX_STRIP, re.DOTALL + re.MULTILINE)
 _GAME_DIR = settings.GAME_DIR
+_PRIVATE_KEY_FILE = os.path.join(_GAME_DIR, "server", "ssh-private.key")
+_PUBLIC_KEY_FILE = os.path.join(_GAME_DIR, "server", "ssh-public.key")
+_KEY_LENGTH = 2048
 
 CTRL_C = '\x03'
 CTRL_D = '\x04'
 CTRL_BACKSLASH = '\x1c'
 CTRL_L = '\x0c'
 
+_NO_AUTOGEN = """
+Evennia could not generate SSH private- and public keys ({{err}})
+Using conch default keys instead.
+
+If this error persists, create the keys manually (using the tools for your OS)
+and put them here:
+    {}
+    {}
+""".format(_PRIVATE_KEY_FILE, _PUBLIC_KEY_FILE)
+
 
 class SshProtocol(Manhole, session.Session):
     """
@@ -426,32 +439,32 @@ def getKeyPair(pubkeyfile, privkeyfile):
 
     if not (os.path.exists(pubkeyfile) and os.path.exists(privkeyfile)):
         # No keypair exists. Generate a new RSA keypair
-        print("  Generating SSH RSA keypair ...", end=' ')
         from Crypto.PublicKey import RSA
 
-        KEY_LENGTH = 1024
-        rsaKey = Key(RSA.generate(KEY_LENGTH))
-        publicKeyString = rsaKey.public().toString(type="OPENSSH")
-        privateKeyString = rsaKey.toString(type="OPENSSH")
+        rsa_key = Key(RSA.generate(_KEY_LENGTH))
+        public_key_string = rsa_key.public().toString(type="OPENSSH")
+        private_key_string = rsa_key.toString(type="OPENSSH")
 
         # save keys for the future.
-        file(pubkeyfile, 'w+b').write(publicKeyString)
-        file(privkeyfile, 'w+b').write(privateKeyString)
-        print(" done.")
+        with open(privkeyfile, 'wt') as pfile:
+            pfile.write(private_key_string)
+            print("Created SSH private key in '{}'".format(_PRIVATE_KEY_FILE))
+        with open(pubkeyfile, 'wt') as pfile:
+            pfile.write(public_key_string)
+            print("Created SSH public key in '{}'".format(_PUBLIC_KEY_FILE))
     else:
-        publicKeyString = file(pubkeyfile).read()
-        privateKeyString = file(privkeyfile).read()
+        with open(pubkeyfile) as pfile:
+            public_key_string = pfile.read()
+        with open(privkeyfile) as pfile:
+            private_key_string = pfile.read()
 
-    return Key.fromString(publicKeyString), Key.fromString(privateKeyString)
+    return Key.fromString(public_key_string), Key.fromString(private_key_string)
 
 
 def makeFactory(configdict):
     """
     Creates the ssh server factory.
     """
-    pubkeyfile = os.path.join(_GAME_DIR, "server", "ssh-public.key")
-    privkeyfile = os.path.join(_GAME_DIR, "server", "ssh-private.key")
-
     def chainProtocolFactory(username=None):
         return insults.ServerProtocol(
             configdict['protocolFactory'],
@@ -466,14 +479,11 @@ def makeFactory(configdict):
 
     try:
         # create/get RSA keypair
-        publicKey, privateKey = getKeyPair(pubkeyfile, privkeyfile)
+        publicKey, privateKey = getKeyPair(_PUBLIC_KEY_FILE, _PRIVATE_KEY_FILE)
         factory.publicKeys = {'ssh-rsa': publicKey}
         factory.privateKeys = {'ssh-rsa': privateKey}
     except Exception as err:
-        print("getKeyPair error: {err}\n WARNING: Evennia could not "
-              "auto-generate SSH keypair. Using conch default keys instead.\n"
-              "If this error persists, create {pub} and "
-              "{priv} yourself using third-party tools.".format(err=err, pub=pubkeyfile, priv=privkeyfile))
+        print(_NO_AUTOGEN.format(err=err))
 
     factory.services = factory.services.copy()
     factory.services['ssh-userauth'] = ExtraInfoAuthServer
diff --git a/evennia/server/portal/telnet_ssl.py b/evennia/server/portal/telnet_ssl.py
index b6869400a1..b3d2ae4fa6 100644
--- a/evennia/server/portal/telnet_ssl.py
+++ b/evennia/server/portal/telnet_ssl.py
@@ -33,7 +33,7 @@ _GAME_DIR = settings.GAME_DIR
 
 _PRIVATE_KEY_LENGTH = 2048
 _PRIVATE_KEY_FILE = os.path.join(_GAME_DIR, "server", "ssl.key")
-_PUBLIC_KEY_FILE = os.path.join(_GAME_DIR, "server", "ssl_public.key")
+_PUBLIC_KEY_FILE = os.path.join(_GAME_DIR, "server", "ssl-public.key")
 _CERTIFICATE_FILE = os.path.join(_GAME_DIR, "server", "ssl.cert")
 _CERTIFICATE_EXPIRE = 365 * 24 * 60 * 60 * 20  # 20 years
 _CERTIFICATE_ISSUER = {"C": "EV", "ST": "Evennia", "L": "Evennia", "O":
@@ -96,7 +96,7 @@ def verify_or_create_SSL_key_and_cert(keyfile, certfile):
 
             with open(_PUBLIC_KEY_FILE, 'wt') as pfile:
                 pfile.write(crypto.dump_publickey(crypto.FILETYPE_PEM, keypair))
-                print("Created SSL public key in '{}'.".format(_PRIVATE_KEY_FILE))
+                print("Created SSL public key in '{}'.".format(_PUBLIC_KEY_FILE))
 
         except Exception as err:
             print(NO_AUTOGEN.format(err=err))
@@ -120,7 +120,7 @@ def verify_or_create_SSL_key_and_cert(keyfile, certfile):
 
                 with open(_CERTIFICATE_FILE, 'wt') as cfile:
                     cfile.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert))
-                    print("Created SSL certificate in '{}'.".format(_PRIVATE_KEY_FILE))
+                    print("Created SSL certificate in '{}'.".format(_CERTIFICATE_FILE))
 
             except Exception as err:
                 print(NO_AUTOCERT.format(err=err))

From e31b2a1ee4bb0c1ca89432e0fec4d5910b739334 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 21:54:46 +0100
Subject: [PATCH 105/217] Rename protocol_keys ssl->telnet/ssl,
 websocket->webclient/websocket, ajax/comet->webclient/ajax.

---
 evennia/server/portal/ssh.py            | 1 +
 evennia/server/portal/telnet.py         | 4 ++--
 evennia/server/portal/telnet_ssl.py     | 2 +-
 evennia/server/portal/webclient.py      | 3 +++
 evennia/server/portal/webclient_ajax.py | 2 +-
 evennia/server/session.py               | 4 ++--
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/evennia/server/portal/ssh.py b/evennia/server/portal/ssh.py
index 9534a67244..29bd3eac87 100644
--- a/evennia/server/portal/ssh.py
+++ b/evennia/server/portal/ssh.py
@@ -90,6 +90,7 @@ class SshProtocol(Manhole, session.Session):
             starttuple (tuple): A (account, factory) tuple.
 
         """
+        self.protocol_key = "ssh"
         self.authenticated_account = starttuple[0]
         # obs must not be called self.factory, that gets overwritten!
         self.cfactory = starttuple[1]
diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py
index bdb937bde5..aef96b6f38 100644
--- a/evennia/server/portal/telnet.py
+++ b/evennia/server/portal/telnet.py
@@ -34,8 +34,8 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
     """
 
     def __init__(self, *args, **kwargs):
-        self.protocol_name = "telnet"
         super(TelnetProtocol, self).__init__(*args, **kwargs)
+        self.protocol_key = "telnet"
 
     def connectionMade(self):
         """
@@ -49,7 +49,7 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
         # this number is counted down for every handshake that completes.
         # when it reaches 0 the portal/server syncs their data
         self.handshakes = 8  # suppress-go-ahead, naws, ttype, mccp, mssp, msdp, gmcp, mxp
-        self.init_session(self.protocol_name, client_address, self.factory.sessionhandler)
+        self.init_session(self.protocol_key, client_address, self.factory.sessionhandler)
         # add this new connection to sessionhandler so
         # the Server becomes aware of it.
         self.sessionhandler.connect(self)
diff --git a/evennia/server/portal/telnet_ssl.py b/evennia/server/portal/telnet_ssl.py
index b3d2ae4fa6..cbeb108ac5 100644
--- a/evennia/server/portal/telnet_ssl.py
+++ b/evennia/server/portal/telnet_ssl.py
@@ -67,7 +67,7 @@ class SSLProtocol(TelnetProtocol):
 
     def __init__(self, *args, **kwargs):
         super(SSLProtocol, self).__init__(*args, **kwargs)
-        self.protocol_name = "ssl"
+        self.protocol_key = "telnet/ssl"
 
 
 def verify_or_create_SSL_key_and_cert(keyfile, certfile):
diff --git a/evennia/server/portal/webclient.py b/evennia/server/portal/webclient.py
index d025b85018..70ebcab1ec 100644
--- a/evennia/server/portal/webclient.py
+++ b/evennia/server/portal/webclient.py
@@ -31,6 +31,9 @@ class WebSocketClient(Protocol, Session):
     """
     Implements the server-side of the Websocket connection.
     """
+    def __init__(self, *args, **kwargs):
+        super(WebSocketClient, self).__init__(*args, **kwargs)
+        self.protocol_key = "webclient/websocket"
 
     def connectionMade(self):
         """
diff --git a/evennia/server/portal/webclient_ajax.py b/evennia/server/portal/webclient_ajax.py
index c31f5d8eab..aa774e265c 100644
--- a/evennia/server/portal/webclient_ajax.py
+++ b/evennia/server/portal/webclient_ajax.py
@@ -298,7 +298,7 @@ class AjaxWebClientSession(session.Session):
     """
 
     def __init__(self, *args, **kwargs):
-        self.protocol_name = "ajax/comet"
+        self.protocol_key = "webclient/ajax"
         super(AjaxWebClientSession, self).__init__(*args, **kwargs)
 
     def get_client_session(self):
diff --git a/evennia/server/session.py b/evennia/server/session.py
index ed7dabbe8f..093a2c0d7a 100644
--- a/evennia/server/session.py
+++ b/evennia/server/session.py
@@ -47,8 +47,8 @@ class Session(object):
         a new session is established.
 
         Args:
-            protocol_key (str): By default, one of 'telnet', 'ssh',
-                'ssl' or 'web'.
+            protocol_key (str): By default, one of 'telnet', 'telnet/ssl', 'ssh',
+                'webclient/websocket' or 'webclient/ajax'.
             address (str): Client address.
             sessionhandler (SessionHandler): Reference to the
                 main sessionhandler instance.

From 11f9d1772e89c1f2dc62e7fd64b36fafa2b5b245 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 27 Jan 2018 22:10:31 +0100
Subject: [PATCH 106/217] Fix a merge artifact

---
 evennia/server/portal/portal.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index 1163133979..a720c73c71 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -245,10 +245,11 @@ if SSL_ENABLED:
             ifacestr = "-%s" % interface
         for port in SSL_PORTS:
             pstring = "%s:%s" % (ifacestr, port)
-            factory = telnet_ssl.SSLServerFactory()
+            factory = protocol.ServerFactory()
             factory.noisy = False
             factory.sessionhandler = PORTAL_SESSIONS
             factory.protocol = telnet_ssl.SSLProtocol
+
             ssl_context = telnet_ssl.getSSLContext()
             if ssl_context:
                 ssl_service = internet.SSLServer(port,
@@ -259,7 +260,6 @@ if SSL_ENABLED:
                 PORTAL.services.addService(ssl_service)
 
                 INFO_DICT["telnet_ssl"].append("telnet+ssl%s: %s" % (ifacestr, port))
-                print("  ssl%s: %s" % (ifacestr, port))
             else:
                 INFO_DICT["telnet_ssl"].append(
                         "telnet+ssl%s: %s (deactivated - keys/cert unset)" % (ifacestr, port))

From 04feacd224e2874f014ef7298de6dfc452079ac8 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 28 Jan 2018 11:08:37 +0100
Subject: [PATCH 107/217] Improve info about and when running evennia --log

---
 evennia/server/evennia_launcher.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index f81eed176f..c82b922ca0 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -326,7 +326,7 @@ MENU = \
     |  7) Kill Server only            (send kill signal to process) |
     |  8) Kill Portal + Server                                      |
     +--- Information -----------------------------------------------+
-    |  9) Tail log file                        (quickly see errors) |
+    |  9) Tail log files                       (quickly see errors) |
     | 10) Status                                                    |
     | 11) Port info                                                 |
     +--- Testing ---------------------------------------------------+
@@ -486,6 +486,17 @@ def _is_windows():
     return os.name == 'nt'
 
 
+def _file_names_compact(filepath1, filepath2):
+    "Compact the output of filenames with same base dir"
+    dirname1 = os.path.dirname(filepath1)
+    dirname2 = os.path.dirname(filepath2)
+    if dirname1 == dirname2:
+        name2 = os.path.basename(filepath2)
+        return "{} and {}".format(filepath1, name2)
+    else:
+        return "{} and {}". format(filepath1, filepath2)
+
+
 def _print_info(portal_info_dict, server_info_dict):
     """
     Format info dicts from the Portal/Server for display
@@ -1775,7 +1786,8 @@ def run_menu():
             if not SERVER_LOGFILE:
                 init_game_directory(CURRENT_DIR, check_db=False)
             tail_log_files(PORTAL_LOGFILE, SERVER_LOGFILE, 20, 20)
-            print("   Tailing logfile {} ...".format(SERVER_LOGFILE))
+            print("   Tailing logfiles {} (Ctrl-C to exit) ...".format(
+                _file_names_compact(SERVER_LOGFILE, PORTAL_LOGFILE)))
         elif inp == 10:
             query_status()
         elif inp == 11:
@@ -1810,7 +1822,7 @@ def main():
         help="creates a new gamedir 'name' at current location")
     parser.add_argument(
         '--log', '-l', action='store_true', dest='tail_log', default=False,
-        help="tail the server logfile to console")
+        help="tail the portal and server logfiles and print to stdout")
     parser.add_argument(
         '--list', nargs='+', action='store', dest='listsetting', metavar="all|<key>",
         help=("list settings, use 'all' to list all available keys"))
@@ -1909,8 +1921,8 @@ def main():
             start_lines1, start_lines2 = 0, 0
 
         tail_log_files(PORTAL_LOGFILE, SERVER_LOGFILE, start_lines1, start_lines2)
-        print("   Tailing logfile {} (Ctrl-C to exit) ...".format(SERVER_LOGFILE))
-
+        print("   Tailing logfiles {} (Ctrl-C to exit) ...".format(
+            _file_names_compact(SERVER_LOGFILE, PORTAL_LOGFILE)))
     if args.dummyrunner:
         # launch the dummy runner
         init_game_directory(CURRENT_DIR, check_db=True)

From 06f526221f6811ea57330e35de8174aeb7a44613 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 28 Jan 2018 23:12:01 +0100
Subject: [PATCH 108/217] Change GA style to not include endline, add
 FORCEDENDLINE for clients requiring GA+endline. See #1395.

---
 evennia/commands/default/account.py  | 10 +++++++---
 evennia/server/portal/suppress_ga.py | 10 ++++------
 evennia/server/portal/telnet.py      | 10 +++++++---
 evennia/server/portal/ttype.py       |  6 ++++++
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/evennia/commands/default/account.py b/evennia/commands/default/account.py
index e45e2a9347..9a4d2d330c 100644
--- a/evennia/commands/default/account.py
+++ b/evennia/commands/default/account.py
@@ -549,8 +549,11 @@ class CmdOption(COMMAND_DEFAULT_CLASS):
             try:
                 old_val = flags.get(new_name, False)
                 new_val = validator(new_val)
-                flags[new_name] = new_val
-                self.msg("Option |w%s|n was changed from '|w%s|n' to '|w%s|n'." % (new_name, old_val, new_val))
+                if old_val == new_val:
+                    self.msg("Option |w%s|n was kept as '|w%s|n'." % (new_name, old_val))
+                else:
+                    flags[new_name] = new_val
+                    self.msg("Option |w%s|n was changed from '|w%s|n' to '|w%s|n'." % (new_name, old_val, new_val))
                 return {new_name: new_val}
             except Exception as err:
                 self.msg("|rCould not set option |w%s|r:|n %s" % (new_name, err))
@@ -572,7 +575,8 @@ class CmdOption(COMMAND_DEFAULT_CLASS):
                       "TERM": utils.to_str,
                       "UTF-8": validate_bool,
                       "XTERM256": validate_bool,
-                      "INPUTDEBUG": validate_bool}
+                      "INPUTDEBUG": validate_bool,
+                      "FORCEDENDLINE": validate_bool}
 
         name = self.lhs.upper()
         val = self.rhs.strip()
diff --git a/evennia/server/portal/suppress_ga.py b/evennia/server/portal/suppress_ga.py
index c13fea62ba..bff47e6b2b 100644
--- a/evennia/server/portal/suppress_ga.py
+++ b/evennia/server/portal/suppress_ga.py
@@ -40,11 +40,9 @@ class SuppressGA(object):
 
         self.protocol.protocol_flags["NOGOAHEAD"] = True
         # tell the client that we prefer to suppress GA ...
-        self.protocol.will(SUPPRESS_GA).addCallbacks(self.do_suppress_ga, self.dont_suppress_ga)
-        # ... but also accept if the client really wants not to.
-        self.protocol.do(SUPPRESS_GA).addCallbacks(self.do_suppress_ga, self.dont_suppress_ga)
+        self.protocol.will(SUPPRESS_GA).addCallbacks(self.will_suppress_ga, self.wont_suppress_ga)
 
-    def dont_suppress_ga(self, option):
+    def wont_suppress_ga(self, option):
         """
         Called when client requests to not suppress GA.
 
@@ -55,9 +53,9 @@ class SuppressGA(object):
         self.protocol.protocol_flags["NOGOAHEAD"] = False
         self.protocol.handshake_done()
 
-    def do_suppress_ga(self, option):
+    def will_suppress_ga(self, option):
         """
-        Client wants to suppress GA
+        Client will suppress GA
 
         Args:
             option (Option): Not used.
diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py
index aef96b6f38..17044ae110 100644
--- a/evennia/server/portal/telnet.py
+++ b/evennia/server/portal/telnet.py
@@ -231,11 +231,15 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
             line (str): Line to send.
 
         """
-        # escape IAC in line mode, and correctly add \r\n
-        line += self.delimiter
-        line = line.replace(IAC, IAC + IAC).replace('\n', '\r\n')
+        # escape IAC in line mode, and correctly add \r\n (the TELNET end-of-line)
+        line = line.replace(IAC, IAC + IAC)
+        line = line.replace('\n', '\r\n')
         if not self.protocol_flags.get("NOGOAHEAD", True):
+            if self.protocol_flags.get("FORCEDENDLINE", False):
+                line += "\r\n"
             line += IAC + GA
+        elif not line.endswith("\r\n"):
+            line += "\r\n"
         return self.transport.write(mccp_compress(self, line))
 
     # Session hooks
diff --git a/evennia/server/portal/ttype.py b/evennia/server/portal/ttype.py
index b9c3e8b239..4279c52dd6 100644
--- a/evennia/server/portal/ttype.py
+++ b/evennia/server/portal/ttype.py
@@ -50,6 +50,8 @@ class Ttype(object):
         """
         self.ttype_step = 0
         self.protocol = protocol
+        # we set FORCEDENDLINE for clients not supporting ttype
+        self.protocol.protocol_flags["FORCEDENDLINE"] = True
         self.protocol.protocol_flags['TTYPE'] = False
         # is it a safe bet to assume ANSI is always supported?
         self.protocol.protocol_flags['ANSI'] = True
@@ -98,6 +100,10 @@ class Ttype(object):
             # just start the request chain
             self.protocol.requestNegotiation(TTYPE, SEND)
 
+            # for clients that support TTYPE we assume this is not needed
+            # (they can set it manually if so)
+            self.protocol.protocol_flags["FORCEDENDLINE"] = False
+
         elif self.ttype_step == 1:
             # this is supposed to be the name of the client/terminal.
             # For clients not supporting the extended TTYPE

From 146ceb81cc688edcb71a6feae26a7966f63a606d Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 29 Jan 2018 00:02:07 +0100
Subject: [PATCH 109/217] Remove superfluous close_menu call leading to two
 exit-cmds being called when exiting via custom end node. Resolves #1428.

---
 evennia/utils/evmenu.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/evennia/utils/evmenu.py b/evennia/utils/evmenu.py
index d248910e76..69042e8516 100644
--- a/evennia/utils/evmenu.py
+++ b/evennia/utils/evmenu.py
@@ -753,10 +753,6 @@ class EvMenu(object):
         else:
             self.caller.msg(_HELP_NO_OPTION_MATCH, session=self._session)
 
-        if not (self.options or self.default):
-            # no options - we are at the end of the menu.
-            self.close_menu()
-
     # formatters - override in a child class
 
     def nodetext_formatter(self, nodetext):

From 821bf83c15b3ae79b9754c8a6086190e7ff0bbf3 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 29 Jan 2018 19:48:21 +0100
Subject: [PATCH 110/217] Add FORCEDENDLINE default exception for later
 Tinyfugue with TTYPE support

---
 evennia/server/portal/ttype.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/evennia/server/portal/ttype.py b/evennia/server/portal/ttype.py
index 4279c52dd6..3102762edf 100644
--- a/evennia/server/portal/ttype.py
+++ b/evennia/server/portal/ttype.py
@@ -116,17 +116,22 @@ class Ttype(object):
             if cupper.startswith("MUDLET"):
                 # supports xterm256 stably since 1.1 (2010?)
                 xterm256 = cupper.split("MUDLET", 1)[1].strip() >= "1.1"
-            else:
-                xterm256 = (cupper.startswith("XTERM") or
-                            cupper.endswith("-256COLOR") or
-                            cupper in ("ATLANTIS",      # > 0.9.9.0 (aug 2009)
-                                       "CMUD",          # > 3.04 (mar 2009)
-                                       "KILDCLIENT",    # > 2.2.0 (sep 2005)
-                                       "MUDLET",        # > beta 15 (sep 2009)
-                                       "MUSHCLIENT",    # > 4.02 (apr 2007)
-                                       "PUTTY",         # > 0.58 (apr 2005)
-                                       "BEIP",          # > 2.00.206 (late 2009) (BeipMu)
-                                       "POTATO"))       # > 2.00 (maybe earlier)
+
+            if cupper.startswith("TINYFUGUE"):
+                # tinyfugue expects _GA + endline
+                self.protocol.protocol_flags["FORCEDENDLINE"] = True
+
+            if (cupper.startswith("XTERM") or
+                cupper.endswith("-256COLOR") or
+                cupper in ("ATLANTIS",      # > 0.9.9.0 (aug 2009)
+                           "CMUD",          # > 3.04 (mar 2009)
+                           "KILDCLIENT",    # > 2.2.0 (sep 2005)
+                           "MUDLET",        # > beta 15 (sep 2009)
+                           "MUSHCLIENT",    # > 4.02 (apr 2007)
+                           "PUTTY",         # > 0.58 (apr 2005)
+                           "BEIP",          # > 2.00.206 (late 2009) (BeipMu)
+                           "POTATO")):      # > 2.00 (maybe earlier)
+                    xterm256 = True
 
             # all clients supporting TTYPE at all seem to support ANSI
             self.protocol.protocol_flags['ANSI'] = True

From ee0b1c435a53321f5d1cbd6ccb8508c9259e377e Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 29 Jan 2018 20:03:54 +0100
Subject: [PATCH 111/217] Further refactor when an extra endline is added with
 the FORCEDENDLINE option

---
 evennia/server/portal/telnet.py | 8 +++-----
 evennia/server/portal/ttype.py  | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py
index 17044ae110..558475cd34 100644
--- a/evennia/server/portal/telnet.py
+++ b/evennia/server/portal/telnet.py
@@ -234,12 +234,10 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
         # escape IAC in line mode, and correctly add \r\n (the TELNET end-of-line)
         line = line.replace(IAC, IAC + IAC)
         line = line.replace('\n', '\r\n')
-        if not self.protocol_flags.get("NOGOAHEAD", True):
-            if self.protocol_flags.get("FORCEDENDLINE", False):
-                line += "\r\n"
-            line += IAC + GA
-        elif not line.endswith("\r\n"):
+        if not line.endswith("\r\n") and self.protocol_flags.get("FORCEDENDLINE", True):
             line += "\r\n"
+        if not self.protocol_flags.get("NOGOAHEAD", True):
+            line += IAC + GA
         return self.transport.write(mccp_compress(self, line))
 
     # Session hooks
diff --git a/evennia/server/portal/ttype.py b/evennia/server/portal/ttype.py
index 3102762edf..45a60d625b 100644
--- a/evennia/server/portal/ttype.py
+++ b/evennia/server/portal/ttype.py
@@ -113,6 +113,7 @@ class Ttype(object):
             # only support after a certain version, but all support
             # it since at least 4 years. We assume recent client here for now.
             cupper = clientname.upper()
+            xterm256 = False
             if cupper.startswith("MUDLET"):
                 # supports xterm256 stably since 1.1 (2010?)
                 xterm256 = cupper.split("MUDLET", 1)[1].strip() >= "1.1"

From 95b6df7591af35cfbdae4aee8662cdca19a55955 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 29 Jan 2018 20:22:35 +0100
Subject: [PATCH 112/217] Add xterm256 exception for tinyfugue

---
 evennia/server/portal/ttype.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/evennia/server/portal/ttype.py b/evennia/server/portal/ttype.py
index 45a60d625b..b07384ab26 100644
--- a/evennia/server/portal/ttype.py
+++ b/evennia/server/portal/ttype.py
@@ -131,7 +131,9 @@ class Ttype(object):
                            "MUSHCLIENT",    # > 4.02 (apr 2007)
                            "PUTTY",         # > 0.58 (apr 2005)
                            "BEIP",          # > 2.00.206 (late 2009) (BeipMu)
-                           "POTATO")):      # > 2.00 (maybe earlier)
+                           "POTATO",        # > 2.00 (maybe earlier)
+                           "TINYFUGUE"      # > 4.x (maybe earlier)
+                           )):
                     xterm256 = True
 
             # all clients supporting TTYPE at all seem to support ANSI

From 4181941806f0a683202c577b4886d72686a7e38a Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 29 Jan 2018 23:52:06 +0100
Subject: [PATCH 113/217] Slight rephrasing in the crypto install error message

---
 evennia/server/portal/ssh.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/server/portal/ssh.py b/evennia/server/portal/ssh.py
index 29bd3eac87..97d12ada7e 100644
--- a/evennia/server/portal/ssh.py
+++ b/evennia/server/portal/ssh.py
@@ -20,9 +20,9 @@ from twisted.conch.interfaces import IConchUser
 _SSH_IMPORT_ERROR = """
 ERROR: Missing crypto library for SSH. Install it with
 
-       pip install cryptography
+       pip install cryptography pyasn1
 
-(On older Twisted versions you may have to do 'pip install pycrypto pyasn1 instead).
+(On older Twisted versions you may have to do 'pip install pycrypto pyasn1' instead).
 
 If you get a compilation error you must install a C compiler and the
 SSL dev headers (On Debian-derived systems this is the gcc and libssl-dev

From 5aaa0fcfee6082a3a2259a6562c459c5f21fb591 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 30 Jan 2018 18:22:24 +0100
Subject: [PATCH 114/217] Make FORCEDENDLINE default for clients we don't know
 for sure don't want a cr+nl at the end of the telnet line

---
 evennia/server/portal/ttype.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/evennia/server/portal/ttype.py b/evennia/server/portal/ttype.py
index b07384ab26..d143b69747 100644
--- a/evennia/server/portal/ttype.py
+++ b/evennia/server/portal/ttype.py
@@ -100,10 +100,6 @@ class Ttype(object):
             # just start the request chain
             self.protocol.requestNegotiation(TTYPE, SEND)
 
-            # for clients that support TTYPE we assume this is not needed
-            # (they can set it manually if so)
-            self.protocol.protocol_flags["FORCEDENDLINE"] = False
-
         elif self.ttype_step == 1:
             # this is supposed to be the name of the client/terminal.
             # For clients not supporting the extended TTYPE
@@ -117,10 +113,10 @@ class Ttype(object):
             if cupper.startswith("MUDLET"):
                 # supports xterm256 stably since 1.1 (2010?)
                 xterm256 = cupper.split("MUDLET", 1)[1].strip() >= "1.1"
+                self.protocol.protocol_flags["FORCEDENDLINE"] = False
 
-            if cupper.startswith("TINYFUGUE"):
-                # tinyfugue expects _GA + endline
-                self.protocol.protocol_flags["FORCEDENDLINE"] = True
+            if cupper.startswith("TINTIN++"):
+                self.protocol.protocol_flags["FORCEDENDLINE"] = False
 
             if (cupper.startswith("XTERM") or
                 cupper.endswith("-256COLOR") or

From db5e97546a2834d87cc262fab94123ed9601bb11 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 1 Feb 2018 21:28:35 +0100
Subject: [PATCH 115/217] Not working. Tried a different query-setup
 unsuccessfully.

---
 evennia/typeclasses/managers.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py
index 990d7dabe6..ce84798dec 100644
--- a/evennia/typeclasses/managers.py
+++ b/evennia/typeclasses/managers.py
@@ -244,7 +244,6 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
 #            query.append(("db_tags__db_category", category.lower()))
 #        return self.filter(**dict(query))
 
-    @returns_typeclass_list
     def get_by_tag(self, key=None, category=None, tagtype=None):
         """
         Return objects having tags with a given key or category or combination of the two.
@@ -276,11 +275,13 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
         if n_keys > 1:
             if n_categories == 1:
                 category = categories[0]
-                query = Q(db_tags__db_tagtype=tagtype.lower() if tagtype else tagtype,
-                          db_tags__db_category=category.lower() if category else category,
-                          db_tags__db_model=dbmodel)
+                query = Q()
                 for key in keys:
-                    query = query & Q(db_tags__db_key=key.lower())
+                    query = query & \
+                        Q(db_tags__db_tagtype=tagtype.lower() if tagtype else tagtype,
+                          db_tags__db_category=category.lower() if category else category,
+                          db_tags__db_model=dbmodel,
+                          db_tags__db_key=key.lower())
                 print "Query:", query
             else:
                 query = Q(db_tags__db_tagtype=tagtype.lower(),

From 787f69ef85cac1c85ed4f917c3e781defc1ec917 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Feb 2018 01:17:52 +0100
Subject: [PATCH 116/217] Correct bugs in lock-handling, add more unit tests

---
 evennia/accounts/accounts.py |   2 +-
 evennia/locks/lockfuncs.py   | 113 ++++++++++++++---------
 evennia/locks/tests.py       | 168 +++++++++++++++++++++++++++++++----
 3 files changed, 226 insertions(+), 57 deletions(-)

diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py
index 626c4a60f3..c127e71494 100644
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@@ -619,7 +619,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
         self.basetype_setup()
         self.at_account_creation()
 
-        permissions = settings.PERMISSION_ACCOUNT_DEFAULT
+        permissions = [settings.PERMISSION_ACCOUNT_DEFAULT]
         if hasattr(self, "_createdict"):
             # this will only be set if the utils.create_account
             # function was used to create the object.
diff --git a/evennia/locks/lockfuncs.py b/evennia/locks/lockfuncs.py
index e30263adbf..27de4a59b3 100644
--- a/evennia/locks/lockfuncs.py
+++ b/evennia/locks/lockfuncs.py
@@ -89,10 +89,14 @@ DefaultLock:   Exits:          controls who may traverse the exit to
 """
 from __future__ import print_function
 
+from ast import literal_eval
 from django.conf import settings
 from evennia.utils import utils
 
 _PERMISSION_HIERARCHY = [pe.lower() for pe in settings.PERMISSION_HIERARCHY]
+# also accept different plural forms
+_PERMISSION_HIERARCHY_PLURAL = [pe + 's' if not pe.endswith('s') else pe
+                                for pe in _PERMISSION_HIERARCHY]
 
 
 def _to_account(accessing_obj):
@@ -158,49 +162,77 @@ def perm(accessing_obj, accessed_obj, *args, **kwargs):
 
     """
     # this allows the perm_above lockfunc to make use of this function too
-    gtmode = kwargs.pop("_greater_than", False)
-
     try:
         permission = args[0].lower()
-        perms_object = [p.lower() for p in accessing_obj.permissions.all()]
+        perms_object = accessing_obj.permissions.all()
     except (AttributeError, IndexError):
         return False
 
-    if utils.inherits_from(accessing_obj, "evennia.objects.objects.DefaultObject") and accessing_obj.account:
-        account = accessing_obj.account
-        # we strip eventual plural forms, so Builders == Builder
-        perms_account = [p.lower().rstrip("s") for p in account.permissions.all()]
+    gtmode = kwargs.pop("_greater_than", False)
+    is_quell = False
+
+    account = (utils.inherits_from(accessing_obj, "evennia.objects.objects.DefaultObject") and
+               accessing_obj.account)
+    # check object perms (note that accessing_obj could be an Account too)
+    perms_account = []
+    if account:
+        perms_account = account.permissions.all()
         is_quell = account.attributes.get("_quell")
 
-        if permission in _PERMISSION_HIERARCHY:
-            # check hierarchy without allowing escalation obj->account
-            hpos_target = _PERMISSION_HIERARCHY.index(permission)
-            hpos_account = [hpos for hpos, hperm in enumerate(_PERMISSION_HIERARCHY) if hperm in perms_account]
+    # Check hirarchy matches; handle both singular/plural forms in hierarchy
+    hpos_target = None
+    if permission in _PERMISSION_HIERARCHY:
+        hpos_target = _PERMISSION_HIERARCHY.index(permission)
+    if permission.endswith('s') and permission[:-1] in _PERMISSION_HIERARCHY:
+        hpos_target = _PERMISSION_HIERARCHY.index(permission[:-1])
+    if hpos_target is not None:
+        # hieratchy match
+        hpos_account = -1
+        hpos_object = -1
+
+        if account:
+            # we have an account puppeting this object. We must check what perms it has
+            perms_account_single = [p[:-1] if p.endswith('s') else p for p in perms_account]
+            hpos_account = [hpos for hpos, hperm in enumerate(_PERMISSION_HIERARCHY)
+                            if hperm in perms_account_single]
             hpos_account = hpos_account and hpos_account[-1] or -1
-            if is_quell:
-                hpos_object = [hpos for hpos, hperm in enumerate(_PERMISSION_HIERARCHY) if hperm in perms_object]
-                hpos_object = hpos_object and hpos_object[-1] or -1
-                if gtmode:
-                    return hpos_target < min(hpos_account, hpos_object)
-                else:
-                    return hpos_target <= min(hpos_account, hpos_object)
-            elif gtmode:
+
+        if not account or is_quell:
+            # only get the object-level perms if there is no account or quelling
+            perms_object_single = [p[:-1] if p.endswith('s') else p for p in perms_object]
+            hpos_object = [hpos for hpos, hperm in enumerate(_PERMISSION_HIERARCHY)
+                           if hperm in perms_object_single]
+            hpos_object = hpos_object and hpos_object[-1] or -1
+
+        if account and is_quell:
+            # quell mode: use smallest perm from account and object
+            if gtmode:
+                return hpos_target < min(hpos_account, hpos_object)
+            else:
+                return hpos_target <= min(hpos_account, hpos_object)
+        elif account:
+            # use account perm
+            if gtmode:
                 return hpos_target < hpos_account
             else:
                 return hpos_target <= hpos_account
-        elif not is_quell and permission in perms_account:
-            # if we get here, check account perms first, otherwise
-            # continue as normal
+        else:
+            # use object perm
+            if gtmode:
+                return hpos_target < hpos_object
+            else:
+                return hpos_target <= hpos_object
+    else:
+        # no hierarchy match - check direct matches
+        if account:
+            # account exists, check it first unless quelled
+            if is_quell and permission in perms_object:
+                return True
+            elif permission in perms_account:
+                return True
+        elif permission in perms_object:
             return True
 
-    if permission in perms_object:
-        # simplest case - we have direct match
-        return True
-    if permission in _PERMISSION_HIERARCHY:
-        # check if we have a higher hierarchy position
-        hpos_target = _PERMISSION_HIERARCHY.index(permission)
-        return any(1 for hpos, hperm in enumerate(_PERMISSION_HIERARCHY)
-                   if hperm in perms_object and hpos_target < hpos)
     return False
 
 
@@ -229,7 +261,6 @@ def pperm(accessing_obj, accessed_obj, *args, **kwargs):
     """
     return perm(_to_account(accessing_obj), accessed_obj, *args, **kwargs)
 
-
 def pperm_above(accessing_obj, accessed_obj, *args, **kwargs):
     """
     Only allow Account objects with a permission *higher* in the permission
@@ -482,7 +513,7 @@ def tag(accessing_obj, accessed_obj, *args, **kwargs):
         accessing_obj = accessing_obj.obj
     tagkey = args[0] if args else None
     category = args[1] if len(args) > 1 else None
-    return accessing_obj.tags.get(tagkey, category=category)
+    return bool(accessing_obj.tags.get(tagkey, category=category))
 
 
 def objtag(accessing_obj, accessed_obj, *args, **kwargs):
@@ -494,7 +525,7 @@ def objtag(accessing_obj, accessed_obj, *args, **kwargs):
     Only true if accessed_obj has the specified tag and optional
     category.
     """
-    return accessed_obj.tags.get(*args)
+    return bool(accessed_obj.tags.get(*args))
 
 
 def inside(accessing_obj, accessed_obj, *args, **kwargs):
@@ -592,7 +623,9 @@ def serversetting(accessing_obj, accessed_obj, *args, **kwargs):
       serversetting(IRC_ENABLED)
       serversetting(BASE_SCRIPT_PATH, ['types'])
 
-    A given True/False or integers will be converted properly.
+    A given True/False or integers will be converted properly. Note that
+    everything will enter this function as strings, so they have to be
+    unpacked to their real value. We only support basic properties.
     """
     if not args or not args[0]:
         return False
@@ -602,12 +635,12 @@ def serversetting(accessing_obj, accessed_obj, *args, **kwargs):
     else:
         setting, val = args[0], args[1]
     # convert
-    if val == 'True':
-        val = True
-    elif val == 'False':
-        val = False
-    elif val.isdigit():
-        val = int(val)
+    try:
+        val = literal_eval(val)
+    except Exception:
+        # we swallow errors here, lockfuncs has noone to report to
+        return False
+
     if setting in settings._wrapped.__dict__:
         return settings._wrapped.__dict__[setting] == val
     return False
diff --git a/evennia/locks/tests.py b/evennia/locks/tests.py
index 0c47456ede..6e7e1a48e6 100644
--- a/evennia/locks/tests.py
+++ b/evennia/locks/tests.py
@@ -11,10 +11,11 @@ from evennia.utils.test_resources import EvenniaTest
 
 try:
     # this is a special optimized Django version, only available in current Django devel
-    from django.utils.unittest import TestCase
+    from django.utils.unittest import TestCase, override_settings
 except ImportError:
-    from django.test import TestCase
+    from django.test import TestCase, override_settings
 
+from evennia import settings_default
 from evennia.locks import lockfuncs
 
 # ------------------------------------------------------------
@@ -25,7 +26,8 @@ from evennia.locks import lockfuncs
 class TestLockCheck(EvenniaTest):
     def testrun(self):
         dbref = self.obj2.dbref
-        self.obj1.locks.add("owner:dbref(%s);edit:dbref(%s) or perm(Admin);examine:perm(Builder) and id(%s);delete:perm(Admin);get:all()" % (dbref, dbref, dbref))
+        self.obj1.locks.add("owner:dbref(%s);edit:dbref(%s) or perm(Admin);examine:perm(Builder) "
+                            "and id(%s);delete:perm(Admin);get:all()" % (dbref, dbref, dbref))
         self.obj2.permissions.add('Admin')
         self.assertEquals(True, self.obj1.locks.check(self.obj2, 'owner'))
         self.assertEquals(True, self.obj1.locks.check(self.obj2, 'edit'))
@@ -36,20 +38,154 @@ class TestLockCheck(EvenniaTest):
         self.assertEquals(False, self.obj1.locks.check(self.obj2, 'get'))
         self.assertEquals(True, self.obj1.locks.check(self.obj2, 'not_exist', default=True))
 
-
 class TestLockfuncs(EvenniaTest):
-    def testrun(self):
+    def setUp(self):
+        super(TestLockfuncs, self).setUp()
+        self.account2.permissions.add('Admin')
+        self.char2.permissions.add('Builder')
+
+    def test_booleans(self):
+        self.assertEquals(True, lockfuncs.true(self.account2, self.obj1))
+        self.assertEquals(True, lockfuncs.all(self.account2, self.obj1))
+        self.assertEquals(False, lockfuncs.false(self.account2, self.obj1))
+        self.assertEquals(False, lockfuncs.none(self.account2, self.obj1))
+        self.assertEquals(True, lockfuncs.self(self.obj1, self.obj1))
+        self.assertEquals(True, lockfuncs.self(self.account, self.account))
+        self.assertEquals(False, lockfuncs.superuser(self.account, None))
+
+    @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
+    def test_account_perm(self):
+        self.assertEquals(False, lockfuncs.perm(self.account2, None, 'foo'))
+        self.assertEquals(False, lockfuncs.perm(self.account2, None, 'Developer'))
+        self.assertEquals(False, lockfuncs.perm(self.account2, None, 'Developers'))
+        self.assertEquals(True, lockfuncs.perm(self.account2, None, 'Admin'))
+        self.assertEquals(True, lockfuncs.perm(self.account2, None, 'Admins'))
+        self.assertEquals(True, lockfuncs.perm(self.account2, None, 'Player'))
+        self.assertEquals(True, lockfuncs.perm(self.account2, None, 'Players'))
+        self.assertEquals(True, lockfuncs.perm(self.account2, None, 'Builder'))
+        self.assertEquals(True, lockfuncs.perm(self.account2, None, 'Builders'))
+        self.assertEquals(True, lockfuncs.perm_above(self.account2, None, 'Builder'))
+
+    @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
+    def test_puppet_perm(self):
+        self.assertEquals(False, lockfuncs.perm(self.char2, None, 'foo'))
+        self.assertEquals(False, lockfuncs.perm(self.char2, None, 'Developer'))
+        self.assertEquals(False, lockfuncs.perm(self.char2, None, 'Develoeprs'))
+        self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Admin'))
+        self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Admins'))
+        self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Player'))
+        self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Players'))
+        self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Builder'))
+        self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Builders'))
+
+    @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
+    def test_account_perm_above(self):
+        self.assertEquals(True, lockfuncs.perm_above(self.char2, None, 'Builder'))
+        self.assertEquals(True, lockfuncs.perm_above(self.char2, None, 'Builders'))
+        self.assertEquals(True, lockfuncs.perm_above(self.char2, None, 'Player'))
+        self.assertEquals(False, lockfuncs.perm_above(self.char2, None, 'Admin'))
+        self.assertEquals(False, lockfuncs.perm_above(self.char2, None, 'Admins'))
+        self.assertEquals(False, lockfuncs.perm_above(self.char2, None, 'Developers'))
+
+    @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
+    def test_quell_perm(self):
+        self.account2.db._quell = True
+        self.assertEquals(False, lockfuncs.false(self.char2, None))
+        self.assertEquals(False, lockfuncs.perm(self.char2, None, 'Developer'))
+        self.assertEquals(False, lockfuncs.perm(self.char2, None, 'Developers'))
+        self.assertEquals(False, lockfuncs.perm(self.char2, None, 'Admin'))
+        self.assertEquals(False, lockfuncs.perm(self.char2, None, 'Admins'))
+        self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Player'))
+        self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Players'))
+        self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Builder'))
+        self.assertEquals(True, lockfuncs.perm(self.char2, None, 'Builders'))
+
+    @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
+    def test_quell_above_perm(self):
+        self.assertEquals(True, lockfuncs.perm_above(self.char2, None, 'Player'))
+        self.assertEquals(True, lockfuncs.perm_above(self.char2, None, 'Builder'))
+
+    @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
+    def test_object_perm(self):
         self.obj2.permissions.add('Admin')
-        self.assertEquals(True, lockfuncs.true(self.obj2, self.obj1))
-        self.assertEquals(False, lockfuncs.false(self.obj2, self.obj1))
-        self.assertEquals(True, lockfuncs.perm(self.obj2, self.obj1, 'Admin'))
-        self.assertEquals(True, lockfuncs.perm_above(self.obj2, self.obj1, 'Builder'))
+        self.assertEquals(False, lockfuncs.perm(self.obj2, None, 'Developer'))
+        self.assertEquals(False, lockfuncs.perm(self.obj2, None, 'Developers'))
+        self.assertEquals(True, lockfuncs.perm(self.obj2, None, 'Admin'))
+        self.assertEquals(True, lockfuncs.perm(self.obj2, None, 'Admins'))
+        self.assertEquals(True, lockfuncs.perm(self.obj2, None, 'Player'))
+        self.assertEquals(True, lockfuncs.perm(self.obj2, None, 'Players'))
+        self.assertEquals(True, lockfuncs.perm(self.obj2, None, 'Builder'))
+        self.assertEquals(True, lockfuncs.perm(self.obj2, None, 'Builders'))
+
+    @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
+    def test_object_above_perm(self):
+        self.obj2.permissions.add('Admin')
+        self.assertEquals(False, lockfuncs.perm_above(self.obj2, None, 'Admins'))
+        self.assertEquals(True, lockfuncs.perm_above(self.obj2, None, 'Builder'))
+        self.assertEquals(True, lockfuncs.perm_above(self.obj2, None, 'Builders'))
+
+    @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
+    def test_pperm(self):
+        self.obj2.permissions.add('Developer')
+        self.char2.permissions.add('Developer')
+        self.assertEquals(False, lockfuncs.pperm(self.obj2, None, 'Players'))
+        self.assertEquals(True, lockfuncs.pperm(self.char2, None, 'Players'))
+        self.assertEquals(True, lockfuncs.pperm(self.account, None, 'Admins'))
+        self.assertEquals(True, lockfuncs.pperm_above(self.account, None, 'Builders'))
+        self.assertEquals(False, lockfuncs.pperm_above(self.account2, None, 'Admins'))
+        self.assertEquals(True, lockfuncs.pperm_above(self.char2, None, 'Players'))
+
+    def test_dbref(self):
         dbref = self.obj2.dbref
-        self.assertEquals(True, lockfuncs.dbref(self.obj2, self.obj1, '%s' % dbref))
+        self.assertEquals(True, lockfuncs.dbref(self.obj2, None, '%s' % dbref))
+        self.assertEquals(False, lockfuncs.id(self.obj2, None, '%s' % (dbref + '1')))
+        dbref = self.account2.dbref
+        self.assertEquals(True, lockfuncs.pdbref(self.account2, None, '%s' % dbref))
+        self.assertEquals(False, lockfuncs.pid(self.account2, None, '%s' % (dbref + '1')))
+
+    def test_attr(self):
         self.obj2.db.testattr = 45
-        self.assertEquals(True, lockfuncs.attr(self.obj2, self.obj1, 'testattr', '45'))
-        self.assertEquals(False, lockfuncs.attr_gt(self.obj2, self.obj1, 'testattr', '45'))
-        self.assertEquals(True, lockfuncs.attr_ge(self.obj2, self.obj1, 'testattr', '45'))
-        self.assertEquals(False, lockfuncs.attr_lt(self.obj2, self.obj1, 'testattr', '45'))
-        self.assertEquals(True, lockfuncs.attr_le(self.obj2, self.obj1, 'testattr', '45'))
-        self.assertEquals(False, lockfuncs.attr_ne(self.obj2, self.obj1, 'testattr', '45'))
+        self.assertEquals(True, lockfuncs.attr(self.obj2, None, 'testattr', '45'))
+        self.assertEquals(False, lockfuncs.attr_gt(self.obj2, None, 'testattr', '45'))
+        self.assertEquals(True, lockfuncs.attr_ge(self.obj2, None, 'testattr', '45'))
+        self.assertEquals(False, lockfuncs.attr_lt(self.obj2, None, 'testattr', '45'))
+        self.assertEquals(True, lockfuncs.attr_le(self.obj2, None, 'testattr', '45'))
+
+        self.assertEquals(True, lockfuncs.objattr(None, self.obj2, 'testattr', '45'))
+        self.assertEquals(True, lockfuncs.objattr(None, self.obj2, 'testattr', '45'))
+        self.assertEquals(False, lockfuncs.objattr(None, self.obj2, 'testattr', '45', compare='lt'))
+
+    def test_locattr(self):
+        self.obj2.location.db.locattr = 'test'
+        self.assertEquals(True, lockfuncs.locattr(self.obj2, None, 'locattr', 'test'))
+        self.assertEquals(False, lockfuncs.locattr(self.obj2, None, 'fail', 'testfail'))
+        self.assertEquals(True, lockfuncs.objlocattr(None, self.obj2, 'locattr', 'test'))
+
+    def test_tag(self):
+        self.obj2.tags.add("test1")
+        self.obj2.tags.add("test2", "category1")
+        self.assertEquals(True, lockfuncs.tag(self.obj2, None, 'test1'))
+        self.assertEquals(True, lockfuncs.tag(self.obj2, None, 'test2', 'category1'))
+        self.assertEquals(False, lockfuncs.tag(self.obj2, None, 'test1', 'category1'))
+        self.assertEquals(False, lockfuncs.tag(self.obj2, None, 'test1', 'category2'))
+        self.assertEquals(True, lockfuncs.objtag(None, self.obj2, 'test2', 'category1'))
+        self.assertEquals(False, lockfuncs.objtag(None, self.obj2, 'test2'))
+
+    def test_inside_holds(self):
+        self.assertEquals(True, lockfuncs.inside(self.char1, self.room1))
+        self.assertEquals(False, lockfuncs.inside(self.char1, self.room2))
+        self.assertEquals(True, lockfuncs.holds(self.room1, self.char1))
+        self.assertEquals(False, lockfuncs.holds(self.room2, self.char1))
+
+    def test_has_account(self):
+        self.assertEquals(True, lockfuncs.has_account(self.char1, None))
+        self.assertEquals(False, lockfuncs.has_account(self.obj1, None))
+
+    @override_settings(IRC_ENABLED=True, TESTVAL=[1, 2, 3])
+    def test_serversetting(self):
+        # import pudb
+        # pudb.set_trace()
+        self.assertEquals(True, lockfuncs.serversetting(None, None, 'IRC_ENABLED', 'True'))
+        self.assertEquals(True, lockfuncs.serversetting(None, None, 'TESTVAL', '[1, 2, 3]'))
+        self.assertEquals(False, lockfuncs.serversetting(None, None, 'TESTVAL', '[1, 2, 4]'))
+        self.assertEquals(False, lockfuncs.serversetting(None, None, 'TESTVAL', '123'))

From 78ce03a486a45712e451829b04940d001ec4350d Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Feb 2018 11:13:01 +0100
Subject: [PATCH 117/217] The at_say hook didn't forward the from_obj keyword
 to msg().

---
 evennia/objects/objects.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 1509e7ce08..0d5f85b695 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -1645,7 +1645,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
                                 for recv in receivers) if receivers else None,
                             "speech": message}
             self_mapping.update(custom_mapping)
-            self.msg(text=(msg_self.format(**self_mapping), {"type": msg_type}))
+            self.msg(text=(msg_self.format(**self_mapping), {"type": msg_type}), from_obj=self)
 
         if receivers and msg_receivers:
             receiver_mapping = {"self": "You",
@@ -1663,7 +1663,8 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
                                             for recv in receivers) if receivers else None}
                 receiver_mapping.update(individual_mapping)
                 receiver_mapping.update(custom_mapping)
-                receiver.msg(text=(msg_receivers.format(**receiver_mapping), {"type": msg_type}))
+                receiver.msg(text=(msg_receivers.format(**receiver_mapping),
+                             {"type": msg_type}), from_obj=self)
 
         if self.location and msg_location:
             location_mapping = {"self": "You",

From d4d48414938a30f726488dd311cfecb7e92282ac Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Feb 2018 14:51:49 +0100
Subject: [PATCH 118/217] Update lock docstring. Closes #1563.

---
 evennia/commands/default/building.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index 78aa7d7553..ebd8f66871 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -1807,13 +1807,13 @@ class CmdLock(ObjManipCommand):
 
     For example:
        'get: id(25) or perm(Admin)'
-    The 'get' access_type is checked by the get command and will
-    an object locked with this string will only be possible to
-    pick up by Admins or by object with id=25.
+    The 'get' lock access_type is checked e.g. by the 'get' command.
+    An object locked with this example lock will only be possible to pick up
+    by Admins or by an object with id=25.
 
     You can add several access_types after one another by separating
     them by ';', i.e:
-       'get:id(25);delete:perm(Builder)'
+       'get:id(25); delete:perm(Builder)'
     """
     key = "@lock"
     aliases = ["@locks"]

From 0f6cec5d9b3d1f11e7b38f29806073f75636598f Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Feb 2018 16:34:12 +0100
Subject: [PATCH 119/217] Start setting up unittests for typeclass tests

---
 evennia/typeclasses/tests.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 evennia/typeclasses/tests.py

diff --git a/evennia/typeclasses/tests.py b/evennia/typeclasses/tests.py
new file mode 100644
index 0000000000..0885c35d40
--- /dev/null
+++ b/evennia/typeclasses/tests.py
@@ -0,0 +1,21 @@
+"""
+Unit tests for typeclass base system
+
+"""
+
+from evennia.utils.test_resources import EvenniaTest
+
+# ------------------------------------------------------------
+# Manager tests
+# ------------------------------------------------------------
+
+
+class TestTypedObjectManager(EvenniaTest):
+    def _manager(self, methodname, *args, **kwargs):
+        return getattr(self.obj1.__class__.objects, methodname)(*args, **kwargs)
+
+    def test_get_by_tag_no_category(self):
+        self.obj1.tags.add("tag1")
+        self.obj2.tags.add("tag2")
+        self.obj2.tags.add("tag3")
+        self.assertEquals(list(self._manager("get_by_tag", "tag1")), [self.obj1l])

From 7bd8fe0a34898c38dac062aef3bb22ecdc96317d Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Feb 2018 19:42:24 +0100
Subject: [PATCH 120/217] get_by_tag manager can now query for multiple
 tag/category combinations

---
 evennia/typeclasses/managers.py | 80 ++++++++++++---------------------
 evennia/typeclasses/tests.py    | 44 ++++++++++++++++--
 2 files changed, 69 insertions(+), 55 deletions(-)

diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py
index ce84798dec..67eb9e065b 100644
--- a/evennia/typeclasses/managers.py
+++ b/evennia/typeclasses/managers.py
@@ -221,29 +221,6 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
         """
         return self.get_tag(key=key, category=category, obj=obj, tagtype="alias")
 
-#    @returns_typeclass_list
-#    def get_by_tag(self, key=None, category=None, tagtype=None):
-#        """
-#        Return objects having tags with a given key or category or
-#        combination of the two.
-#
-#        Args:
-#            key (str, optional): Tag key. Not case sensitive.
-#            category (str, optional): Tag category. Not case sensitive.
-#            tagtype (str or None, optional): 'type' of Tag, by default
-#                this is either `None` (a normal Tag), `alias` or
-#                `permission`.
-#        Returns:
-#            objects (list): Objects with matching tag.
-#        """
-#        dbmodel = self.model.__dbclass__.__name__.lower()
-#        query = [("db_tags__db_tagtype", tagtype), ("db_tags__db_model", dbmodel)]
-#        if key:
-#            query.append(("db_tags__db_key", key.lower()))
-#        if category:
-#            query.append(("db_tags__db_category", category.lower()))
-#        return self.filter(**dict(query))
-
     def get_by_tag(self, key=None, category=None, tagtype=None):
         """
         Return objects having tags with a given key or category or combination of the two.
@@ -253,7 +230,8 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
             key (str or list, optional): Tag key or list of keys. Not case sensitive.
             category (str or list, optional): Tag category. Not case sensitive. If `key` is
                 a list, a single category can either apply to all keys in that list or this
-                must be a list matching the `key` list element by element.
+                must be a list matching the `key` list element by element. If no `key` is given,
+                all objects with tags of this category are returned.
             tagtype (str, optional): 'type' of Tag, by default
                 this is either `None` (a normal Tag), `alias` or
                 `permission`. This always apply to all queried tags.
@@ -266,39 +244,37 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
                 than `key`.
 
         """
-        keys = make_iter(key)
-        categories = make_iter(category)
+        if not (key or category):
+            return []
+
+        keys = make_iter(key) if key else []
+        categories = make_iter(category) if category else []
         n_keys = len(keys)
         n_categories = len(categories)
 
         dbmodel = self.model.__dbclass__.__name__.lower()
-        if n_keys > 1:
-            if n_categories == 1:
-                category = categories[0]
-                query = Q()
-                for key in keys:
-                    query = query & \
-                        Q(db_tags__db_tagtype=tagtype.lower() if tagtype else tagtype,
-                          db_tags__db_category=category.lower() if category else category,
-                          db_tags__db_model=dbmodel,
-                          db_tags__db_key=key.lower())
-                print "Query:", query
-            else:
-                query = Q(db_tags__db_tagtype=tagtype.lower(),
-                          db_tags__db_model=dbmodel)
-                for ikey, key in keys:
-                    category = categories[ikey]
-                    category = category.lower() if category else category
-                    query = query & Q(db_tags__db_key=key.lower(),
-                                      db_tags__db_category=category)
-            return self.filter(query)
+        query = self.filter(db_tags__db_tagtype__iexact=tagtype,
+                            db_tags__db_model__iexact=dbmodel).distinct()
+
+        if n_keys > 0:
+            # keys and/or categories given
+            if n_categories == 0:
+                categories = [None for _ in range(n_keys)]
+            elif n_categories == 1 and n_keys > 1:
+                cat = categories[0]
+                categories = [cat for _ in range(n_keys)]
+            elif 1 < n_categories < n_keys:
+                raise IndexError("get_by_tag needs a single category or a list of categories "
+                                 "the same length as the list of tags.")
+            for ikey, key in enumerate(keys):
+                query = query.filter(db_tags__db_key__iexact=key,
+                                     db_tags__db_category__iexact=categories[ikey])
         else:
-            query = [("db_tags__db_tagtype", tagtype), ("db_tags__db_model", dbmodel)]
-            if key:
-                query.append(("db_tags__db_key", keys[0].lower()))
-            if category:
-                query.append(("db_tags__db_category", categories[0].lower()))
-            return self.filter(**dict(query))
+            # only one or more categories given
+            for category in categories:
+                query = query.filter(db_tags__db_category__iexact=category)
+
+        return query
 
     def get_by_permission(self, key=None, category=None):
         """
diff --git a/evennia/typeclasses/tests.py b/evennia/typeclasses/tests.py
index 0885c35d40..b4a2361aae 100644
--- a/evennia/typeclasses/tests.py
+++ b/evennia/typeclasses/tests.py
@@ -12,10 +12,48 @@ from evennia.utils.test_resources import EvenniaTest
 
 class TestTypedObjectManager(EvenniaTest):
     def _manager(self, methodname, *args, **kwargs):
-        return getattr(self.obj1.__class__.objects, methodname)(*args, **kwargs)
+        return list(getattr(self.obj1.__class__.objects, methodname)(*args, **kwargs))
 
     def test_get_by_tag_no_category(self):
         self.obj1.tags.add("tag1")
+        self.obj1.tags.add("tag2")
+        self.obj1.tags.add("tag2c")
         self.obj2.tags.add("tag2")
-        self.obj2.tags.add("tag3")
-        self.assertEquals(list(self._manager("get_by_tag", "tag1")), [self.obj1l])
+        self.obj2.tags.add("tag2a")
+        self.obj2.tags.add("tag2b")
+        self.obj2.tags.add("tag3 with spaces")
+        self.obj2.tags.add("tag4")
+        self.obj2.tags.add("tag2c")
+        self.assertEquals(self._manager("get_by_tag", "tag1"), [self.obj1])
+        self.assertEquals(self._manager("get_by_tag", "tag2"), [self.obj1, self.obj2])
+        self.assertEquals(self._manager("get_by_tag", "tag2a"), [self.obj2])
+        self.assertEquals(self._manager("get_by_tag", "tag3 with spaces"), [self.obj2])
+        self.assertEquals(self._manager("get_by_tag", ["tag2a", "tag2b"]), [self.obj2])
+        self.assertEquals(self._manager("get_by_tag", ["tag2a", "tag1"]), [])
+        self.assertEquals(self._manager("get_by_tag", ["tag2a", "tag4", "tag2c"]), [self.obj2])
+
+    def test_get_by_tag_and_category(self):
+        self.obj1.tags.add("tag5", "category1")
+        self.obj1.tags.add("tag6", )
+        self.obj1.tags.add("tag7", "category1")
+        self.obj1.tags.add("tag6", "category3")
+        self.obj1.tags.add("tag7", "category4")
+        self.obj2.tags.add("tag5", "category1")
+        self.obj2.tags.add("tag5", "category2")
+        self.obj2.tags.add("tag6", "category3")
+        self.obj2.tags.add("tag7", "category1")
+        self.obj2.tags.add("tag7", "category5")
+        self.assertEquals(self._manager("get_by_tag", "tag5", "category1"), [self.obj1, self.obj2])
+        self.assertEquals(self._manager("get_by_tag", "tag6", "category1"), [])
+        self.assertEquals(self._manager("get_by_tag", "tag6", "category3"), [self.obj1, self.obj2])
+        self.assertEquals(self._manager("get_by_tag", ["tag5", "tag6"],
+                                        ["category1", "category3"]), [self.obj1, self.obj2])
+        self.assertEquals(self._manager("get_by_tag", ["tag5", "tag7"],
+                                        "category1"), [self.obj1, self.obj2])
+        self.assertEquals(self._manager("get_by_tag", category="category1"), [self.obj1, self.obj2])
+        self.assertEquals(self._manager("get_by_tag", category="category2"), [self.obj2])
+        self.assertEquals(self._manager("get_by_tag", category=["category1", "category3"]),
+                          [self.obj1, self.obj2])
+        self.assertEquals(self._manager("get_by_tag", category=["category1", "category2"]),
+                          [self.obj2])
+        self.assertEquals(self._manager("get_by_tag", category=["category5", "category4"]), [])

From 28b2ddcdb6193f574017a1b91f0b237cb43591c5 Mon Sep 17 00:00:00 2001
From: arumford <arumford@learfield.com>
Date: Wed, 7 Feb 2018 14:22:38 -0600
Subject: [PATCH 121/217] typo in docstring.

---
 evennia/comms/channelhandler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/comms/channelhandler.py b/evennia/comms/channelhandler.py
index 02c9e19291..058b7d9ba4 100644
--- a/evennia/comms/channelhandler.py
+++ b/evennia/comms/channelhandler.py
@@ -159,7 +159,7 @@ class ChannelHandler(object):
     """
     The ChannelHandler manages all active in-game channels and
     dynamically creates channel commands for users so that they can
-    just give the channek's key or alias to write to it. Whenever a
+    just give the channel's key or alias to write to it. Whenever a
     new channel is created in the database, the update() method on
     this handler must be called to sync it with the database (this is
     done automatically if creating the channel with

From 8a1fdb834b6be88e507a0d90f5cc5216590e35ff Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 8 Feb 2018 20:35:00 +0100
Subject: [PATCH 122/217] Be more lenient with iterables sent to msg(text=..)

This will enforce that the text argument must either
be a string or a tuple.
---
 evennia/accounts/accounts.py |  9 ++++++++-
 evennia/objects/objects.py   | 10 +++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py
index c127e71494..b90b5ac8ab 100644
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@@ -21,7 +21,7 @@ from evennia.objects.models import ObjectDB
 from evennia.comms.models import ChannelDB
 from evennia.commands import cmdhandler
 from evennia.utils import logger
-from evennia.utils.utils import (lazy_property,
+from evennia.utils.utils import (lazy_property, to_str,
                                  make_iter, to_unicode, is_iter,
                                  variable_from_module)
 from evennia.typeclasses.attributes import NickHandler
@@ -421,6 +421,13 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
 
         kwargs["options"] = options
 
+        if text and not (isinstance(text, basestring) or isinstance(text, tuple)):
+            # sanitize text before sending across the wire
+            try:
+                text = to_str(text, force_string=True)
+            except Exception:
+                text = repr(text)
+
         # session relay
         sessions = make_iter(session) if session else self.sessions.all()
         for session in sessions:
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 0d5f85b695..5531b7f856 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -22,7 +22,7 @@ from evennia.commands import cmdhandler
 from evennia.utils import search
 from evennia.utils import logger
 from evennia.utils.utils import (variable_from_module, lazy_property,
-                                 make_iter, to_unicode, is_iter)
+                                 make_iter, to_unicode, is_iter, to_str)
 from django.utils.translation import ugettext as _
 
 _MULTISESSION_MODE = settings.MULTISESSION_MODE
@@ -528,11 +528,19 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
 
         kwargs["options"] = options
 
+        if text and not (isinstance(text, basestring) or isinstance(text, tuple)):
+            # sanitize text before sending across the wire
+            try:
+                text = to_str(text, force_string=True)
+            except Exception:
+                text = repr(text)
+
         # relay to session(s)
         sessions = make_iter(session) if session else self.sessions.all()
         for session in sessions:
             session.data_out(text=text, **kwargs)
 
+
     def for_contents(self, func, exclude=None, **kwargs):
         """
         Runs a function on every object contained within this one.

From 9eacd7a81bb65ce355e1a3cc26baffc2472438ac Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 8 Feb 2018 21:08:19 +0100
Subject: [PATCH 123/217] Start better handle a missing uid with auto-login
 (still issues)

---
 evennia/web/webclient/views.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/evennia/web/webclient/views.py b/evennia/web/webclient/views.py
index 94ecffb0e2..439dd44ad2 100644
--- a/evennia/web/webclient/views.py
+++ b/evennia/web/webclient/views.py
@@ -34,7 +34,13 @@ def _shared_login(request):
     if webclient_uid:
         # The webclient has previously registered a login to this browser_session
         if not account.is_authenticated() and not website_uid:
-            account = AccountDB.objects.get(id=webclient_uid)
+            try:
+                account = AccountDB.objects.get(id=webclient_uid)
+            except AccountDB.DoesNotExist:
+                # this can happen e.g. for guest accounts or deletions
+                csession["website_authenticated_uid"] = False
+                csession["webclient_authenticated_uid"] = False
+                return
             try:
                 # calls our custom authenticate in web/utils/backends.py
                 account = authenticate(autologin=account)

From ea1d21cd41aeaffefc9586b5442cd50cbe341ef6 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 8 Feb 2018 22:46:14 +0100
Subject: [PATCH 124/217] Add DefaultChannel.basetype_setup and add default
 locks, empty at_channel_creation to avoid having to use super()

---
 evennia/comms/comms.py  | 16 +++++++++++-----
 evennia/comms/models.py |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/evennia/comms/comms.py b/evennia/comms/comms.py
index e40de664d1..7ff62dfc27 100644
--- a/evennia/comms/comms.py
+++ b/evennia/comms/comms.py
@@ -26,6 +26,7 @@ class DefaultChannel(with_metaclass(TypeclassBase, ChannelDB)):
         the hooks called by this method.
 
         """
+        self.basetype_setup()
         self.at_channel_creation()
         self.attributes.add("log_file", "channel_%s.log" % self.key)
         if hasattr(self, "_createdict"):
@@ -46,11 +47,7 @@ class DefaultChannel(with_metaclass(TypeclassBase, ChannelDB)):
             if cdict.get("desc"):
                 self.attributes.add("desc", cdict["desc"])
 
-    def at_channel_creation(self):
-        """
-        Called once, when the channel is first created.
-
-        """
+    def basetype_setup(self):
         # delayed import of the channelhandler
         global _CHANNEL_HANDLER
         if not _CHANNEL_HANDLER:
@@ -58,6 +55,15 @@ class DefaultChannel(with_metaclass(TypeclassBase, ChannelDB)):
         # register ourselves with the channelhandler.
         _CHANNEL_HANDLER.add(self)
 
+        self.locks.add("send:all();listen:all();control:perm(Admin)")
+
+    def at_channel_creation(self):
+        """
+        Called once, when the channel is first created.
+
+        """
+        pass
+
     # helper methods, for easy overloading
 
     def has_connection(self, subscriber):
diff --git a/evennia/comms/models.py b/evennia/comms/models.py
index b1a5a37ed9..c456a6e72c 100644
--- a/evennia/comms/models.py
+++ b/evennia/comms/models.py
@@ -527,6 +527,7 @@ class SubscriptionHandler(object):
         for subscriber in make_iter(entity):
             if subscriber:
                 clsname = subscriber.__dbclass__.__name__
+                print("subscriber:", subscriber, clsname)
                 # chooses the right type
                 if clsname == "ObjectDB":
                     self.obj.db_object_subscriptions.add(subscriber)

From a00e6071915a1d4a5896468ef7ecdb415b4619b6 Mon Sep 17 00:00:00 2001
From: Nicholas Matlaga <nmatlaga@outlawtack.com>
Date: Tue, 13 Feb 2018 12:49:55 -0500
Subject: [PATCH 125/217] Change if statement to better handle objects; move
 options dict before at_msg_receive call to allow channels to be known in hook

---
 evennia/comms/models.py    | 4 +---
 evennia/objects/objects.py | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/evennia/comms/models.py b/evennia/comms/models.py
index b1a5a37ed9..c358cf352b 100644
--- a/evennia/comms/models.py
+++ b/evennia/comms/models.py
@@ -584,9 +584,7 @@ class SubscriptionHandler(object):
         for obj in self.all():
             from django.core.exceptions import ObjectDoesNotExist
             try:
-                if hasattr(obj, 'account'):
-                    if not obj.account:
-                        continue
+                if hasattr(obj, 'account') and obj.account:
                     obj = obj.account
                 if not obj.is_connected:
                     continue
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 5531b7f856..b55cd0962f 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -519,6 +519,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
                     obj.at_msg_send(text=text, to_obj=self, **kwargs)
                 except Exception:
                     logger.log_trace()
+        kwargs["options"] = options
         try:
             if not self.at_msg_receive(text=text, **kwargs):
                 # if at_msg_receive returns false, we abort message to this object
@@ -526,7 +527,6 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
         except Exception:
             logger.log_trace()
 
-        kwargs["options"] = options
 
         if text and not (isinstance(text, basestring) or isinstance(text, tuple)):
             # sanitize text before sending across the wire

From 2f158909967957d76a84eec4e38a2a88344b61f8 Mon Sep 17 00:00:00 2001
From: Nicholas Matlaga <nmatlaga@outlawtack.com>
Date: Tue, 13 Feb 2018 12:54:03 -0500
Subject: [PATCH 126/217] add in is_connected property to base objects

---
 evennia/objects/objects.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index b55cd0962f..d4ce390977 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -206,6 +206,14 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
     def sessions(self):
         return ObjectSessionHandler(self)
 
+    @property
+    def is_connected(self):
+        # we get an error for objects subscribed to channels without this
+        if self.account: # seems sane to pass on the account
+            return self.account.is_connected
+        else:
+            return False
+
     @property
     def has_account(self):
         """

From b8c2059f79af00d0f3de5317b86370c9b000055b Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Thu, 15 Feb 2018 17:25:01 -0500
Subject: [PATCH 127/217] Add loc switch to CmdFind and docstring

---
 evennia/commands/default/building.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index de263fa4ff..ee0062e96b 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -2238,12 +2238,14 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
 
     Usage:
       @find[/switches] <name or dbref or *account> [= dbrefmin[-dbrefmax]]
+      @locate - this is a shorthand for using the /loc switch.
 
     Switches:
       room - only look for rooms (location=None)
       exit - only look for exits (destination!=None)
       char - only look for characters (BASE_CHARACTER_TYPECLASS)
       exact- only exact matches are returned.
+      loc  - display object location if exists and match has one result
 
     Searches the database for an object of a particular name or exact #dbref.
     Use *accountname to search for an account. The switches allows for
@@ -2266,6 +2268,9 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
             caller.msg("Usage: @find <string> [= low [-high]]")
             return
 
+        if "locate" in self.cmdstring:  # Use option /loc as a default for @locate command alias
+            switches.append('loc')
+
         searchstring = self.lhs
         low, high = 1, ObjectDB.objects.all().order_by("-id")[0].id
         if self.rhs:
@@ -2315,8 +2320,8 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
             else:
                 result = result[0]
                 string += "\n|g   %s - %s|n" % (result.get_display_name(caller), result.path)
-                if "locate" in self.cmdstring and not is_account and result.location:
-                    string += "  Location: {}".format(result.location.get_display_name(caller))
+                if "loc" in self.switches and not is_account and result.location:
+                    string += " (|wlocation|n: |g{}|n)".format(result.location.get_display_name(caller))
         else:
             # Not an account/dbref search but a wider search; build a queryset.
             # Searchs for key and aliases
@@ -2352,8 +2357,8 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
                 else:
                     string = "|wOne Match|n(#%i-#%i%s):" % (low, high, restrictions)
                     string += "\n   |g%s - %s|n" % (results[0].get_display_name(caller), results[0].path)
-                    if "locate" in self.cmdstring and nresults == 1 and results[0].location:
-                        string += "  Location: {}".format(results[0].location.get_display_name(caller))
+                    if "loc" in self.switches and nresults == 1 and results[0].location:
+                        string += " (|wlocation|n: |g{}|n)".format(results[0].location.get_display_name(caller))
             else:
                 string = "|wMatch|n(#%i-#%i%s):" % (low, high, restrictions)
                 string += "\n   |RNo matches found for '%s'|n" % searchstring

From 8378ba7a8d4d495a63802bded0d8d16b5151ed59 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Thu, 15 Feb 2018 19:41:24 -0500
Subject: [PATCH 128/217] Add test for CmdFind locate alias and loc switch

---
 evennia/commands/default/tests.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 013baec4cc..850c1b6e4f 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -293,6 +293,12 @@ class TestBuilding(CommandTest):
 
     def test_find(self):
         self.call(building.CmdFind(), "Room2", "One Match")
+        expect = "One Match(#1#7, loc):\n   " +\
+                 "Char2(#7)  evennia.objects.objects.DefaultCharacter (location: Room(#1))"
+        self.call(building.CmdFind(), "Char2", expect, cmdstring="locate")
+        self.call(building.CmdFind(), "Char2", expect, cmdstring="@locate")
+        self.call(building.CmdFind(), "/loc Char2", expect, cmdstring="find")
+        self.call(building.CmdFind(), "Char2", "One Match", cmdstring="@find")
 
     def test_script(self):
         self.call(building.CmdScript(), "Obj = scripts.Script", "Script scripts.Script successfully added")

From 0450dae3e9a5d098a79c99ac08c85f3e3b8578ef Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 21 Feb 2018 20:18:33 +0100
Subject: [PATCH 129/217] Catch the case of a prematurely deleted guest
 account. Resolves #1500.

---
 evennia/typeclasses/attributes.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/evennia/typeclasses/attributes.py b/evennia/typeclasses/attributes.py
index 84a21c0c27..3f8b4cd742 100644
--- a/evennia/typeclasses/attributes.py
+++ b/evennia/typeclasses/attributes.py
@@ -282,6 +282,8 @@ class AttributeHandler(object):
                          "attribute__db_attrtype": self._attrtype,
                          "attribute__db_key__iexact": key.lower(),
                          "attribute__db_category__iexact": category.lower() if category else None}
+                if not self.obj.pk:
+                    return []
                 conn = getattr(self.obj, self._m2m_fieldname).through.objects.filter(**query)
                 if conn:
                     attr = conn[0].attribute

From 53454088b753542fd314a3405d32cccbe79fc709 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 21 Feb 2018 20:34:29 +0100
Subject: [PATCH 130/217] Add warning if Favico.js library is not reachable

---
 evennia/web/webclient/templates/webclient/base.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/evennia/web/webclient/templates/webclient/base.html b/evennia/web/webclient/templates/webclient/base.html
index 373ff0f357..f5f47b230f 100644
--- a/evennia/web/webclient/templates/webclient/base.html
+++ b/evennia/web/webclient/templates/webclient/base.html
@@ -25,7 +25,7 @@ JQuery available.
 
     <script type="text/javascript" charset="utf-8">
         if(!window.jQuery) {
-            document.write("<div class='err'>jQuery library not found or the online version could not be reached.</div>");
+            document.write("<div class='err'>jQuery library not found or the online version could not be reached. Check so Javascript is not blocked in your browser.</div>");
         }
     </script>
 
@@ -57,6 +57,12 @@ JQuery available.
     {% endblock %}
 
     <script src="https://cdn.rawgit.com/ejci/favico.js/master/favico-0.3.10.min.js" language="javascript" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript" charset="utf-8">
+        if(!window.Favico) {
+            document.write("<div class='err'>Favico.js library not found or the online version could not be reached. Check so Javascript is not blocked in your browser.</div>");
+        }
+    </script>
+
 
   </head>
   <body>

From 168709d88d8dfc6efcdb3300cf10c10765e11a57 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 1 Mar 2018 20:13:36 +0100
Subject: [PATCH 131/217] Fix bug in accessing attribute through manager

---
 evennia/typeclasses/managers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py
index 11a84f275a..ed61154e7f 100644
--- a/evennia/typeclasses/managers.py
+++ b/evennia/typeclasses/managers.py
@@ -8,6 +8,8 @@ import shlex
 from django.db.models import Q
 from evennia.utils import idmapper
 from evennia.utils.utils import make_iter, variable_from_module, to_unicode
+from evennia.typeclasses.attributes import Attribute
+from evennia.typeclasses.tags import Tag
 
 __all__ = ("TypedObjectManager", )
 _GA = object.__getattribute__
@@ -56,7 +58,7 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
         dbmodel = self.model.__dbclass__.__name__.lower()
         query = [("attribute__db_attrtype", attrtype), ("attribute__db_model", dbmodel)]
         if obj:
-            query.append(("%s__id" % self.model.__name__.lower(), obj.id))
+            query.append(("%s__id" % self.model.__dbclass__.__name__.lower(), obj.id))
         if key:
             query.append(("attribute__db_key", key))
         if category:

From 15b04666a5ca82e14cefa48ee584ccc468693cbb Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 1 Mar 2018 20:23:18 +0100
Subject: [PATCH 132/217] Make desc/set abide by edit/control locks

---
 evennia/commands/default/building.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index ebd8f66871..c87ffaaedc 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -568,6 +568,9 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
         if not obj:
             return
 
+        if not (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+            self.caller.msg("You don't have permission to edit the description of %s." % obj.key)
+
         self.caller.db.evmenu_target = obj
         # launch the editor
         EvEditor(self.caller, loadfunc=_desc_load, savefunc=_desc_save,
@@ -597,7 +600,7 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
             if not obj:
                 return
             desc = self.args
-        if obj.access(caller, "edit"):
+        if (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
             obj.db.desc = desc
             caller.msg("The description was set on %s." % obj.get_display_name(caller))
         else:
@@ -1581,6 +1584,10 @@ class CmdSetAttribute(ObjManipCommand):
         result = []
         if "edit" in self.switches:
             # edit in the line editor
+            if not (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+                caller.msg("You don't have permission to edit %s." % obj.key)
+                return
+
             if len(attrs) > 1:
                 caller.msg("The Line editor can only be applied "
                            "to one attribute at a time.")
@@ -1601,12 +1608,18 @@ class CmdSetAttribute(ObjManipCommand):
                 return
             else:
                 # deleting the attribute(s)
+                if not (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+                    caller.msg("You don't have permission to edit %s." % obj.key)
+                    return
                 for attr in attrs:
                     if not self.check_attr(obj, attr):
                         continue
                     result.append(self.rm_attr(obj, attr))
         else:
             # setting attribute(s). Make sure to convert to real Python type before saving.
+            if not (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+                caller.msg("You don't have permission to edit %s." % obj.key)
+                return
             for attr in attrs:
                 if not self.check_attr(obj, attr):
                     continue

From cde9986be894dcfc84f7fff161d86bcd48fc91c5 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 1 Mar 2018 20:53:20 +0100
Subject: [PATCH 133/217] Don't allow those with 'edit' access to obj to change
 the 'control' lock.

---
 evennia/commands/default/building.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index c87ffaaedc..7085ce2f98 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -1853,9 +1853,16 @@ class CmdLock(ObjManipCommand):
                 obj = caller.search(objname)
                 if not obj:
                     return
-            if not (obj.access(caller, 'control') or obj.access(caller, "edit")):
+            has_control_access = obj.access(caller, 'control')
+            if access_type == 'control' and not has_control_access:
+                # only allow to change 'control' access if you have 'control' access already
+                caller.msg("You need 'control' access to change this type of lock.")
+                return
+
+            if not has_control_access or obj.access(caller, "edit"):
                 caller.msg("You are not allowed to do that.")
                 return
+
             lockdef = obj.locks.get(access_type)
 
             if lockdef:

From 29ab570d5509c3ec6d4b4311a8362e36a1ebb025 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 1 Mar 2018 21:56:40 +0100
Subject: [PATCH 134/217] Make get_attribute/tag manager methods return
 querysets

---
 evennia/typeclasses/managers.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py
index ed61154e7f..358066e3f1 100644
--- a/evennia/typeclasses/managers.py
+++ b/evennia/typeclasses/managers.py
@@ -68,7 +68,9 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
         elif value:
             # strvalue and value are mutually exclusive
             query.append(("attribute__db_value", value))
-        return [th.attribute for th in self.model.db_attributes.through.objects.filter(**dict(query))]
+        return Attribute.objects.filter(
+            pk__in=self.model.db_attributes.through.objects.filter(
+                **dict(query)).values_list("attribute_id", flat=True))
 
     def get_nick(self, key=None, category=None, value=None, strvalue=None, obj=None):
         """
@@ -190,7 +192,9 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
                 query.append(("tag__db_key", key))
             if category:
                 query.append(("tag__db_category", category))
-            return [th.tag for th in self.model.db_tags.through.objects.filter(**dict(query))]
+            return Tag.objects.filter(
+                pk__in=self.model.db_tags.through.objects.filter(
+                    **dict(query)).values_list("tag_id", flat=True))
 
     def get_permission(self, key=None, category=None, obj=None):
         """

From accd0f286e4a210ff23c5cfae7613cc3635876c2 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 1 Mar 2018 22:21:22 +0100
Subject: [PATCH 135/217] Remove mutual exclusivity between value/strvalue when
 searching for Attributes with manager

---
 evennia/typeclasses/managers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py
index 358066e3f1..e6ef778eb8 100644
--- a/evennia/typeclasses/managers.py
+++ b/evennia/typeclasses/managers.py
@@ -65,8 +65,8 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
             query.append(("attribute__db_category", category))
         if strvalue:
             query.append(("attribute__db_strvalue", strvalue))
-        elif value:
-            # strvalue and value are mutually exclusive
+        if value:
+            # no reason to make strvalue/value mutually exclusive at this level
             query.append(("attribute__db_value", value))
         return Attribute.objects.filter(
             pk__in=self.model.db_attributes.through.objects.filter(

From 0baf7c567e8b06a840a58c948971dd9413e1c8ad Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 2 Mar 2018 07:14:57 -0500
Subject: [PATCH 136/217] Mark print line as DEBUG

This debug line spams unit tests for comms.
Be sure to note for easy location for later removal.
---
 evennia/comms/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/comms/models.py b/evennia/comms/models.py
index c456a6e72c..e66f00e813 100644
--- a/evennia/comms/models.py
+++ b/evennia/comms/models.py
@@ -527,7 +527,7 @@ class SubscriptionHandler(object):
         for subscriber in make_iter(entity):
             if subscriber:
                 clsname = subscriber.__dbclass__.__name__
-                print("subscriber:", subscriber, clsname)
+                print("subscriber:", subscriber, clsname)  # DEBUG
                 # chooses the right type
                 if clsname == "ObjectDB":
                     self.obj.db_object_subscriptions.add(subscriber)

From 91a6ced885a53de66269108a6924f0cd19c4c4d5 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 2 Mar 2018 07:18:18 -0500
Subject: [PATCH 137/217] MUX command add optional self.option, self.split

These optional variables aid in parsing, if set.
self.options = (tuple of valid /switches expected by this command
self.split = Alternate string delimiter to separate left/right side.
---
 evennia/commands/default/muxcommand.py | 48 +++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/evennia/commands/default/muxcommand.py b/evennia/commands/default/muxcommand.py
index 5d8d4b2890..6d731ea14f 100644
--- a/evennia/commands/default/muxcommand.py
+++ b/evennia/commands/default/muxcommand.py
@@ -79,6 +79,11 @@ class MuxCommand(Command):
         it here). The rest of the command is stored in self.args, which can
         start with the switch indicator /.
 
+        Optional variables to aid in parsing, if set:
+          self.options = (tuple of valid /switches expected
+                          by this command (without the /))
+          self.split = Alternate string delimiter to separate left/right hand side.
+
         This parser breaks self.args into its constituents and stores them in the
         following variables:
           self.switches = [list of /switches (without the /)]
@@ -109,15 +114,44 @@ class MuxCommand(Command):
             else:
                 args = ""
                 switches = switches[0].split('/')
+            # Parse mux options, comparing them against user-provided switches, expanding abbreviations.
+            if hasattr(self, "options") and self.options and switches:
+                # If specific options are known, test them against given switches.
+                valid_switches, unused_switches, extra_switches = [], [], []
+                for element in switches:
+                    option_check = [each for each in self.options if each.lower().startswith(element.lower())]
+                    if len(option_check) > 1:
+                        extra_switches += option_check  # Either the option provided is ambiguous,
+                    elif len(option_check) == 1:
+                        valid_switches += option_check  # or it is a valid option abbreviation,
+                    elif len(option_check) == 0:
+                        unused_switches += [element]  # or an extraneous option to be ignored.
+                if extra_switches:  # User provided switches
+                    self.msg('|g%s|n: |wAmbiguous switch supplied: Did you mean /|C%s|w?' %
+                             (self.cmdstring, ' |nor /|C'.join(extra_switches)))
+                if unused_switches:
+                    plural = '' if len(unused_switches) == 1 else 'es'
+                    self.msg('|g%s|n: |wExtra switch%s "/|C%s|w" ignored.' %
+                             (self.cmdstring, plural, '|n, /|C'.join(unused_switches)))
+                switches = valid_switches  # Only include valid_switches in command function call
         arglist = [arg.strip() for arg in args.split()]
 
         # check for arg1, arg2, ... = argA, argB, ... constructs
-        lhs, rhs = args, None
+        lhs, rhs = args.strip(), None
         lhslist, rhslist = [arg.strip() for arg in args.split(',')], []
-        if args and '=' in args:
-            lhs, rhs = [arg.strip() for arg in args.split('=', 1)]
-            lhslist = [arg.strip() for arg in lhs.split(',')]
-            rhslist = [arg.strip() for arg in rhs.split(',')]
+        if lhs:
+            if '=' in lhs:  # Default delimiter has priority
+                # Parse to separate left into left/right sides using default delimiter
+                lhs, rhs = lhs.split('=', 1)
+            elif hasattr(self, "split") and self.split and self.split in lhs:
+                # Parse to separate left into left/right sides using a custom delimiter, if provided.
+                lhs, rhs = lhs.split(self.split, 1)  # At most, split once, into left and right parts.
+            # Trim user-injected whitespace
+            rhs = rhs.strip() if rhs is not None else None
+            lhs = lhs.strip()
+            # Further split left/right sides by comma delimiter
+            lhslist = [arg.strip() for arg in lhs.split(',')] if lhs is not None else ""
+            rhslist = [arg.strip() for arg in rhs.split(',')] if rhs is not None else ""
 
         # save to object properties:
         self.raw = raw
@@ -169,6 +203,10 @@ class MuxCommand(Command):
         string += "\nraw argument (self.raw): |w%s|n \n" % self.raw
         string += "cmd args (self.args): |w%s|n\n" % self.args
         string += "cmd switches (self.switches): |w%s|n\n" % self.switches
+        if hasattr(self, "options"):  # Optional
+            string += "cmd options (self.options): |w%s|n\n" % self.options
+        if hasattr(self, "split"):  # Optional
+            string += "cmd parse left/right using (self.split): |w%s|n\n" % self.split
         string += "space-separated arg list (self.arglist): |w%s|n\n" % self.arglist
         string += "lhs, left-hand side of '=' (self.lhs): |w%s|n\n" % self.lhs
         string += "lhs, comma separated (self.lhslist): |w%s|n\n" % self.lhslist

From e1881fb8809921769a9b1d687b2876221280cc27 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 2 Mar 2018 07:22:26 -0500
Subject: [PATCH 138/217] Add tests for MUX command added feature

Shortened long lines, added tests with different parses
for MUX command added class vars: options and split
---
 evennia/commands/default/tests.py | 84 ++++++++++++++++++++-----------
 1 file changed, 55 insertions(+), 29 deletions(-)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 38829f0cf5..f581c32589 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -72,7 +72,6 @@ class CommandTest(EvenniaTest):
         cmdobj.obj = obj or (caller if caller else self.char1)
         # test
         old_msg = receiver.msg
-        returned_msg = ""
         try:
             receiver.msg = Mock()
             cmdobj.at_pre_cmd()
@@ -126,9 +125,12 @@ class TestGeneral(CommandTest):
         self.call(general.CmdPose(), "looks around", "Char looks around")
 
     def test_nick(self):
-        self.call(general.CmdNick(), "testalias = testaliasedstring1", "Inputlinenick 'testalias' mapped to 'testaliasedstring1'.")
-        self.call(general.CmdNick(), "/account testalias = testaliasedstring2", "Accountnick 'testalias' mapped to 'testaliasedstring2'.")
-        self.call(general.CmdNick(), "/object testalias = testaliasedstring3", "Objectnick 'testalias' mapped to 'testaliasedstring3'.")
+        self.call(general.CmdNick(), "testalias = testaliasedstring1",
+                  "Inputlinenick 'testalias' mapped to 'testaliasedstring1'.")
+        self.call(general.CmdNick(), "/account testalias = testaliasedstring2",
+                  "Accountnick 'testalias' mapped to 'testaliasedstring2'.")
+        self.call(general.CmdNick(), "/object testalias = testaliasedstring3",
+                  "Objectnick 'testalias' mapped to 'testaliasedstring3'.")
         self.assertEqual(u"testaliasedstring1", self.char1.nicks.get("testalias"))
         self.assertEqual(None, self.char1.nicks.get("testalias", category="account"))
         self.assertEqual(u"testaliasedstring2", self.char1.account.nicks.get("testalias", category="account"))
@@ -225,7 +227,8 @@ class TestAccount(CommandTest):
         self.call(account.CmdColorTest(), "ansi", "ANSI colors:", caller=self.account)
 
     def test_char_create(self):
-        self.call(account.CmdCharCreate(), "Test1=Test char", "Created new character Test1. Use @ic Test1 to enter the game", caller=self.account)
+        self.call(account.CmdCharCreate(), "Test1=Test char",
+                  "Created new character Test1. Use @ic Test1 to enter the game", caller=self.account)
 
     def test_quell(self):
         self.call(account.CmdQuell(), "", "Quelling to current puppet's permissions (developer).", caller=self.account)
@@ -234,7 +237,8 @@ class TestAccount(CommandTest):
 class TestBuilding(CommandTest):
     def test_create(self):
         name = settings.BASE_OBJECT_TYPECLASS.rsplit('.', 1)[1]
-        self.call(building.CmdCreate(), "/drop TestObj1", "You create a new %s: TestObj1." % name)
+        self.call(building.CmdCreate(), "/d TestObj1",   # /d switch is abbreviated form of /drop
+                  "You create a new %s: TestObj1." % name)
 
     def test_examine(self):
         self.call(building.CmdExamine(), "Obj", "Name/key: Obj")
@@ -244,7 +248,8 @@ class TestBuilding(CommandTest):
         self.call(building.CmdSetObjAlias(), "Obj = TestObj1b", "Alias(es) for 'Obj(#4)' set to 'testobj1b'.")
 
     def test_copy(self):
-        self.call(building.CmdCopy(), "Obj = TestObj2;TestObj2b, TestObj3;TestObj3b", "Copied Obj to 'TestObj3' (aliases: ['TestObj3b']")
+        self.call(building.CmdCopy(), "Obj = TestObj2;TestObj2b, TestObj3;TestObj3b",
+                  "Copied Obj to 'TestObj3' (aliases: ['TestObj3b']")
 
     def test_attribute_commands(self):
         self.call(building.CmdSetAttribute(), "Obj/test1=\"value1\"", "Created attribute Obj/test1 = 'value1'")
@@ -287,7 +292,8 @@ class TestBuilding(CommandTest):
 
     def test_typeclass(self):
         self.call(building.CmdTypeclass(), "Obj = evennia.objects.objects.DefaultExit",
-                  "Obj changed typeclass from evennia.objects.objects.DefaultObject to evennia.objects.objects.DefaultExit.")
+                  "Obj changed typeclass from evennia.objects.objects.DefaultObject "
+                  "to evennia.objects.objects.DefaultExit.")
 
     def test_lock(self):
         self.call(building.CmdLock(), "Obj = test:perm(Developer)", "Added lock 'test:perm(Developer)' to Obj.")
@@ -297,15 +303,24 @@ class TestBuilding(CommandTest):
         expect = "One Match(#1#7, loc):\n   " +\
                  "Char2(#7)  evennia.objects.objects.DefaultCharacter (location: Room(#1))"
         self.call(building.CmdFind(), "Char2", expect, cmdstring="locate")
+        self.call(building.CmdFind(), "/ex Char2",  # /ex is an ambiguous switch
+                  "locate: Ambiguous switch supplied: Did you mean /exit or /exact?|" + expect,
+                  cmdstring="locate")
         self.call(building.CmdFind(), "Char2", expect, cmdstring="@locate")
-        self.call(building.CmdFind(), "/loc Char2", expect, cmdstring="find")
+        self.call(building.CmdFind(), "/l Char2", expect, cmdstring="find")  # /l switch is abbreviated form of /loc
         self.call(building.CmdFind(), "Char2", "One Match", cmdstring="@find")
 
     def test_script(self):
         self.call(building.CmdScript(), "Obj = scripts.Script", "Script scripts.Script successfully added")
 
     def test_teleport(self):
-        self.call(building.CmdTeleport(), "Room2", "Room2(#2)\n|Teleported to Room2.")
+        self.call(building.CmdTeleport(), "/quiet Room2", "Room2(#2)\n|Teleported to Room2.")
+        self.call(building.CmdTeleport(), "/t",  # /t switch is abbreviated form of /tonone
+                  "Cannot teleport a puppeted object (Char, puppeted by TestAccount(account 1)) to a Nonelocation.")
+        self.call(building.CmdTeleport(), "/l Room2",  # /l switch is abbreviated form of /loc
+                  "Destination has no location.")
+        self.call(building.CmdTeleport(), "/q me to Room2",  # /q switch is abbreviated form of /quiet
+                  "Char is already at Room2.")
 
     def test_spawn(self):
         def getObject(commandTest, objKeyStr):
@@ -321,7 +336,7 @@ class TestBuilding(CommandTest):
         self.call(building.CmdSpawn(), " ", "Usage: @spawn")
 
         # Tests "@spawn <prototype_dictionary>" without specifying location.
-        self.call(building.CmdSpawn(), \
+        self.call(building.CmdSpawn(),
                   "{'key':'goblin', 'typeclass':'evennia.DefaultCharacter'}", "Spawned goblin")
         goblin = getObject(self, "goblin")
 
@@ -340,8 +355,8 @@ class TestBuilding(CommandTest):
             # char1's default location in the future...
             spawnLoc = self.room1
 
-        self.call(building.CmdSpawn(), \
-                  "{'prototype':'GOBLIN', 'key':'goblin', 'location':'%s'}" \
+        self.call(building.CmdSpawn(),
+                  "{'prototype':'GOBLIN', 'key':'goblin', 'location':'%s'}"
                   % spawnLoc.dbref, "Spawned goblin")
         goblin = getObject(self, "goblin")
         self.assertEqual(goblin.location, spawnLoc)
@@ -354,70 +369,81 @@ class TestBuilding(CommandTest):
         self.assertIsInstance(ball, DefaultObject)
         ball.delete()
 
-        # Tests "@spawn/noloc ..." without specifying a location.
+        # Tests "@spawn/n ..." without specifying a location.
         # Location should be "None".
-        self.call(building.CmdSpawn(), "/noloc 'BALL'", "Spawned Ball")
+        self.call(building.CmdSpawn(), "/n 'BALL'", "Spawned Ball")   # /n switch is abbreviated form of /noloc
         ball = getObject(self, "Ball")
         self.assertIsNone(ball.location)
         ball.delete()
 
         # Tests "@spawn/noloc ...", but DO specify a location.
         # Location should be the specified location.
-        self.call(building.CmdSpawn(),  \
-                  "/noloc {'prototype':'BALL', 'location':'%s'}" \
+        self.call(building.CmdSpawn(),
+                  "/noloc {'prototype':'BALL', 'location':'%s'}"
                   % spawnLoc.dbref, "Spawned Ball")
         ball = getObject(self, "Ball")
         self.assertEqual(ball.location, spawnLoc)
         ball.delete()
 
         # test calling spawn with an invalid prototype.
-        self.call(building.CmdSpawn(), \
-                  "'NO_EXIST'", "No prototype named 'NO_EXIST'")
+        self.call(building.CmdSpawn(), "'NO_EXIST'", "No prototype named 'NO_EXIST'")
 
 
 class TestComms(CommandTest):
 
     def setUp(self):
         super(CommandTest, self).setUp()
-        self.call(comms.CmdChannelCreate(), "testchan;test=Test Channel", "Created channel testchan and connected to it.", receiver=self.account)
+        self.call(comms.CmdChannelCreate(), "testchan;test=Test Channel",
+                  "Created channel testchan and connected to it.", receiver=self.account)
 
     def test_toggle_com(self):
-        self.call(comms.CmdAddCom(), "tc = testchan", "You are already connected to channel testchan. You can now", receiver=self.account)
+        self.call(comms.CmdAddCom(), "tc = testchan",
+                  "You are already connected to channel testchan. You can now", receiver=self.account)
         self.call(comms.CmdDelCom(), "tc", "Your alias 'tc' for channel testchan was cleared.", receiver=self.account)
 
     def test_channels(self):
-        self.call(comms.CmdChannels(), "", "Available channels (use comlist,addcom and delcom to manage", receiver=self.account)
+        self.call(comms.CmdChannels(), "",
+                  "Available channels (use comlist,addcom and delcom to manage", receiver=self.account)
 
     def test_all_com(self):
-        self.call(comms.CmdAllCom(), "", "Available channels (use comlist,addcom and delcom to manage", receiver=self.account)
+        self.call(comms.CmdAllCom(), "",
+                  "Available channels (use comlist,addcom and delcom to manage", receiver=self.account)
 
     def test_clock(self):
-        self.call(comms.CmdClock(), "testchan=send:all()", "Lock(s) applied. Current locks on testchan:", receiver=self.account)
+        self.call(comms.CmdClock(),
+                  "testchan=send:all()", "Lock(s) applied. Current locks on testchan:", receiver=self.account)
 
     def test_cdesc(self):
-        self.call(comms.CmdCdesc(), "testchan = Test Channel", "Description of channel 'testchan' set to 'Test Channel'.", receiver=self.account)
+        self.call(comms.CmdCdesc(), "testchan = Test Channel",
+                  "Description of channel 'testchan' set to 'Test Channel'.", receiver=self.account)
 
     def test_cemit(self):
-        self.call(comms.CmdCemit(), "testchan = Test Message", "[testchan] Test Message|Sent to channel testchan: Test Message", receiver=self.account)
+        self.call(comms.CmdCemit(), "testchan = Test Message",
+                  "[testchan] Test Message|Sent to channel testchan: Test Message", receiver=self.account)
 
     def test_cwho(self):
         self.call(comms.CmdCWho(), "testchan", "Channel subscriptions\ntestchan:\n  TestAccount", receiver=self.account)
 
     def test_page(self):
-        self.call(comms.CmdPage(), "TestAccount2 = Test", "TestAccount2 is offline. They will see your message if they list their pages later.|You paged TestAccount2 with: 'Test'.", receiver=self.account)
+        self.call(comms.CmdPage(), "TestAccount2 = Test",
+                  "TestAccount2 is offline. They will see your message if they list their pages later."
+                  "|You paged TestAccount2 with: 'Test'.", receiver=self.account)
 
     def test_cboot(self):
         # No one else connected to boot
         self.call(comms.CmdCBoot(), "", "Usage: @cboot[/quiet] <channel> = <account> [:reason]", receiver=self.account)
 
     def test_cdestroy(self):
-        self.call(comms.CmdCdestroy(), "testchan", "[testchan] TestAccount: testchan is being destroyed. Make sure to change your aliases.|Channel 'testchan' was destroyed.", receiver=self.account)
+        self.call(comms.CmdCdestroy(), "testchan",
+                  "[testchan] TestAccount: testchan is being destroyed. Make sure to change your aliases."
+                  "|Channel 'testchan' was destroyed.", receiver=self.account)
 
 
 class TestBatchProcess(CommandTest):
     def test_batch_commands(self):
         # cannot test batchcode here, it must run inside the server process
-        self.call(batchprocess.CmdBatchCommands(), "example_batch_cmds", "Running Batchcommand processor  Automatic mode for example_batch_cmds")
+        self.call(batchprocess.CmdBatchCommands(), "example_batch_cmds",
+                  "Running Batchcommand processor  Automatic mode for example_batch_cmds")
         # we make sure to delete the button again here to stop the running reactor
         confirm = building.CmdDestroy.confirm
         building.CmdDestroy.confirm = False

From df4629651b3f312eaff9b542aef33071a4e6999a Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 2 Mar 2018 07:24:27 -0500
Subject: [PATCH 139/217] Added options class variable to CmdOption, CmdQuit

docstring Switch is plural for multiple Switches
---
 evennia/commands/default/account.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/evennia/commands/default/account.py b/evennia/commands/default/account.py
index 20cc374542..81539bba17 100644
--- a/evennia/commands/default/account.py
+++ b/evennia/commands/default/account.py
@@ -455,7 +455,7 @@ class CmdOption(COMMAND_DEFAULT_CLASS):
     Usage:
       @option[/save] [name = value]
 
-    Switch:
+    Switches:
       save - Save the current option settings for future logins.
       clear - Clear the saved options.
 
@@ -467,6 +467,7 @@ class CmdOption(COMMAND_DEFAULT_CLASS):
     """
     key = "@option"
     aliases = "@options"
+    options = ("save", "clear")
     locks = "cmd:all()"
 
     # this is used by the parent
@@ -650,6 +651,7 @@ class CmdQuit(COMMAND_DEFAULT_CLASS):
     game. Use the /all switch to disconnect from all sessions.
     """
     key = "@quit"
+    options = ("all",)
     locks = "cmd:all()"
 
     # this is used by the parent

From 2df6684836fde62dbc3dedb90e5e0ae2c09b9aff Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 2 Mar 2018 07:27:57 -0500
Subject: [PATCH 140/217] Add options class var to some admin commands

CmdBoot, CmdDelAccount, CmdEmit + Docstring edit,
CmdPerm + Docstring edit.
---
 evennia/commands/default/admin.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/evennia/commands/default/admin.py b/evennia/commands/default/admin.py
index 8b694ffd8f..dba0c49bdd 100644
--- a/evennia/commands/default/admin.py
+++ b/evennia/commands/default/admin.py
@@ -36,6 +36,7 @@ class CmdBoot(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@boot"
+    options = ("quiet", "sid")
     locks = "cmd:perm(boot) or perm(Admin)"
     help_category = "Admin"
 
@@ -265,6 +266,7 @@ class CmdDelAccount(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@delaccount"
+    options = ("delobj",)
     locks = "cmd:perm(delaccount) or perm(Developer)"
     help_category = "Admin"
 
@@ -329,9 +331,9 @@ class CmdEmit(COMMAND_DEFAULT_CLASS):
       @pemit           [<obj>, <obj>, ... =] <message>
 
     Switches:
-      room : limit emits to rooms only (default)
-      accounts : limit emits to accounts only
-      contents : send to the contents of matched objects too
+      room     -  limit emits to rooms only (default)
+      accounts -  limit emits to accounts only
+      contents -  send to the contents of matched objects too
 
     Emits a message to the selected objects or to
     your immediate surroundings. If the object is a room,
@@ -341,6 +343,7 @@ class CmdEmit(COMMAND_DEFAULT_CLASS):
     """
     key = "@emit"
     aliases = ["@pemit", "@remit"]
+    options = ("room", "accounts", "contents")
     locks = "cmd:perm(emit) or perm(Builder)"
     help_category = "Admin"
 
@@ -442,14 +445,15 @@ class CmdPerm(COMMAND_DEFAULT_CLASS):
       @perm[/switch] *<account> [= <permission>[,<permission>,...]]
 
     Switches:
-      del : delete the given permission from <object> or <account>.
-      account : set permission on an account (same as adding * to name)
+      del     -  delete the given permission from <object> or <account>.
+      account -  set permission on an account (same as adding * to name)
 
     This command sets/clears individual permission strings on an object
     or account. If no permission is given, list all permissions on <object>.
     """
     key = "@perm"
     aliases = "@setperm"
+    options = ("del", "account")
     locks = "cmd:perm(perm) or perm(Developer)"
     help_category = "Admin"
 

From 77fb0f4aed48b32682c4669b8a47f76a1ab72289 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 2 Mar 2018 07:31:33 -0500
Subject: [PATCH 141/217] Adds class var options to some system commands

CmdPy, CmdScripts, CmdService, CmdServerLoad and
plural of Switch is Switches in docstring
---
 evennia/commands/default/system.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/evennia/commands/default/system.py b/evennia/commands/default/system.py
index 7bd092bad5..e4d6242a56 100644
--- a/evennia/commands/default/system.py
+++ b/evennia/commands/default/system.py
@@ -245,6 +245,7 @@ class CmdPy(COMMAND_DEFAULT_CLASS):
     """
     key = "@py"
     aliases = ["!"]
+    options = ("time", "edit")
     locks = "cmd:perm(py) or perm(Developer)"
     help_category = "System"
 
@@ -328,6 +329,7 @@ class CmdScripts(COMMAND_DEFAULT_CLASS):
     """
     key = "@scripts"
     aliases = ["@globalscript", "@listscripts"]
+    options = ("start", "stop", "kill", "validate")
     locks = "cmd:perm(listscripts) or perm(Admin)"
     help_category = "System"
 
@@ -521,6 +523,7 @@ class CmdService(COMMAND_DEFAULT_CLASS):
 
     key = "@service"
     aliases = ["@services"]
+    options = ("list", "start", "stop", "delete")
     locks = "cmd:perm(service) or perm(Developer)"
     help_category = "System"
 
@@ -672,7 +675,7 @@ class CmdServerLoad(COMMAND_DEFAULT_CLASS):
     Usage:
        @server[/mem]
 
-    Switch:
+    Switches:
         mem - return only a string of the current memory usage
         flushmem - flush the idmapper cache
 
@@ -703,6 +706,7 @@ class CmdServerLoad(COMMAND_DEFAULT_CLASS):
     """
     key = "@server"
     aliases = ["@serverload", "@serverprocess"]
+    options = ("mem", "flushmem")
     locks = "cmd:perm(list) or perm(Developer)"
     help_category = "System"
 

From 345b7f1a7c81ac3a4ad414fb473151bdbe02e4d8 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 2 Mar 2018 07:37:33 -0500
Subject: [PATCH 142/217] Adds class var options to some comms commands

CmdCBoot + docstring Switches plural, CmdCemit, CmdPage,
CmdIRC2Chan, CmdIRC2Chan.
---
 evennia/commands/default/comms.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/evennia/commands/default/comms.py b/evennia/commands/default/comms.py
index 37a4934d16..b654bd0297 100644
--- a/evennia/commands/default/comms.py
+++ b/evennia/commands/default/comms.py
@@ -377,7 +377,7 @@ class CmdCBoot(COMMAND_DEFAULT_CLASS):
     Usage:
        @cboot[/quiet] <channel> = <account> [:reason]
 
-    Switches:
+    Switch:
        quiet - don't notify the channel
 
     Kicks an account or object from a channel you control.
@@ -385,6 +385,7 @@ class CmdCBoot(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@cboot"
+    options = ("quiet",)
     locks = "cmd: not pperm(channel_banned)"
     help_category = "Comms"
 
@@ -453,6 +454,7 @@ class CmdCemit(COMMAND_DEFAULT_CLASS):
 
     key = "@cemit"
     aliases = ["@cmsg"]
+    options = ("sendername", "quiet")
     locks = "cmd: not pperm(channel_banned) and pperm(Player)"
     help_category = "Comms"
 
@@ -683,6 +685,7 @@ class CmdPage(COMMAND_DEFAULT_CLASS):
 
     key = "page"
     aliases = ['tell']
+    options = ("last", "list")
     locks = "cmd:not pperm(page_banned)"
     help_category = "Comms"
 
@@ -850,6 +853,7 @@ class CmdIRC2Chan(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@irc2chan"
+    options = ("delete", "remove", "disconnect", "list", "ssl")
     locks = "cmd:serversetting(IRC_ENABLED) and pperm(Developer)"
     help_category = "Comms"
 
@@ -1016,6 +1020,7 @@ class CmdRSS2Chan(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@rss2chan"
+    options = ("disconnect", "remove", "list")
     locks = "cmd:serversetting(RSS_ENABLED) and pperm(Developer)"
     help_category = "Comms"
 

From c873acb44eaf84bcb5f2e96cea1b584d65382f80 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 2 Mar 2018 07:38:37 -0500
Subject: [PATCH 143/217] Add class var options to CmdSetHelp

---
 evennia/commands/default/help.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evennia/commands/default/help.py b/evennia/commands/default/help.py
index ebce460748..a355ac2e3f 100644
--- a/evennia/commands/default/help.py
+++ b/evennia/commands/default/help.py
@@ -317,6 +317,7 @@ class CmdSetHelp(COMMAND_DEFAULT_CLASS):
 
     """
     key = "@sethelp"
+    options = ("edit", "replace", "append", "extend", "delete")
     locks = "cmd:perm(Helper)"
     help_category = "Building"
 

From 87316d80465fb4ba553ac47ac6e43799f667b359 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 2 Mar 2018 07:40:43 -0500
Subject: [PATCH 144/217] Add class var options to CmdExtendedDesc

Inherits from default_cmds.CmdDesc, but unused in
CmdExtendedDesc, so needs to be set empty.
---
 evennia/contrib/extended_room.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evennia/contrib/extended_room.py b/evennia/contrib/extended_room.py
index 755c2ac22e..b2f61757f9 100644
--- a/evennia/contrib/extended_room.py
+++ b/evennia/contrib/extended_room.py
@@ -367,6 +367,7 @@ class CmdExtendedDesc(default_cmds.CmdDesc):
 
     """
     aliases = ["describe", "detail"]
+    options = ()  # Inherits from default_cmds.CmdDesc, but unused here
 
     def reset_times(self, obj):
         """By deleteting the caches we force a re-load."""

From c29cb96e4b20f43a94a5491c7b55ae1cc82d4abb Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 2 Mar 2018 07:44:50 -0500
Subject: [PATCH 145/217] Adds options var to CmdBatchCommands, CmdBatchCode

---
 evennia/commands/default/batchprocess.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/evennia/commands/default/batchprocess.py b/evennia/commands/default/batchprocess.py
index f0b117a816..bf09360c71 100644
--- a/evennia/commands/default/batchprocess.py
+++ b/evennia/commands/default/batchprocess.py
@@ -237,6 +237,7 @@ class CmdBatchCommands(_COMMAND_DEFAULT_CLASS):
     """
     key = "@batchcommands"
     aliases = ["@batchcommand", "@batchcmd"]
+    options = ("interactive",)
     locks = "cmd:perm(batchcommands) or perm(Developer)"
     help_category = "Building"
 
@@ -347,6 +348,7 @@ class CmdBatchCode(_COMMAND_DEFAULT_CLASS):
     """
     key = "@batchcode"
     aliases = ["@batchcodes"]
+    options = ("interactive", "debug")
     locks = "cmd:superuser()"
     help_category = "Building"
 

From 8af16ad971c2cd9cc73893b8e20f4bd383aa156f Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 2 Mar 2018 07:58:40 -0500
Subject: [PATCH 146/217] Adds class var options and split to CmdTeleport +

CmdSetObjAlias, CmdCopy, CmdCpAttr, CmdMvAttr,
CmdCreate, CmdDesc, CmdDestroy +docstring edits,
CmdDig, CmdTunnel, CmdFind, CmdScript, CmdTag,
CmdSpawn
---
 evennia/commands/default/building.py | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index 4bc107dcfb..f8d0246f39 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -124,6 +124,7 @@ class CmdSetObjAlias(COMMAND_DEFAULT_CLASS):
 
     key = "@alias"
     aliases = "@setobjalias"
+    options = ("category",)
     locks = "cmd:perm(setobjalias) or perm(Builder)"
     help_category = "Building"
 
@@ -218,6 +219,7 @@ class CmdCopy(ObjManipCommand):
     """
 
     key = "@copy"
+    options = ("reset",)
     locks = "cmd:perm(copy) or perm(Builder)"
     help_category = "Building"
 
@@ -299,6 +301,7 @@ class CmdCpAttr(ObjManipCommand):
     If you don't supply a source object, yourself is used.
     """
     key = "@cpattr"
+    options = ("move",)
     locks = "cmd:perm(cpattr) or perm(Builder)"
     help_category = "Building"
 
@@ -440,6 +443,7 @@ class CmdMvAttr(ObjManipCommand):
     object. If you don't supply a source object, yourself is used.
     """
     key = "@mvattr"
+    options = ("copy",)
     locks = "cmd:perm(mvattr) or perm(Builder)"
     help_category = "Building"
 
@@ -488,6 +492,7 @@ class CmdCreate(ObjManipCommand):
     """
 
     key = "@create"
+    options = ("drop",)
     locks = "cmd:perm(create) or perm(Builder)"
     help_category = "Building"
 
@@ -573,6 +578,7 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
     """
     key = "@desc"
     aliases = "@describe"
+    options = ("edit",)
     locks = "cmd:perm(desc) or perm(Builder)"
     help_category = "Building"
 
@@ -631,11 +637,11 @@ class CmdDestroy(COMMAND_DEFAULT_CLASS):
     Usage:
        @destroy[/switches] [obj, obj2, obj3, [dbref-dbref], ...]
 
-    switches:
+    Switches:
        override - The @destroy command will usually avoid accidentally
                   destroying account objects. This switch overrides this safety.
        force - destroy without confirmation.
-    examples:
+    Examples:
        @destroy house, roof, door, 44-78
        @destroy 5-10, flower, 45
        @destroy/force north
@@ -648,6 +654,7 @@ class CmdDestroy(COMMAND_DEFAULT_CLASS):
 
     key = "@destroy"
     aliases = ["@delete", "@del"]
+    options = ("override", "force")
     locks = "cmd:perm(destroy) or perm(Builder)"
     help_category = "Building"
 
@@ -771,6 +778,7 @@ class CmdDig(ObjManipCommand):
     would be 'north;no;n'.
     """
     key = "@dig"
+    options = ("teleport",)
     locks = "cmd:perm(dig) or perm(Builder)"
     help_category = "Building"
 
@@ -880,7 +888,7 @@ class CmdDig(ObjManipCommand):
                                                        new_back_exit.dbref,
                                                        alias_string)
         caller.msg("%s%s%s" % (room_string, exit_to_string, exit_back_string))
-        if new_room and ('teleport' in self.switches or "tel" in self.switches):
+        if new_room and 'teleport' in self.switches:
             caller.move_to(new_room)
 
 
@@ -913,6 +921,7 @@ class CmdTunnel(COMMAND_DEFAULT_CLASS):
 
     key = "@tunnel"
     aliases = ["@tun"]
+    options = ("oneway", "tel")
     locks = "cmd: perm(tunnel) or perm(Builder)"
     help_category = "Building"
 
@@ -2256,6 +2265,7 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
 
     key = "@find"
     aliases = "@search, @locate"
+    options = ("room", "exit", "char", "exact", "loc")
     locks = "cmd:perm(find) or perm(Builder)"
     help_category = "Building"
 
@@ -2292,7 +2302,7 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
 
         restrictions = ""
         if self.switches:
-            restrictions = ", %s" % (",".join(self.switches))
+            restrictions = ", %s" % (", ".join(self.switches))
 
         if is_dbref or is_account:
 
@@ -2372,7 +2382,7 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
     teleport object to another location
 
     Usage:
-      @tel/switch [<object> =] <target location>
+      @tel/switch [<object> to||=] <target location>
 
     Examples:
       @tel Limbo
@@ -2395,6 +2405,8 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
     is teleported to the target location.     """
     key = "@tel"
     aliases = "@teleport"
+    options = ("quiet", "intoexit", "tonone", "loc")
+    split = " to "
     locks = "cmd:perm(teleport) or perm(Builder)"
     help_category = "Building"
 
@@ -2502,6 +2514,7 @@ class CmdScript(COMMAND_DEFAULT_CLASS):
 
     key = "@script"
     aliases = "@addscript"
+    options = ("start", "stop")
     locks = "cmd:perm(script) or perm(Builder)"
     help_category = "Building"
 
@@ -2601,6 +2614,7 @@ class CmdTag(COMMAND_DEFAULT_CLASS):
 
     key = "@tag"
     aliases = ["@tags"]
+    options = ("search", "del")
     locks = "cmd:perm(tag) or perm(Builder)"
     help_category = "Building"
     arg_regex = r"(/\w+?(\s|$))|\s|$"
@@ -2742,6 +2756,7 @@ class CmdSpawn(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@spawn"
+    options = ("noloc", )
     locks = "cmd:perm(spawn) or perm(Builder)"
     help_category = "Building"
 

From 062e048c604715e691510cabd2b041342a574285 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Fri, 2 Mar 2018 08:02:31 -0500
Subject: [PATCH 147/217] Adds class var options, split to CmdGive +

docstring edit, options and docstring edit to CmdNick.
---
 evennia/commands/default/general.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 7bf861c91f..932c4fe898 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -88,8 +88,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
     Switches:
       inputline - replace on the inputline (default)
       object    - replace on object-lookup
-      account    - replace on account-lookup
-
+      account   - replace on account-lookup
       list      - show all defined aliases (also "nicks" works)
       delete    - remove nick by index in /list
       clearall  - clear all nicks
@@ -118,6 +117,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
 
     """
     key = "nick"
+    options = ("inputline", "object", "account", "list", "delete", "clearall")
     aliases = ["nickname", "nicks"]
     locks = "cmd:all()"
 
@@ -377,12 +377,13 @@ class CmdGive(COMMAND_DEFAULT_CLASS):
     give away something to someone
 
     Usage:
-      give <inventory obj> = <target>
+      give <inventory obj> <to||=> <target>
 
     Gives an items from your inventory to another character,
     placing it in their inventory.
     """
     key = "give"
+    split = " to "
     locks = "cmd:all()"
     arg_regex = r"\s|$"
 

From 18bce388d82096eb30694d1b708e2304e524c081 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Mar 2018 10:12:34 +0100
Subject: [PATCH 148/217] Allow nick command to list individual nicks

---
 evennia/commands/default/general.py | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index ff377119fa..2f4c51a227 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -145,8 +145,9 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
         caller = self.caller
         account = self.caller.account or caller
         switches = self.switches
-        nicktypes = [switch for switch in switches if switch in (
-            "object", "account", "inputline")] or ["inputline"]
+        nicktypes = [switch for switch in switches if switch in ("object", "account", "inputline")]
+        specified_nicktype = bool(nicktypes)
+        nicktypes = nicktypes if specified_nicktype else ["inputline"]
 
         nicklist = (utils.make_iter(caller.nicks.get(category="inputline", return_obj=True) or []) +
                     utils.make_iter(caller.nicks.get(category="object", return_obj=True) or []) +
@@ -197,6 +198,28 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
                            nicktypestr, old_nickstring, old_replstring))
                 return
 
+        if not self.rhs and self.lhs:
+            # check what a nick is set to
+            strings = []
+            if not specified_nicktype:
+                nicktypes = ("object", "account", "inputline")
+            for nicktype in nicktypes:
+                if nicktype == "account":
+                    obj = account
+                else:
+                    obj = caller
+                nicks = utils.make_iter(obj.nicks.get(category=nicktype, return_obj=True))
+                for nick in nicks:
+                    _, _, nick, repl = nick.value
+                    if nick.startswith(self.lhs):
+                        strings.append("{}-nick: '{}' -> '{}'".format(
+                            nicktype.capitalize(), nick, repl))
+            if strings:
+                caller.msg("\n".join(strings))
+            else:
+                caller.msg("No nicks found matching '{}'".format(self.lhs))
+            return
+
         if not self.args or not self.lhs:
             caller.msg("Usage: nick[/switches] nickname = [realname]")
             return

From 63e2b236f930fc2c621158a8626003e9277052f0 Mon Sep 17 00:00:00 2001
From: arumford <arumford@learfield.com>
Date: Wed, 7 Feb 2018 14:22:38 -0600
Subject: [PATCH 149/217] typo in docstring.

---
 evennia/comms/channelhandler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/comms/channelhandler.py b/evennia/comms/channelhandler.py
index 02c9e19291..058b7d9ba4 100644
--- a/evennia/comms/channelhandler.py
+++ b/evennia/comms/channelhandler.py
@@ -159,7 +159,7 @@ class ChannelHandler(object):
     """
     The ChannelHandler manages all active in-game channels and
     dynamically creates channel commands for users so that they can
-    just give the channek's key or alias to write to it. Whenever a
+    just give the channel's key or alias to write to it. Whenever a
     new channel is created in the database, the update() method on
     this handler must be called to sync it with the database (this is
     done automatically if creating the channel with

From 6a5ebda9fb26804350ccee17c0fa034b99324ec3 Mon Sep 17 00:00:00 2001
From: Nicholas Matlaga <nmatlaga@outlawtack.com>
Date: Tue, 13 Feb 2018 12:49:55 -0500
Subject: [PATCH 150/217] Change if statement to better handle objects; move
 options dict before at_msg_receive call to allow channels to be known in hook

---
 evennia/comms/models.py    | 4 +---
 evennia/objects/objects.py | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/evennia/comms/models.py b/evennia/comms/models.py
index c456a6e72c..1123e4e5b6 100644
--- a/evennia/comms/models.py
+++ b/evennia/comms/models.py
@@ -585,9 +585,7 @@ class SubscriptionHandler(object):
         for obj in self.all():
             from django.core.exceptions import ObjectDoesNotExist
             try:
-                if hasattr(obj, 'account'):
-                    if not obj.account:
-                        continue
+                if hasattr(obj, 'account') and obj.account:
                     obj = obj.account
                 if not obj.is_connected:
                     continue
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 9e4d8d588a..5572ef26e2 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -553,6 +553,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
                     obj.at_msg_send(text=text, to_obj=self, **kwargs)
                 except Exception:
                     logger.log_trace()
+        kwargs["options"] = options
         try:
             if not self.at_msg_receive(text=text, **kwargs):
                 # if at_msg_receive returns false, we abort message to this object
@@ -560,7 +561,6 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
         except Exception:
             logger.log_trace()
 
-        kwargs["options"] = options
 
         if text and not (isinstance(text, basestring) or isinstance(text, tuple)):
             # sanitize text before sending across the wire

From af4426026b9a7eb78580ebc8c22ffff9dbe2b1b9 Mon Sep 17 00:00:00 2001
From: Nicholas Matlaga <nmatlaga@outlawtack.com>
Date: Tue, 13 Feb 2018 12:54:03 -0500
Subject: [PATCH 151/217] add in is_connected property to base objects

---
 evennia/objects/objects.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index 5572ef26e2..037f3ff019 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -210,6 +210,14 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
     def sessions(self):
         return ObjectSessionHandler(self)
 
+    @property
+    def is_connected(self):
+        # we get an error for objects subscribed to channels without this
+        if self.account: # seems sane to pass on the account
+            return self.account.is_connected
+        else:
+            return False
+
     @property
     def has_account(self):
         """

From 84ecef616fa3617a42fe0fd08bec2e24293ec53b Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 21 Feb 2018 20:18:33 +0100
Subject: [PATCH 152/217] Catch the case of a prematurely deleted guest
 account. Resolves #1500.

---
 evennia/typeclasses/attributes.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/evennia/typeclasses/attributes.py b/evennia/typeclasses/attributes.py
index 84a21c0c27..3f8b4cd742 100644
--- a/evennia/typeclasses/attributes.py
+++ b/evennia/typeclasses/attributes.py
@@ -282,6 +282,8 @@ class AttributeHandler(object):
                          "attribute__db_attrtype": self._attrtype,
                          "attribute__db_key__iexact": key.lower(),
                          "attribute__db_category__iexact": category.lower() if category else None}
+                if not self.obj.pk:
+                    return []
                 conn = getattr(self.obj, self._m2m_fieldname).through.objects.filter(**query)
                 if conn:
                     attr = conn[0].attribute

From ceb904303e2b688cb59f32870e81c3c640712b2a Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 21 Feb 2018 20:34:29 +0100
Subject: [PATCH 153/217] Add warning if Favico.js library is not reachable

---
 evennia/web/webclient/templates/webclient/base.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/evennia/web/webclient/templates/webclient/base.html b/evennia/web/webclient/templates/webclient/base.html
index 30a68c498f..863a90ba11 100644
--- a/evennia/web/webclient/templates/webclient/base.html
+++ b/evennia/web/webclient/templates/webclient/base.html
@@ -25,7 +25,7 @@ JQuery available.
 
     <script type="text/javascript" charset="utf-8">
         if(!window.jQuery) {
-            document.write("<div class='err'>jQuery library not found or the online version could not be reached.</div>");
+            document.write("<div class='err'>jQuery library not found or the online version could not be reached. Check so Javascript is not blocked in your browser.</div>");
         }
     </script>
 
@@ -57,6 +57,12 @@ JQuery available.
     {% endblock %}
 
     <script src="https://cdn.rawgit.com/ejci/favico.js/master/favico-0.3.10.min.js" language="javascript" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript" charset="utf-8">
+        if(!window.Favico) {
+            document.write("<div class='err'>Favico.js library not found or the online version could not be reached. Check so Javascript is not blocked in your browser.</div>");
+        }
+    </script>
+
 
   </head>
   <body>

From 95caa0085a8d9631ed35390f5b0879c4bf09aae1 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 1 Mar 2018 20:13:36 +0100
Subject: [PATCH 154/217] Fix bug in accessing attribute through manager

---
 evennia/typeclasses/managers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py
index 67eb9e065b..dcb147cb70 100644
--- a/evennia/typeclasses/managers.py
+++ b/evennia/typeclasses/managers.py
@@ -8,6 +8,8 @@ import shlex
 from django.db.models import Q
 from evennia.utils import idmapper
 from evennia.utils.utils import make_iter, variable_from_module, to_unicode
+from evennia.typeclasses.attributes import Attribute
+from evennia.typeclasses.tags import Tag
 
 __all__ = ("TypedObjectManager", )
 _GA = object.__getattribute__
@@ -56,7 +58,7 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
         dbmodel = self.model.__dbclass__.__name__.lower()
         query = [("attribute__db_attrtype", attrtype), ("attribute__db_model", dbmodel)]
         if obj:
-            query.append(("%s__id" % self.model.__name__.lower(), obj.id))
+            query.append(("%s__id" % self.model.__dbclass__.__name__.lower(), obj.id))
         if key:
             query.append(("attribute__db_key", key))
         if category:

From f4877f8bbc862e8f1b38e7ebda23ea36174526dd Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 1 Mar 2018 20:23:18 +0100
Subject: [PATCH 155/217] Make desc/set abide by edit/control locks

---
 evennia/commands/default/building.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index 4bc107dcfb..b43e6f93c3 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -588,6 +588,9 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
         if not obj:
             return
 
+        if not (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+            self.caller.msg("You don't have permission to edit the description of %s." % obj.key)
+
         self.caller.db.evmenu_target = obj
         # launch the editor
         EvEditor(self.caller, loadfunc=_desc_load, savefunc=_desc_save,
@@ -617,7 +620,7 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
             if not obj:
                 return
             desc = self.args
-        if obj.access(caller, "edit"):
+        if (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
             obj.db.desc = desc
             caller.msg("The description was set on %s." % obj.get_display_name(caller))
         else:
@@ -1637,6 +1640,10 @@ class CmdSetAttribute(ObjManipCommand):
         result = []
         if "edit" in self.switches:
             # edit in the line editor
+            if not (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+                caller.msg("You don't have permission to edit %s." % obj.key)
+                return
+
             if len(attrs) > 1:
                 caller.msg("The Line editor can only be applied "
                            "to one attribute at a time.")
@@ -1657,12 +1664,18 @@ class CmdSetAttribute(ObjManipCommand):
                 return
             else:
                 # deleting the attribute(s)
+                if not (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+                    caller.msg("You don't have permission to edit %s." % obj.key)
+                    return
                 for attr in attrs:
                     if not self.check_attr(obj, attr):
                         continue
                     result.append(self.rm_attr(obj, attr))
         else:
             # setting attribute(s). Make sure to convert to real Python type before saving.
+            if not (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+                caller.msg("You don't have permission to edit %s." % obj.key)
+                return
             for attr in attrs:
                 if not self.check_attr(obj, attr):
                     continue

From 8fcdb4bc1ff326f3c19339e4191cfd1c6a0124f2 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 1 Mar 2018 20:53:20 +0100
Subject: [PATCH 156/217] Don't allow those with 'edit' access to obj to change
 the 'control' lock.

---
 evennia/commands/default/building.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index b43e6f93c3..a964e880eb 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -1909,9 +1909,16 @@ class CmdLock(ObjManipCommand):
                 obj = caller.search(objname)
                 if not obj:
                     return
-            if not (obj.access(caller, 'control') or obj.access(caller, "edit")):
+            has_control_access = obj.access(caller, 'control')
+            if access_type == 'control' and not has_control_access:
+                # only allow to change 'control' access if you have 'control' access already
+                caller.msg("You need 'control' access to change this type of lock.")
+                return
+
+            if not has_control_access or obj.access(caller, "edit"):
                 caller.msg("You are not allowed to do that.")
                 return
+
             lockdef = obj.locks.get(access_type)
 
             if lockdef:

From d2566d4982cdd80dc8d9a0dc9567480500385cd7 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 1 Mar 2018 21:56:40 +0100
Subject: [PATCH 157/217] Make get_attribute/tag manager methods return
 querysets

---
 evennia/typeclasses/managers.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py
index dcb147cb70..0bede3b192 100644
--- a/evennia/typeclasses/managers.py
+++ b/evennia/typeclasses/managers.py
@@ -68,7 +68,9 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
         elif value:
             # strvalue and value are mutually exclusive
             query.append(("attribute__db_value", value))
-        return [th.attribute for th in self.model.db_attributes.through.objects.filter(**dict(query))]
+        return Attribute.objects.filter(
+            pk__in=self.model.db_attributes.through.objects.filter(
+                **dict(query)).values_list("attribute_id", flat=True))
 
     def get_nick(self, key=None, category=None, value=None, strvalue=None, obj=None):
         """
@@ -191,7 +193,9 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
                 query.append(("tag__db_key", key))
             if category:
                 query.append(("tag__db_category", category))
-            return [th.tag for th in self.model.db_tags.through.objects.filter(**dict(query))]
+            return Tag.objects.filter(
+                pk__in=self.model.db_tags.through.objects.filter(
+                    **dict(query)).values_list("tag_id", flat=True))
 
     def get_permission(self, key=None, category=None, obj=None):
         """

From d5215753b8408a18aea99e7dce7354444bdf4398 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 1 Mar 2018 22:21:22 +0100
Subject: [PATCH 158/217] Remove mutual exclusivity between value/strvalue when
 searching for Attributes with manager

---
 evennia/typeclasses/managers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py
index 0bede3b192..25488f4987 100644
--- a/evennia/typeclasses/managers.py
+++ b/evennia/typeclasses/managers.py
@@ -65,8 +65,8 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
             query.append(("attribute__db_category", category))
         if strvalue:
             query.append(("attribute__db_strvalue", strvalue))
-        elif value:
-            # strvalue and value are mutually exclusive
+        if value:
+            # no reason to make strvalue/value mutually exclusive at this level
             query.append(("attribute__db_value", value))
         return Attribute.objects.filter(
             pk__in=self.model.db_attributes.through.objects.filter(

From 484ab42dec5330f8a927bf2b06266050d87c08b4 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Mar 2018 10:12:34 +0100
Subject: [PATCH 159/217] Allow nick command to list individual nicks

---
 evennia/commands/default/general.py | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 7bf861c91f..dd0ef11773 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -145,8 +145,9 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
         caller = self.caller
         account = self.caller.account or caller
         switches = self.switches
-        nicktypes = [switch for switch in switches if switch in (
-            "object", "account", "inputline")] or ["inputline"]
+        nicktypes = [switch for switch in switches if switch in ("object", "account", "inputline")]
+        specified_nicktype = bool(nicktypes)
+        nicktypes = nicktypes if specified_nicktype else ["inputline"]
 
         nicklist = (utils.make_iter(caller.nicks.get(category="inputline", return_obj=True) or []) +
                     utils.make_iter(caller.nicks.get(category="object", return_obj=True) or []) +
@@ -197,6 +198,28 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
                            nicktypestr, old_nickstring, old_replstring))
                 return
 
+        if not self.rhs and self.lhs:
+            # check what a nick is set to
+            strings = []
+            if not specified_nicktype:
+                nicktypes = ("object", "account", "inputline")
+            for nicktype in nicktypes:
+                if nicktype == "account":
+                    obj = account
+                else:
+                    obj = caller
+                nicks = utils.make_iter(obj.nicks.get(category=nicktype, return_obj=True))
+                for nick in nicks:
+                    _, _, nick, repl = nick.value
+                    if nick.startswith(self.lhs):
+                        strings.append("{}-nick: '{}' -> '{}'".format(
+                            nicktype.capitalize(), nick, repl))
+            if strings:
+                caller.msg("\n".join(strings))
+            else:
+                caller.msg("No nicks found matching '{}'".format(self.lhs))
+            return
+
         if not self.args or not self.lhs:
             caller.msg("Usage: nick[/switches] nickname = [realname]")
             return

From 28cbee465921696ae932e6e46175942397c9b4e2 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Mar 2018 10:27:49 +0100
Subject: [PATCH 160/217] Store all nicks on caller (don't store
 'account-nicks' on caller.account)

---
 evennia/commands/default/general.py | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index dd0ef11773..a5cc179ac7 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -143,7 +143,6 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
             return re.sub(r"(\$[0-9]+|\*|\?|\[.+?\])", r"|Y\1|n", string)
 
         caller = self.caller
-        account = self.caller.account or caller
         switches = self.switches
         nicktypes = [switch for switch in switches if switch in ("object", "account", "inputline")]
         specified_nicktype = bool(nicktypes)
@@ -151,7 +150,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
 
         nicklist = (utils.make_iter(caller.nicks.get(category="inputline", return_obj=True) or []) +
                     utils.make_iter(caller.nicks.get(category="object", return_obj=True) or []) +
-                    utils.make_iter(account.nicks.get(category="account", return_obj=True) or []))
+                    utils.make_iter(caller.nicks.get(category="account", return_obj=True) or []))
 
         if 'list' in switches or self.cmdstring in ("nicks", "@nicks"):
 
@@ -190,10 +189,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
                 nicktype = oldnick.category
                 nicktypestr = "%s-nick" % nicktype.capitalize()
 
-                if nicktype == "account":
-                    account.nicks.remove(old_nickstring, category=nicktype)
-                else:
-                    caller.nicks.remove(old_nickstring, category=nicktype)
+                caller.nicks.remove(old_nickstring, category=nicktype)
                 caller.msg("%s removed: '|w%s|n' -> |w%s|n." % (
                            nicktypestr, old_nickstring, old_replstring))
                 return
@@ -204,11 +200,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
             if not specified_nicktype:
                 nicktypes = ("object", "account", "inputline")
             for nicktype in nicktypes:
-                if nicktype == "account":
-                    obj = account
-                else:
-                    obj = caller
-                nicks = utils.make_iter(obj.nicks.get(category=nicktype, return_obj=True))
+                nicks = utils.make_iter(caller.nicks.get(category=nicktype, return_obj=True))
                 for nick in nicks:
                     _, _, nick, repl = nick.value
                     if nick.startswith(self.lhs):
@@ -237,16 +229,11 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
         errstring = ""
         string = ""
         for nicktype in nicktypes:
-            if nicktype == "account":
-                obj = account
-            else:
-                obj = caller
-
             nicktypestr = "%s-nick" % nicktype.capitalize()
             old_nickstring = None
             old_replstring = None
 
-            oldnick = obj.nicks.get(key=nickstring, category=nicktype, return_obj=True)
+            oldnick = caller.nicks.get(key=nickstring, category=nicktype, return_obj=True)
             if oldnick:
                 _, _, old_nickstring, old_replstring = oldnick.value
             if replstring:
@@ -261,7 +248,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
                 else:
                     string += "\n%s '|w%s|n' mapped to '|w%s|n'." % (nicktypestr, nickstring, replstring)
                 try:
-                    obj.nicks.add(nickstring, replstring, category=nicktype)
+                    caller.nicks.add(nickstring, replstring, category=nicktype)
                 except NickTemplateInvalid:
                     caller.msg("You must use the same $-markers both in the nick and in the replacement.")
                     return

From cec37fc86f7c19476f8e8c3a7ffe884d9534e185 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Mar 2018 10:30:14 +0100
Subject: [PATCH 161/217] Add nick-command to account cmdset

---
 evennia/commands/default/cmdset_account.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evennia/commands/default/cmdset_account.py b/evennia/commands/default/cmdset_account.py
index 4e357a2ce0..d7b887c017 100644
--- a/evennia/commands/default/cmdset_account.py
+++ b/evennia/commands/default/cmdset_account.py
@@ -11,7 +11,7 @@ command method rather than caller.msg().
 
 from evennia.commands.cmdset import CmdSet
 from evennia.commands.default import help, comms, admin, system
-from evennia.commands.default import building, account
+from evennia.commands.default import building, account, general
 
 
 class AccountCmdSet(CmdSet):
@@ -39,6 +39,9 @@ class AccountCmdSet(CmdSet):
         self.add(account.CmdColorTest())
         self.add(account.CmdQuell())
 
+        # nicks
+        self.add(general.CmdNick())
+
         # testing
         self.add(building.CmdExamine())
 

From 004fa3cc5a617756fc36053517724c9d89366cad Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Mar 2018 11:01:06 +0100
Subject: [PATCH 162/217] Clarify nick-deletion mechanism

---
 evennia/commands/default/general.py | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index a5cc179ac7..f6f624032d 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -173,26 +173,37 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
 
         if 'delete' in switches or 'del' in switches:
             if not self.args or not self.lhs:
-                caller.msg("usage nick/delete #num ('nicks' for list)")
+                caller.msg("usage nick/delete <nick> or <#num> ('nicks' for list)")
                 return
             # see if a number was given
             arg = self.args.lstrip("#")
+            oldnicks = []
             if arg.isdigit():
                 # we are given a index in nicklist
                 delindex = int(arg)
                 if 0 < delindex <= len(nicklist):
-                    oldnick = nicklist[delindex - 1]
-                    _, _, old_nickstring, old_replstring = oldnick.value
+                    oldnicks.append(nicklist[delindex - 1])
                 else:
                     caller.msg("Not a valid nick index. See 'nicks' for a list.")
                     return
-                nicktype = oldnick.category
-                nicktypestr = "%s-nick" % nicktype.capitalize()
+            else:
+                if not specified_nicktype:
+                    nicktypes = ("object", "account", "inputline")
+                for nicktype in nicktypes:
+                    oldnicks.append(caller.nicks.get(arg, category=nicktype, return_obj=True))
 
-                caller.nicks.remove(old_nickstring, category=nicktype)
-                caller.msg("%s removed: '|w%s|n' -> |w%s|n." % (
-                           nicktypestr, old_nickstring, old_replstring))
-                return
+            oldnicks = [oldnick for oldnick in oldnicks if oldnick]
+            if oldnicks:
+                for oldnick in oldnicks:
+                    nicktype = oldnick.category
+                    nicktypestr = "%s-nick" % nicktype.capitalize()
+                    _, _, old_nickstring, old_replstring = oldnick.value
+                    caller.nicks.remove(old_nickstring, category=nicktype)
+                    caller.msg("%s removed: '|w%s|n' -> |w%s|n." % (
+                               nicktypestr, old_nickstring, old_replstring))
+            else:
+                caller.msg("No matching nicks to remove.")
+            return
 
         if not self.rhs and self.lhs:
             # check what a nick is set to

From 557daad7086f0375ef90eb1afcec73c7543eeb0b Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Mar 2018 11:24:20 +0100
Subject: [PATCH 163/217] Fix unittests

---
 evennia/commands/default/tests.py | 4 ++--
 evennia/comms/models.py           | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 38829f0cf5..dba1d329cc 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -130,8 +130,8 @@ class TestGeneral(CommandTest):
         self.call(general.CmdNick(), "/account testalias = testaliasedstring2", "Accountnick 'testalias' mapped to 'testaliasedstring2'.")
         self.call(general.CmdNick(), "/object testalias = testaliasedstring3", "Objectnick 'testalias' mapped to 'testaliasedstring3'.")
         self.assertEqual(u"testaliasedstring1", self.char1.nicks.get("testalias"))
-        self.assertEqual(None, self.char1.nicks.get("testalias", category="account"))
-        self.assertEqual(u"testaliasedstring2", self.char1.account.nicks.get("testalias", category="account"))
+        self.assertEqual(u"testaliasedstring2", self.char1.nicks.get("testalias", category="account"))
+        self.assertEqual(None, self.char1.account.nicks.get("testalias", category="account"))
         self.assertEqual(u"testaliasedstring3", self.char1.nicks.get("testalias", category="object"))
 
     def test_get_and_drop(self):
diff --git a/evennia/comms/models.py b/evennia/comms/models.py
index 1123e4e5b6..c358cf352b 100644
--- a/evennia/comms/models.py
+++ b/evennia/comms/models.py
@@ -527,7 +527,6 @@ class SubscriptionHandler(object):
         for subscriber in make_iter(entity):
             if subscriber:
                 clsname = subscriber.__dbclass__.__name__
-                print("subscriber:", subscriber, clsname)
                 # chooses the right type
                 if clsname == "ObjectDB":
                     self.obj.db_object_subscriptions.add(subscriber)

From 37313fad4fb0f511c7715c47f38d9f7bf0fd94f7 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Mar 2018 18:30:48 +0100
Subject: [PATCH 164/217] Fix a teleport example missing =

---
 evennia/commands/default/building.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index 7085ce2f98..0afeea8fe5 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -2331,7 +2331,7 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
 
     Examples:
       @tel Limbo
-      @tel/quiet box Limbo
+      @tel/quiet box = Limbo
       @tel/tonone box
 
     Switches:
@@ -2347,7 +2347,8 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
       loc - teleport object to the target's location instead of its contents
 
     Teleports an object somewhere. If no object is given, you yourself
-    is teleported to the target location.     """
+    is teleported to the target location.
+    """
     key = "@tel"
     aliases = "@teleport"
     locks = "cmd:perm(teleport) or perm(Builder)"

From 0d27f3ac8043c724bbf04adebd746ad395ccf4c6 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Mar 2018 10:12:34 +0100
Subject: [PATCH 165/217] Allow nick command to list individual nicks

---
 evennia/commands/default/general.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index f6f624032d..7a50f41eda 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -223,6 +223,28 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
                 caller.msg("No nicks found matching '{}'".format(self.lhs))
             return
 
+        if not self.rhs and self.lhs:
+            # check what a nick is set to
+            strings = []
+            if not specified_nicktype:
+                nicktypes = ("object", "account", "inputline")
+            for nicktype in nicktypes:
+                if nicktype == "account":
+                    obj = account
+                else:
+                    obj = caller
+                nicks = utils.make_iter(obj.nicks.get(category=nicktype, return_obj=True))
+                for nick in nicks:
+                    _, _, nick, repl = nick.value
+                    if nick.startswith(self.lhs):
+                        strings.append("{}-nick: '{}' -> '{}'".format(
+                            nicktype.capitalize(), nick, repl))
+            if strings:
+                caller.msg("\n".join(strings))
+            else:
+                caller.msg("No nicks found matching '{}'".format(self.lhs))
+            return
+
         if not self.args or not self.lhs:
             caller.msg("Usage: nick[/switches] nickname = [realname]")
             return

From 61560e53a4b44b07f44a23d7337d1ebed5443c7b Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Mar 2018 18:30:48 +0100
Subject: [PATCH 166/217] Fix a teleport example missing =

---
 evennia/commands/default/building.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index a964e880eb..853ca6b88f 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -2396,7 +2396,7 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
 
     Examples:
       @tel Limbo
-      @tel/quiet box Limbo
+      @tel/quiet box = Limbo
       @tel/tonone box
 
     Switches:
@@ -2412,7 +2412,8 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
       loc - teleport object to the target's location instead of its contents
 
     Teleports an object somewhere. If no object is given, you yourself
-    is teleported to the target location.     """
+    is teleported to the target location.
+    """
     key = "@tel"
     aliases = "@teleport"
     locks = "cmd:perm(teleport) or perm(Builder)"

From 1ffe0d78b861e203323c27e51e219f2d3d0aba5f Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 3 Mar 2018 19:56:16 +0100
Subject: [PATCH 167/217] Don't allow recog:ing a masked person

---
 evennia/contrib/rpsystem.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/evennia/contrib/rpsystem.py b/evennia/contrib/rpsystem.py
index d469aff3d9..a56d2de731 100644
--- a/evennia/contrib/rpsystem.py
+++ b/evennia/contrib/rpsystem.py
@@ -708,12 +708,15 @@ class RecogHandler(object):
                 than `max_length`.
 
         """
+        if not obj.access(self.obj, "enable_recog", default=True):
+            raise SdescError("This person is unrecognizeable.")
+
         # strip emote components from recog
-        recog = _RE_REF.sub(r"\1",
-                            _RE_REF_LANG.sub(r"\1",
-                                             _RE_SELF_REF.sub(r"",
-                                                              _RE_LANGUAGE.sub(r"",
-                                                                               _RE_OBJ_REF_START.sub(r"", recog)))))
+        recog = _RE_REF.sub(
+            r"\1", _RE_REF_LANG.sub(
+                r"\1", _RE_SELF_REF.sub(
+                    r"", _RE_LANGUAGE.sub(
+                        r"", _RE_OBJ_REF_START.sub(r"", recog)))))
 
         # make an recog clean of ANSI codes
         cleaned_recog = ansi.strip_ansi(recog)

From 2b9f0750e54fd122be54e82740573a428002fb2c Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 14:08:10 -0500
Subject: [PATCH 168/217] Addresses requested changes + shim code

class variable name changes handled by shim
---
 evennia/commands/default/muxcommand.py | 88 +++++++++++++-------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/evennia/commands/default/muxcommand.py b/evennia/commands/default/muxcommand.py
index 6d731ea14f..93606cdbe5 100644
--- a/evennia/commands/default/muxcommand.py
+++ b/evennia/commands/default/muxcommand.py
@@ -80,9 +80,10 @@ class MuxCommand(Command):
         start with the switch indicator /.
 
         Optional variables to aid in parsing, if set:
-          self.options = (tuple of valid /switches expected
-                          by this command (without the /))
-          self.split = Alternate string delimiter to separate left/right hand side.
+          self.switch_options  - (tuple of valid /switches expected by this
+                                  command (without the /))
+          self.rhs_split       - Alternate string delimiter to separate
+                                 left/right hand sides.
 
         This parser breaks self.args into its constituents and stores them in the
         following variables:
@@ -102,6 +103,18 @@ class MuxCommand(Command):
         """
         raw = self.args
         args = raw.strip()
+        # Temporary code to use the old settings before renaming     # #
+        if hasattr(self, "options"):                                   #
+            self.switch_options = self.options                         #
+        if hasattr(self, "split") and not hasattr(self, "rhs_split"):  #
+            self.rhs_split = self.split                            # # #
+        # Without explicitly setting these attributes, they assume default values:
+        if not hasattr(self, "switch_options"):
+            self.switch_options = None
+        if not hasattr(self, "rhs_split"):
+            self.rhs_split = "="
+        if not hasattr(self, "account_caller"):
+            self.account_caller = False
 
         # split out switches
         switches = []
@@ -114,17 +127,19 @@ class MuxCommand(Command):
             else:
                 args = ""
                 switches = switches[0].split('/')
-            # Parse mux options, comparing them against user-provided switches, expanding abbreviations.
-            if hasattr(self, "options") and self.options and switches:
-                # If specific options are known, test them against given switches.
+            # If user-provides switches, parse them with parser switch options.
+            if switches and self.switch_options:
                 valid_switches, unused_switches, extra_switches = [], [], []
                 for element in switches:
-                    option_check = [each for each in self.options if each.lower().startswith(element.lower())]
-                    if len(option_check) > 1:
+                    option_check = [each for each in self.switch_options
+                                    if each.lower() == element.lower() or
+                                    each.lower().startswith(element.lower())]
+                    match_count = len(option_check)
+                    if match_count > 1:
                         extra_switches += option_check  # Either the option provided is ambiguous,
-                    elif len(option_check) == 1:
+                    elif match_count == 1:
                         valid_switches += option_check  # or it is a valid option abbreviation,
-                    elif len(option_check) == 0:
+                    elif match_count == 0:
                         unused_switches += [element]  # or an extraneous option to be ignored.
                 if extra_switches:  # User provided switches
                     self.msg('|g%s|n: |wAmbiguous switch supplied: Did you mean /|C%s|w?' %
@@ -138,21 +153,22 @@ class MuxCommand(Command):
 
         # check for arg1, arg2, ... = argA, argB, ... constructs
         lhs, rhs = args.strip(), None
-        lhslist, rhslist = [arg.strip() for arg in args.split(',')], []
+        best_split = self.rhs_split
         if lhs:
-            if '=' in lhs:  # Default delimiter has priority
-                # Parse to separate left into left/right sides using default delimiter
-                lhs, rhs = lhs.split('=', 1)
-            elif hasattr(self, "split") and self.split and self.split in lhs:
-                # Parse to separate left into left/right sides using a custom delimiter, if provided.
-                lhs, rhs = lhs.split(self.split, 1)  # At most, split once, into left and right parts.
-            # Trim user-injected whitespace
-            rhs = rhs.strip() if rhs is not None else None
-            lhs = lhs.strip()
-            # Further split left/right sides by comma delimiter
-            lhslist = [arg.strip() for arg in lhs.split(',')] if lhs is not None else ""
-            rhslist = [arg.strip() for arg in rhs.split(',')] if rhs is not None else ""
-
+            if hasattr(self.rhs_split, '__iter__'):
+                for this_split in self.rhs_split:
+                    if this_split in lhs:  # First delimiter to allow a successful
+                        best_split = this_split  # split is the best split.
+                        break
+            # Parse to separate left into left/right sides using best_split delimiter string
+            if best_split in lhs:
+                lhs, rhs = lhs.split(best_split, 1)
+        # Trim user-injected whitespace
+        rhs = rhs.strip() if rhs is not None else None
+        lhs = lhs.strip()
+        # Further split left/right sides by comma delimiter
+        lhslist = [arg.strip() for arg in lhs.split(',')] if lhs is not None else ""
+        rhslist = [arg.strip() for arg in rhs.split(',')] if rhs is not None else ""
         # save to object properties:
         self.raw = raw
         self.switches = switches
@@ -167,7 +183,7 @@ class MuxCommand(Command):
         # sure that self.caller is always the account if possible. We also create
         # a special property "character" for the puppeted object, if any. This
         # is convenient for commands defined on the Account only.
-        if hasattr(self, "account_caller") and self.account_caller:
+        if self.account_caller:
             if utils.inherits_from(self.caller, "evennia.objects.objects.DefaultObject"):
                 # caller is an Object/Character
                 self.character = self.caller
@@ -203,10 +219,8 @@ class MuxCommand(Command):
         string += "\nraw argument (self.raw): |w%s|n \n" % self.raw
         string += "cmd args (self.args): |w%s|n\n" % self.args
         string += "cmd switches (self.switches): |w%s|n\n" % self.switches
-        if hasattr(self, "options"):  # Optional
-            string += "cmd options (self.options): |w%s|n\n" % self.options
-        if hasattr(self, "split"):  # Optional
-            string += "cmd parse left/right using (self.split): |w%s|n\n" % self.split
+        string += "cmd options (self.switch_options): |w%s|n\n" % self.switch_options
+        string += "cmd parse left/right using (self.rhs_split): |w%s|n\n" % self.rhs_split
         string += "space-separated arg list (self.arglist): |w%s|n\n" % self.arglist
         string += "lhs, left-hand side of '=' (self.lhs): |w%s|n\n" % self.lhs
         string += "lhs, comma separated (self.lhslist): |w%s|n\n" % self.lhslist
@@ -231,18 +245,4 @@ class MuxAccountCommand(MuxCommand):
     character is actually attached to this Account and Session.
     """
 
-    def parse(self):
-        """
-        We run the parent parser as usual, then fix the result
-        """
-        super(MuxAccountCommand, self).parse()
-
-        if utils.inherits_from(self.caller, "evennia.objects.objects.DefaultObject"):
-            # caller is an Object/Character
-            self.character = self.caller
-            self.caller = self.caller.account
-        elif utils.inherits_from(self.caller, "evennia.accounts.accounts.DefaultAccount"):
-            # caller was already an Account
-            self.character = self.caller.get_puppet(self.session)
-        else:
-            self.character = None
+    account_caller = True  # Using MuxAccountCommand explicitly defaults the caller to an account

From f1f94b47887964495928eec871f03a29514fdb4e Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 14:30:37 -0500
Subject: [PATCH 169/217] class var options renamed switch_options

---
 evennia/commands/default/account.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/commands/default/account.py b/evennia/commands/default/account.py
index 81539bba17..40805f7465 100644
--- a/evennia/commands/default/account.py
+++ b/evennia/commands/default/account.py
@@ -467,7 +467,7 @@ class CmdOption(COMMAND_DEFAULT_CLASS):
     """
     key = "@option"
     aliases = "@options"
-    options = ("save", "clear")
+    switch_options = ("save", "clear")
     locks = "cmd:all()"
 
     # this is used by the parent
@@ -651,7 +651,7 @@ class CmdQuit(COMMAND_DEFAULT_CLASS):
     game. Use the /all switch to disconnect from all sessions.
     """
     key = "@quit"
-    options = ("all",)
+    switch_options = ("all",)
     locks = "cmd:all()"
 
     # this is used by the parent

From d0cf78fae9cbdb5c9b10b2288f09073b105c292c Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 14:32:52 -0500
Subject: [PATCH 170/217] class var options renamed switch_options

---
 evennia/commands/default/admin.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/evennia/commands/default/admin.py b/evennia/commands/default/admin.py
index dba0c49bdd..4e517b77f9 100644
--- a/evennia/commands/default/admin.py
+++ b/evennia/commands/default/admin.py
@@ -36,7 +36,7 @@ class CmdBoot(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@boot"
-    options = ("quiet", "sid")
+    switch_options = ("quiet", "sid")
     locks = "cmd:perm(boot) or perm(Admin)"
     help_category = "Admin"
 
@@ -266,7 +266,7 @@ class CmdDelAccount(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@delaccount"
-    options = ("delobj",)
+    switch_options = ("delobj",)
     locks = "cmd:perm(delaccount) or perm(Developer)"
     help_category = "Admin"
 
@@ -343,7 +343,7 @@ class CmdEmit(COMMAND_DEFAULT_CLASS):
     """
     key = "@emit"
     aliases = ["@pemit", "@remit"]
-    options = ("room", "accounts", "contents")
+    switch_options = ("room", "accounts", "contents")
     locks = "cmd:perm(emit) or perm(Builder)"
     help_category = "Admin"
 
@@ -453,7 +453,7 @@ class CmdPerm(COMMAND_DEFAULT_CLASS):
     """
     key = "@perm"
     aliases = "@setperm"
-    options = ("del", "account")
+    switch_options = ("del", "account")
     locks = "cmd:perm(perm) or perm(Developer)"
     help_category = "Admin"
 

From 567254e028879d73f4e680925b474cf34fd9f63f Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 14:34:10 -0500
Subject: [PATCH 171/217] class var options renamed switch_options

---
 evennia/commands/default/batchprocess.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/commands/default/batchprocess.py b/evennia/commands/default/batchprocess.py
index bf09360c71..5970d35887 100644
--- a/evennia/commands/default/batchprocess.py
+++ b/evennia/commands/default/batchprocess.py
@@ -237,7 +237,7 @@ class CmdBatchCommands(_COMMAND_DEFAULT_CLASS):
     """
     key = "@batchcommands"
     aliases = ["@batchcommand", "@batchcmd"]
-    options = ("interactive",)
+    switch_options = ("interactive",)
     locks = "cmd:perm(batchcommands) or perm(Developer)"
     help_category = "Building"
 
@@ -348,7 +348,7 @@ class CmdBatchCode(_COMMAND_DEFAULT_CLASS):
     """
     key = "@batchcode"
     aliases = ["@batchcodes"]
-    options = ("interactive", "debug")
+    switch_options = ("interactive", "debug")
     locks = "cmd:superuser()"
     help_category = "Building"
 

From 51a9c7bfede3e7e58d51874d8d789dc2f78fa1c3 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 14:42:13 -0500
Subject: [PATCH 172/217] class vars options, split renamed

switch_options, rhs_split
---
 evennia/commands/default/building.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index f3e58790f5..e2f61d7054 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -124,7 +124,7 @@ class CmdSetObjAlias(COMMAND_DEFAULT_CLASS):
 
     key = "@alias"
     aliases = "@setobjalias"
-    options = ("category",)
+    switch_options = ("category",)
     locks = "cmd:perm(setobjalias) or perm(Builder)"
     help_category = "Building"
 
@@ -219,7 +219,7 @@ class CmdCopy(ObjManipCommand):
     """
 
     key = "@copy"
-    options = ("reset",)
+    switch_options = ("reset",)
     locks = "cmd:perm(copy) or perm(Builder)"
     help_category = "Building"
 
@@ -301,7 +301,7 @@ class CmdCpAttr(ObjManipCommand):
     If you don't supply a source object, yourself is used.
     """
     key = "@cpattr"
-    options = ("move",)
+    switch_options = ("move",)
     locks = "cmd:perm(cpattr) or perm(Builder)"
     help_category = "Building"
 
@@ -443,7 +443,7 @@ class CmdMvAttr(ObjManipCommand):
     object. If you don't supply a source object, yourself is used.
     """
     key = "@mvattr"
-    options = ("copy",)
+    switch_options = ("copy",)
     locks = "cmd:perm(mvattr) or perm(Builder)"
     help_category = "Building"
 
@@ -492,7 +492,7 @@ class CmdCreate(ObjManipCommand):
     """
 
     key = "@create"
-    options = ("drop",)
+    switch_options = ("drop",)
     locks = "cmd:perm(create) or perm(Builder)"
     help_category = "Building"
 
@@ -578,7 +578,7 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
     """
     key = "@desc"
     aliases = "@describe"
-    options = ("edit",)
+    switch_options = ("edit",)
     locks = "cmd:perm(desc) or perm(Builder)"
     help_category = "Building"
 
@@ -657,7 +657,7 @@ class CmdDestroy(COMMAND_DEFAULT_CLASS):
 
     key = "@destroy"
     aliases = ["@delete", "@del"]
-    options = ("override", "force")
+    switch_options = ("override", "force")
     locks = "cmd:perm(destroy) or perm(Builder)"
     help_category = "Building"
 
@@ -781,7 +781,7 @@ class CmdDig(ObjManipCommand):
     would be 'north;no;n'.
     """
     key = "@dig"
-    options = ("teleport",)
+    switch_options = ("teleport",)
     locks = "cmd:perm(dig) or perm(Builder)"
     help_category = "Building"
 
@@ -924,7 +924,7 @@ class CmdTunnel(COMMAND_DEFAULT_CLASS):
 
     key = "@tunnel"
     aliases = ["@tun"]
-    options = ("oneway", "tel")
+    switch_options = ("oneway", "tel")
     locks = "cmd: perm(tunnel) or perm(Builder)"
     help_category = "Building"
 
@@ -2285,7 +2285,7 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
 
     key = "@find"
     aliases = "@search, @locate"
-    options = ("room", "exit", "char", "exact", "loc")
+    switch_options = ("room", "exit", "char", "exact", "loc")
     locks = "cmd:perm(find) or perm(Builder)"
     help_category = "Building"
 
@@ -2426,8 +2426,8 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
     """
     key = "@tel"
     aliases = "@teleport"
-    options = ("quiet", "intoexit", "tonone", "loc")
-    split = " to "
+    switch_options = ("quiet", "intoexit", "tonone", "loc")
+    rhs_split = " to "
     locks = "cmd:perm(teleport) or perm(Builder)"
     help_category = "Building"
 
@@ -2535,7 +2535,7 @@ class CmdScript(COMMAND_DEFAULT_CLASS):
 
     key = "@script"
     aliases = "@addscript"
-    options = ("start", "stop")
+    switch_options = ("start", "stop")
     locks = "cmd:perm(script) or perm(Builder)"
     help_category = "Building"
 
@@ -2777,7 +2777,7 @@ class CmdSpawn(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@spawn"
-    options = ("noloc", )
+    switch_options = ("noloc", )
     locks = "cmd:perm(spawn) or perm(Builder)"
     help_category = "Building"
 

From d3c8cd0316e4a09d067e1e951e97680e19b01c3f Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 14:45:07 -0500
Subject: [PATCH 173/217] class var options renamed switch_options

---
 evennia/commands/default/comms.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/evennia/commands/default/comms.py b/evennia/commands/default/comms.py
index b654bd0297..d9fe0b0d20 100644
--- a/evennia/commands/default/comms.py
+++ b/evennia/commands/default/comms.py
@@ -385,7 +385,7 @@ class CmdCBoot(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@cboot"
-    options = ("quiet",)
+    switch_options = ("quiet",)
     locks = "cmd: not pperm(channel_banned)"
     help_category = "Comms"
 
@@ -454,7 +454,7 @@ class CmdCemit(COMMAND_DEFAULT_CLASS):
 
     key = "@cemit"
     aliases = ["@cmsg"]
-    options = ("sendername", "quiet")
+    switch_options = ("sendername", "quiet")
     locks = "cmd: not pperm(channel_banned) and pperm(Player)"
     help_category = "Comms"
 
@@ -685,7 +685,7 @@ class CmdPage(COMMAND_DEFAULT_CLASS):
 
     key = "page"
     aliases = ['tell']
-    options = ("last", "list")
+    switch_options = ("last", "list")
     locks = "cmd:not pperm(page_banned)"
     help_category = "Comms"
 
@@ -853,7 +853,7 @@ class CmdIRC2Chan(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@irc2chan"
-    options = ("delete", "remove", "disconnect", "list", "ssl")
+    switch_options = ("delete", "remove", "disconnect", "list", "ssl")
     locks = "cmd:serversetting(IRC_ENABLED) and pperm(Developer)"
     help_category = "Comms"
 
@@ -1020,7 +1020,7 @@ class CmdRSS2Chan(COMMAND_DEFAULT_CLASS):
     """
 
     key = "@rss2chan"
-    options = ("disconnect", "remove", "list")
+    switch_options = ("disconnect", "remove", "list")
     locks = "cmd:serversetting(RSS_ENABLED) and pperm(Developer)"
     help_category = "Comms"
 

From 891c7c06f6b12cb10d5076003edd8c37c52d4da2 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 14:52:29 -0500
Subject: [PATCH 174/217]  class vars options, split renamed

switch_options, rhs_split
---
 evennia/commands/default/general.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 254081ba18..56e7825d65 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -117,7 +117,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
 
     """
     key = "nick"
-    options = ("inputline", "object", "account", "list", "delete", "clearall")
+    switch_options = ("inputline", "object", "account", "list", "delete", "clearall")
     aliases = ["nickname", "nicks"]
     locks = "cmd:all()"
 
@@ -448,7 +448,7 @@ class CmdGive(COMMAND_DEFAULT_CLASS):
     placing it in their inventory.
     """
     key = "give"
-    split = " to "
+    rhs_split = " to "
     locks = "cmd:all()"
     arg_regex = r"\s|$"
 

From af07a119650053486336f4aa6270d3f2e75c89b8 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 15:17:19 -0500
Subject: [PATCH 175/217] class var options renamed switch_options

---
 evennia/commands/default/help.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/help.py b/evennia/commands/default/help.py
index a355ac2e3f..d2011629c1 100644
--- a/evennia/commands/default/help.py
+++ b/evennia/commands/default/help.py
@@ -317,7 +317,7 @@ class CmdSetHelp(COMMAND_DEFAULT_CLASS):
 
     """
     key = "@sethelp"
-    options = ("edit", "replace", "append", "extend", "delete")
+    switch_options = ("edit", "replace", "append", "extend", "delete")
     locks = "cmd:perm(Helper)"
     help_category = "Building"
 

From eb3b7815e6e4e4f298b016ff1797a228fdede5cd Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 15:46:17 -0500
Subject: [PATCH 176/217] class var options renamed switch_options

---
 evennia/commands/default/system.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/evennia/commands/default/system.py b/evennia/commands/default/system.py
index e4d6242a56..c454de9aff 100644
--- a/evennia/commands/default/system.py
+++ b/evennia/commands/default/system.py
@@ -245,7 +245,7 @@ class CmdPy(COMMAND_DEFAULT_CLASS):
     """
     key = "@py"
     aliases = ["!"]
-    options = ("time", "edit")
+    switch_options = ("time", "edit")
     locks = "cmd:perm(py) or perm(Developer)"
     help_category = "System"
 
@@ -329,7 +329,7 @@ class CmdScripts(COMMAND_DEFAULT_CLASS):
     """
     key = "@scripts"
     aliases = ["@globalscript", "@listscripts"]
-    options = ("start", "stop", "kill", "validate")
+    switch_options = ("start", "stop", "kill", "validate")
     locks = "cmd:perm(listscripts) or perm(Admin)"
     help_category = "System"
 
@@ -523,7 +523,7 @@ class CmdService(COMMAND_DEFAULT_CLASS):
 
     key = "@service"
     aliases = ["@services"]
-    options = ("list", "start", "stop", "delete")
+    switch_options = ("list", "start", "stop", "delete")
     locks = "cmd:perm(service) or perm(Developer)"
     help_category = "System"
 
@@ -706,7 +706,7 @@ class CmdServerLoad(COMMAND_DEFAULT_CLASS):
     """
     key = "@server"
     aliases = ["@serverload", "@serverprocess"]
-    options = ("mem", "flushmem")
+    switch_options = ("mem", "flushmem")
     locks = "cmd:perm(list) or perm(Developer)"
     help_category = "System"
 

From 933388633f8e00773ccd8bf57a32692d005228e0 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 15:52:47 -0500
Subject: [PATCH 177/217] class var options renamed switch_options

---
 evennia/contrib/extended_room.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/contrib/extended_room.py b/evennia/contrib/extended_room.py
index b2f61757f9..6cacca980c 100644
--- a/evennia/contrib/extended_room.py
+++ b/evennia/contrib/extended_room.py
@@ -367,7 +367,7 @@ class CmdExtendedDesc(default_cmds.CmdDesc):
 
     """
     aliases = ["describe", "detail"]
-    options = ()  # Inherits from default_cmds.CmdDesc, but unused here
+    switch_options = ()  # Inherits from default_cmds.CmdDesc, but unused here
 
     def reset_times(self, obj):
         """By deleteting the caches we force a re-load."""

From 8ef981fe6cd87066a632be085dbcbdec4a18e0da Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 17:39:44 -0500
Subject: [PATCH 178/217] Remove code shim after class var renaming

Updated rhs_split docstring in MuxCommand
---
 evennia/commands/default/muxcommand.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/evennia/commands/default/muxcommand.py b/evennia/commands/default/muxcommand.py
index 93606cdbe5..7339780fe7 100644
--- a/evennia/commands/default/muxcommand.py
+++ b/evennia/commands/default/muxcommand.py
@@ -82,8 +82,9 @@ class MuxCommand(Command):
         Optional variables to aid in parsing, if set:
           self.switch_options  - (tuple of valid /switches expected by this
                                   command (without the /))
-          self.rhs_split       - Alternate string delimiter to separate
-                                 left/right hand sides.
+          self.rhs_split       - Alternate string delimiter or tuple of strings
+                                 to separate left/right hand sides. tuple form
+                                 gives priority split to first string delimeter.
 
         This parser breaks self.args into its constituents and stores them in the
         following variables:
@@ -103,11 +104,6 @@ class MuxCommand(Command):
         """
         raw = self.args
         args = raw.strip()
-        # Temporary code to use the old settings before renaming     # #
-        if hasattr(self, "options"):                                   #
-            self.switch_options = self.options                         #
-        if hasattr(self, "split") and not hasattr(self, "rhs_split"):  #
-            self.rhs_split = self.split                            # # #
         # Without explicitly setting these attributes, they assume default values:
         if not hasattr(self, "switch_options"):
             self.switch_options = None

From 45d5ee8745f269283abfa63b8bc96368b22cefb6 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 20:11:37 -0500
Subject: [PATCH 179/217] MuxCommand multi-delimiter for splits parse tweaks

---
 evennia/commands/default/muxcommand.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/evennia/commands/default/muxcommand.py b/evennia/commands/default/muxcommand.py
index 7339780fe7..77fd889ed9 100644
--- a/evennia/commands/default/muxcommand.py
+++ b/evennia/commands/default/muxcommand.py
@@ -84,7 +84,7 @@ class MuxCommand(Command):
                                   command (without the /))
           self.rhs_split       - Alternate string delimiter or tuple of strings
                                  to separate left/right hand sides. tuple form
-                                 gives priority split to first string delimeter.
+                                 gives priority split to first string delimiter.
 
         This parser breaks self.args into its constituents and stores them in the
         following variables:
@@ -149,13 +149,15 @@ class MuxCommand(Command):
 
         # check for arg1, arg2, ... = argA, argB, ... constructs
         lhs, rhs = args.strip(), None
-        best_split = self.rhs_split
         if lhs:
-            if hasattr(self.rhs_split, '__iter__'):
+            if hasattr(self.rhs_split, '__iter__'):  # If delimiter is iterable, try each
+                best_split = self.rhs_split[0]
                 for this_split in self.rhs_split:
-                    if this_split in lhs:  # First delimiter to allow a successful
-                        best_split = this_split  # split is the best split.
+                    if this_split in lhs:  # delimiter to allow first successful
+                        best_split = this_split  # split to be the best split.
                         break
+            else:
+                best_split = self.rhs_split
             # Parse to separate left into left/right sides using best_split delimiter string
             if best_split in lhs:
                 lhs, rhs = lhs.split(best_split, 1)

From 87d32abedd59b08da4c4c7e20429ae49029de82d Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 20:14:20 -0500
Subject: [PATCH 180/217] Add multi-delimiter split to CmdTeleport

---
 evennia/commands/default/building.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index e2f61d7054..702f2e241a 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -2427,7 +2427,7 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
     key = "@tel"
     aliases = "@teleport"
     switch_options = ("quiet", "intoexit", "tonone", "loc")
-    rhs_split = " to "
+    rhs_split = ("=", " to ")  # Prefer = delimiter, but allow " to " usage.
     locks = "cmd:perm(teleport) or perm(Builder)"
     help_category = "Building"
 

From 4a0f13804ed5178af1d15f2d58c84e6e6067415d Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 20:16:52 -0500
Subject: [PATCH 181/217] Add multi-delimiter split to CmdGive

---
 evennia/commands/default/general.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 56e7825d65..eafb7670b0 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -448,7 +448,7 @@ class CmdGive(COMMAND_DEFAULT_CLASS):
     placing it in their inventory.
     """
     key = "give"
-    rhs_split = " to "
+    rhs_split = ("=", " to ")  # Prefer = delimiter, but allow " to " usage.
     locks = "cmd:all()"
     arg_regex = r"\s|$"
 

From 24cec94a6b5d1d6105886167c195ff9a2d87f339 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 20:36:17 -0500
Subject: [PATCH 182/217] Add test_give for CmdGive parse multiple splits

---
 evennia/commands/default/tests.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index e79277de9b..fd5d4982ed 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -140,6 +140,13 @@ class TestGeneral(CommandTest):
         self.call(general.CmdGet(), "Obj", "You pick up Obj.")
         self.call(general.CmdDrop(), "Obj", "You drop Obj.")
 
+    def test_give(self):
+        self.call(general.CmdGive(), "Obj to Char2", "You aren't carrying Obj.")
+        self.call(general.CmdGive(), "Obj = Char2", "You aren't carrying Obj.")
+        self.call(general.CmdGet(), "Obj", "You pick up Obj.")
+        self.call(general.CmdGive(), "Obj to Char2", "You give")
+        self.call(general.CmdGive(), "Obj = Char", "You give", caller=self.char2)
+
     def test_say(self):
         self.call(general.CmdSay(), "Testing", "You say, \"Testing\"")
 

From 134cc9bc8a664b5aff17ea1750e25b87889d3518 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Mon, 5 Mar 2018 23:33:34 -0500
Subject: [PATCH 183/217] Bypass no valid index iterable edge case

and slight refactor + comments
---
 evennia/commands/default/muxcommand.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/evennia/commands/default/muxcommand.py b/evennia/commands/default/muxcommand.py
index 77fd889ed9..df49d9a215 100644
--- a/evennia/commands/default/muxcommand.py
+++ b/evennia/commands/default/muxcommand.py
@@ -113,7 +113,7 @@ class MuxCommand(Command):
             self.account_caller = False
 
         # split out switches
-        switches = []
+        switches, delimiters = [], self.rhs_split
         if args and len(args) > 1 and raw[0] == "/":
             # we have a switch, or a set of switches. These end with a space.
             switches = args[1:].split(None, 1)
@@ -150,14 +150,14 @@ class MuxCommand(Command):
         # check for arg1, arg2, ... = argA, argB, ... constructs
         lhs, rhs = args.strip(), None
         if lhs:
-            if hasattr(self.rhs_split, '__iter__'):  # If delimiter is iterable, try each
-                best_split = self.rhs_split[0]
-                for this_split in self.rhs_split:
-                    if this_split in lhs:  # delimiter to allow first successful
-                        best_split = this_split  # split to be the best split.
+            if delimiters and hasattr(delimiters, '__iter__'):  # If delimiter is iterable,
+                best_split = delimiters[0]  # (default to first delimiter)
+                for this_split in delimiters:  # try each delimiter
+                    if this_split in lhs:  # to find first successful split
+                        best_split = this_split  # to be the best split.
                         break
             else:
-                best_split = self.rhs_split
+                best_split = delimiters
             # Parse to separate left into left/right sides using best_split delimiter string
             if best_split in lhs:
                 lhs, rhs = lhs.split(best_split, 1)

From a7b9112f0439bde3eab0a747d30e8da3bd19bb10 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Sat, 10 Mar 2018 22:41:16 -0500
Subject: [PATCH 184/217] Suggested refactors and change to test exact match

---
 evennia/commands/default/muxcommand.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/evennia/commands/default/muxcommand.py b/evennia/commands/default/muxcommand.py
index df49d9a215..349679f5bd 100644
--- a/evennia/commands/default/muxcommand.py
+++ b/evennia/commands/default/muxcommand.py
@@ -114,6 +114,8 @@ class MuxCommand(Command):
 
         # split out switches
         switches, delimiters = [], self.rhs_split
+        if self.switch_options:
+            self.switch_options = [opt.lower() for opt in self.switch_options]
         if args and len(args) > 1 and raw[0] == "/":
             # we have a switch, or a set of switches. These end with a space.
             switches = args[1:].split(None, 1)
@@ -127,16 +129,16 @@ class MuxCommand(Command):
             if switches and self.switch_options:
                 valid_switches, unused_switches, extra_switches = [], [], []
                 for element in switches:
-                    option_check = [each for each in self.switch_options
-                                    if each.lower() == element.lower() or
-                                    each.lower().startswith(element.lower())]
+                    option_check = [opt for opt in self.switch_options if opt == element]
+                    if not option_check:
+                        option_check = [opt for opt in self.switch_options if opt.startswith(element)]
                     match_count = len(option_check)
                     if match_count > 1:
-                        extra_switches += option_check  # Either the option provided is ambiguous,
+                        extra_switches.extend(option_check)  # Either the option provided is ambiguous,
                     elif match_count == 1:
-                        valid_switches += option_check  # or it is a valid option abbreviation,
+                        valid_switches.extend(option_check)  # or it is a valid option abbreviation,
                     elif match_count == 0:
-                        unused_switches += [element]  # or an extraneous option to be ignored.
+                        unused_switches.append(element)  # or an extraneous option to be ignored.
                 if extra_switches:  # User provided switches
                     self.msg('|g%s|n: |wAmbiguous switch supplied: Did you mean /|C%s|w?' %
                              (self.cmdstring, ' |nor /|C'.join(extra_switches)))

From 1ddab8d6e906e1285b19511ce31693a46bb76ad4 Mon Sep 17 00:00:00 2001
From: BlauFeuer <phaselinear700series2@gmail.com>
Date: Sat, 10 Mar 2018 22:42:39 -0500
Subject: [PATCH 185/217] Add test_mux_command for exact match

---
 evennia/commands/default/tests.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index fd5d4982ed..bf01ac3039 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -21,6 +21,7 @@ from mock import Mock, mock
 from evennia.commands.default.cmdset_character import CharacterCmdSet
 from evennia.utils.test_resources import EvenniaTest
 from evennia.commands.default import help, general, system, admin, account, building, batchprocess, comms
+from evennia.commands.default.muxcommand import MuxCommand
 from evennia.commands.command import Command, InterruptCommand
 from evennia.utils import ansi, utils
 from evennia.server.sessionhandler import SESSIONS
@@ -147,6 +148,26 @@ class TestGeneral(CommandTest):
         self.call(general.CmdGive(), "Obj to Char2", "You give")
         self.call(general.CmdGive(), "Obj = Char", "You give", caller=self.char2)
 
+    def test_mux_command(self):
+
+        class CmdTest(MuxCommand):
+            key = 'test'
+            switch_options = ('test', 'testswitch', 'testswitch2')
+
+            def func(self):
+                self.msg("Switches matched: {}".format(self.switches))
+
+        self.call(CmdTest(), "/test/testswitch/testswitch2", "Switches matched: ['test', 'testswitch', 'testswitch2']")
+        self.call(CmdTest(), "/test", "Switches matched: ['test']")
+        self.call(CmdTest(), "/test/testswitch", "Switches matched: ['test', 'testswitch']")
+        self.call(CmdTest(), "/testswitch/testswitch2", "Switches matched: ['testswitch', 'testswitch2']")
+        self.call(CmdTest(), "/testswitch", "Switches matched: ['testswitch']")
+        self.call(CmdTest(), "/testswitch2", "Switches matched: ['testswitch2']")
+        self.call(CmdTest(), "/t", "test: Ambiguous switch supplied: "
+                                   "Did you mean /test or /testswitch or /testswitch2?|Switches matched: []")
+        self.call(CmdTest(), "/tests", "test: Ambiguous switch supplied: "
+                                       "Did you mean /testswitch or /testswitch2?|Switches matched: []")
+
     def test_say(self):
         self.call(general.CmdSay(), "Testing", "You say, \"Testing\"")
 

From fdf19de5db68333d7122cb05b11b130c50264005 Mon Sep 17 00:00:00 2001
From: maiki <maiki@interi.org>
Date: Sat, 10 Mar 2018 20:42:17 -0800
Subject: [PATCH 186/217] Remove extra words

---
 evennia/typeclasses/attributes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/typeclasses/attributes.py b/evennia/typeclasses/attributes.py
index 3f8b4cd742..a97a81b1be 100644
--- a/evennia/typeclasses/attributes.py
+++ b/evennia/typeclasses/attributes.py
@@ -245,7 +245,7 @@ class AttributeHandler(object):
                 found from cache or database.
         Notes:
             When given a category only, a search for all objects
-            of that cateogory is done and a the category *name* is is
+            of that cateogory is done and the category *name* is
             stored. This tells the system on subsequent calls that the
             list of cached attributes of this category is up-to-date
             and that the cache can be queried for category matches

From 0ffe621e5a151879289d64dd9814bc1dbcfccf2e Mon Sep 17 00:00:00 2001
From: maiki <maiki@interi.org>
Date: Sat, 10 Mar 2018 20:52:06 -0800
Subject: [PATCH 187/217] Minor update

---
 evennia/contrib/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/evennia/contrib/README.md b/evennia/contrib/README.md
index ed3c048c32..ace81db8e5 100644
--- a/evennia/contrib/README.md
+++ b/evennia/contrib/README.md
@@ -16,7 +16,7 @@ things you want from here into your game folder and change them there.
 ## Contrib modules
 
 * Barter system (Griatch 2012) - A safe and effective barter-system
-  for any game. Allows safe trading of any godds (including coin)
+  for any game. Allows safe trading of any goods (including coin).
 * CharGen (Griatch 2011) - A simple Character creator for OOC mode.
   Meant as a starting point for a more fleshed-out system.
 * Clothing (BattleJenkins 2017) - A layered clothing system with
@@ -33,7 +33,7 @@ things you want from here into your game folder and change them there.
   on a character and access it in an emote with a custom marker.
 * Mail (grungies1138 2016) - An in-game mail system for communication.
 * Menu login (Griatch 2011) - A login system using menus asking
-  for name/password rather than giving them as one command
+  for name/password rather than giving them as one command.
 * Map Builder (CloudKeeper 2016) - Build a game area based on a 2D
   "graphical" unicode map. Supports assymmetric exits.
 * Menu Login (Vincent-lg 2016) - Alternate login system using EvMenu.
@@ -59,7 +59,7 @@ things you want from here into your game folder and change them there.
 ## Contrib packages
 
 * EGI_Client (gtaylor 2016) - Client for reporting game status
-  to the Evennia game index (games.evennia.com)
+  to the Evennia game index (games.evennia.com).
 * In-game Python (Vincent Le Goff 2017) - Allow trusted builders to script
   objects and events using Python from in-game.
 * Tutorial examples (Griatch 2011, 2015) - A folder of basic

From b3e97b5c3d8f094bc4853b51423460b33d89da98 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 11 Mar 2018 10:24:27 +0100
Subject: [PATCH 188/217] Remove a boolean check to make numpy arrays work
 better with .msg()

---
 evennia/accounts/accounts.py | 2 +-
 evennia/objects/objects.py   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py
index b90b5ac8ab..48d03d8dc8 100644
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@@ -421,7 +421,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
 
         kwargs["options"] = options
 
-        if text and not (isinstance(text, basestring) or isinstance(text, tuple)):
+        if not (isinstance(text, basestring) or isinstance(text, tuple)):
             # sanitize text before sending across the wire
             try:
                 text = to_str(text, force_string=True)
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index d4ce390977..f583570707 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -535,8 +535,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
         except Exception:
             logger.log_trace()
 
-
-        if text and not (isinstance(text, basestring) or isinstance(text, tuple)):
+        if not (isinstance(text, basestring) or isinstance(text, tuple)):
             # sanitize text before sending across the wire
             try:
                 text = to_str(text, force_string=True)

From 8b0eb66ba6d5416e50234f3f78aee904943086aa Mon Sep 17 00:00:00 2001
From: friarzen <friarzen@gmail.com>
Date: Sat, 17 Mar 2018 20:50:51 +0000
Subject: [PATCH 189/217] Alpha webclient split interface support

---
 .../static/webclient/css/webclient.css        | 167 +++++++++------
 .../static/webclient/js/splithandler.js       |  77 +++++++
 .../static/webclient/js/webclient_gui.js      | 198 +++++++++++++-----
 .../webclient/templates/webclient/base.html   | 113 +++++-----
 .../templates/webclient/webclient.html        |  57 ++++-
 5 files changed, 434 insertions(+), 178 deletions(-)
 create mode 100644 evennia/web/webclient/static/webclient/js/splithandler.js

diff --git a/evennia/web/webclient/static/webclient/css/webclient.css b/evennia/web/webclient/static/webclient/css/webclient.css
index 1c94a1f9fd..94344386a1 100644
--- a/evennia/web/webclient/static/webclient/css/webclient.css
+++ b/evennia/web/webclient/static/webclient/css/webclient.css
@@ -8,10 +8,11 @@
 --- */
 
 /* Overall element look */
-html, body, #clientwrapper { height: 100% }
+html, body {
+    height: 100%;
+    width: 100%;
+}
 body {
-    margin: 0;
-    padding: 0;
     background: #000;
     color: #ccc;
     font-size: .9em;
@@ -19,6 +20,12 @@ body {
     line-height: 1.6em;
     overflow: hidden;
 }
+@media screen and (max-width: 480px) {
+  body {
+    font-size: .5rem;
+    line-height: .7rem;
+  }
+}
 
 
 a:link, a:visited { color: inherit; }
@@ -74,93 +81,75 @@ div {margin:0px;}
 }
 
 /* Style specific classes corresponding to formatted, narative text. */
-
+.wrapper {
+  height: 100%;
+}
 
 /* Container surrounding entire client */
-#wrapper {
-    position: relative;
-    height: 100%
+#clientwrapper {
+  height: 100%;
 }
 
 /* Main scrolling message area */
+
 #messagewindow {
-    position: absolute;
-    overflow: auto;
-    padding: 1em;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 70px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    overflow-wrap: break-word;
 }
 
-/* Input area containing input field and button */
-#inputform {
-    position: absolute;
-    width: 100%;
-    padding: 0;
-    bottom: 0;
-    margin: 0;
-    padding-bottom: 10px;
-    border-top: 1px solid #555;
-}
-
-#inputcontrol {
-    width: 100%;
-    padding: 0;
+#messagewindow {
+    overflow-y: auto;
+    overflow-x: hidden;
+    overflow-wrap: break-word;
 }
 
 /* Input field */
-#inputfield, #inputsend, #inputsizer {
-    display: block;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    height: 50px;
+#inputfield, #inputsizer {
+    height: 100%;
     background: #000;
     color: #fff;
-    padding: 0 .45em;
-    font-size: 1.1em;
+    padding: 0 .45rem;
+    font-size: 1.1rem;
     font-family: 'DejaVu Sans Mono', Consolas, Inconsolata, 'Lucida Console', monospace;
-}
-
-#inputfield, #inputsizer {
-    float: left;
-    width: 95%;
-    border: 0;
     resize: none;
-    line-height: normal;
+}
+#inputsend {
+  height: 100%;
+}
+#inputcontrol {
+  height: 100%;
 }
 
 #inputfield:focus {
-    outline: 0;
-}
-
-#inputsizer {
-    margin-left: -9999px;
-}
-
-/* Input 'send' button */
-#inputsend {
-    float: right;
-    width: 3%;
-    max-width: 25px;
-    margin-right: 10px;
-    border: 0;
-    background: #555;
 }
 
 /* prompt area above input field */
-#prompt {
-    margin-top: 10px;
-    padding: 0 .45em;
+.prompt {
+  max-height: 3rem;
+}
+
+.splitbutton {
+    position: absolute;
+    right: 1%;
+    top: 1%;
+    z-index: 1;
+    width: 2rem;
+    height: 2rem;
+    font-size: 2rem;
+    color: #a6a6a6;
+    background-color: transparent;
+    border: 0px;
+}
+
+.splitbutton:hover {
+    color: white;
+    cursor: pointer;
 }
 
 #optionsbutton {
-    width: 40px;
-    font-size: 20px;
+    width: 2rem;
+    font-size: 2rem;
     color: #a6a6a6;
     background-color: transparent;
     border: 0px;
@@ -173,8 +162,8 @@ div {margin:0px;}
 
 #toolbar {
     position: fixed;
-    top: 0;
-    right: 5px;
+    top: .5rem;
+    right: .5rem;
     z-index: 1;
 }
 
@@ -248,6 +237,48 @@ div {margin:0px;}
     text-decoration: none;
     cursor: pointer;
 }
+.gutter.gutter-vertical {
+    cursor: row-resize;
+    background-image:  url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAFAQMAAABo7865AAAABlBMVEVHcEzMzMzyAv2sAAAAAXRSTlMAQObYZgAAABBJREFUeF5jOAMEEAIEEFwAn3kMwcB6I2AAAAAASUVORK5CYII=')
+}
+
+.gutter.gutter-horizontal {
+    cursor: col-resize;
+    background-image:  url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAeCAYAAADkftS9AAAAIklEQVQoU2M4c+bMfxAGAgYYmwGrIIiDjrELjpo5aiZeMwF+yNnOs5KSvgAAAABJRU5ErkJggg==')
+}
+
+.split {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+
+    overflow-y: auto;
+    overflow-x: hidden;
+}
+
+.content {
+    border: 1px solid #C0C0C0;
+    box-shadow: inset 0 1px 2px #e4e4e4;
+    background-color: black;
+    padding: 1rem;
+}
+@media screen and (max-width: 480px) {
+  .content {
+    padding: .5rem;
+  }
+}
+
+.gutter {
+    background-color: grey;
+
+    background-repeat: no-repeat;
+    background-position: 50%;
+}
+
+.split.split-horizontal, .gutter.gutter-horizontal {
+    height: 100%;
+    float: left;
+}
 
 /* XTERM256 colors */
 
diff --git a/evennia/web/webclient/static/webclient/js/splithandler.js b/evennia/web/webclient/static/webclient/js/splithandler.js
new file mode 100644
index 0000000000..56890009e5
--- /dev/null
+++ b/evennia/web/webclient/static/webclient/js/splithandler.js
@@ -0,0 +1,77 @@
+// Use split.js to create a basic ui
+var SplitHandler = (function () {
+  var num_splits = 0;
+  var split_panes = {};
+
+  var set_pane_types = function(splitpane, types) {
+    split_panes[splitpane]['types'] = types;
+  }
+
+  var dynamic_split = function(splitpane, direction, update_method1, update_method2) {
+    var first  = ++num_splits;
+    var second = ++num_splits;
+
+    var first_div  = $( '<div id="split_'+first +'" class="split split-'+direction+'" />' )
+    var first_sub  = $( '<div id="split_'+first +'-sub"/>' )
+    var second_div = $( '<div id="split_'+second+'" class="split split-'+direction+'" />' )
+    var second_sub = $( '<div id="split_'+second+'-sub"/>' )
+
+    // check to see if this pane contains the primary message window.
+    contents = $('#'+splitpane).contents();
+    if( contents ) {
+      // it does, so move it to the first new div (TODO -- selectable between first/second?)
+      contents.appendTo(first_sub);
+    }
+
+    first_div.append( first_sub );
+    second_div.append( second_sub );
+
+    // update the split_panes array to remove this split
+    delete( split_panes[splitpane] );
+
+    // now vaporize the current split_N-sub placeholder and create two new panes.
+    $('#'+splitpane).parent().append(first_div);
+    $('#'+splitpane).parent().append(second_div);
+    $('#'+splitpane).remove();
+
+    // And split
+    Split(['#split_'+first,'#split_'+second], {
+      direction: direction,
+      sizes: [50,50],
+      gutterSize: 4,
+      minSize: [50,50],
+    });
+
+    // store our new splits for future splits/uses by the main UI.
+    split_panes['split_'+first +'-sub'] = { 'types': [], 'update_method': update_method1 };
+    split_panes['split_'+second+'-sub'] = { 'types': [], 'update_method': update_method2 };
+  }
+
+
+  var init = function(settings) {
+    //change Mustache tags to ruby-style (Django gets mad otherwise)
+    var customTags = [ '<%', '%>' ];
+    Mustache.tags = customTags;
+
+    var input_template = $('#input-template').html();
+    Mustache.parse(input_template);
+
+    Split(['#main','#input'], {
+      direction: 'vertical',
+      sizes: [90,10],
+      gutterSize: 4,
+      minSize: [50,50],
+    });
+
+    var input_render = Mustache.render(input_template);
+    $('[data-role-input]').html(input_render);
+    console.log("SplitHandler initialized");
+  }
+
+  return {
+    init: init,
+    set_pane_types: set_pane_types,
+    dynamic_split: dynamic_split,
+    split_panes: split_panes,
+  }
+})();
diff --git a/evennia/web/webclient/static/webclient/js/webclient_gui.js b/evennia/web/webclient/static/webclient/js/webclient_gui.js
index 57d9b0b7c0..b4e5168769 100644
--- a/evennia/web/webclient/static/webclient/js/webclient_gui.js
+++ b/evennia/web/webclient/static/webclient/js/webclient_gui.js
@@ -17,6 +17,10 @@
 
 
 var options = {};
+
+var known_types = new Array();
+    known_types.push('help');
+
 //
 // GUI Elements
 //
@@ -106,6 +110,7 @@ function togglePopup(dialogname, content) {
 
 // Grab text from inputline and send to Evennia
 function doSendText() {
+  console.log("sending text");
     if (!Evennia.isConnected()) {
         var reconnect = confirm("Not currently connected. Reconnect?");
         if (reconnect) {
@@ -158,6 +163,10 @@ function onKeydown (event) {
     var code = event.which;
     var history_entry = null;
     var inputfield = $("#inputfield");
+    if (code === 9) {
+      return;
+    }
+
     inputfield.focus();
 
     if (code === 13) { // Enter key sends text
@@ -205,64 +214,68 @@ function onKeyPress (event) {
 }
 
 var resizeInputField = function () {
-    var min_height = 50;
-    var max_height = 300;
-    var prev_text_len = 0;
+    return function() {
+      var wrapper = $("#inputform")
+      var input = $("#inputcontrol")
+      var prompt = $("#prompt")
 
-    // Check to see if we should change the height of the input area
-    return function () {
-        var inputfield = $("#inputfield");
-        var scrollh = inputfield.prop("scrollHeight");
-        var clienth = inputfield.prop("clientHeight");
-        var newh = 0;
-        var curr_text_len = inputfield.val().length;
-
-        if (scrollh > clienth && scrollh <= max_height) {
-            // Need to make it bigger
-            newh = scrollh;
-        }
-        else if (curr_text_len < prev_text_len) {
-            // There is less text in the field; try to make it smaller
-            // To avoid repaints, we draw the text in an offscreen element and
-            // determine its dimensions.
-            var sizer = $('#inputsizer')
-                .css("width", inputfield.prop("clientWidth"))
-                .text(inputfield.val());
-            newh = sizer.prop("scrollHeight");
-        }
-
-        if (newh != 0) {
-            newh = Math.min(newh, max_height);
-            if (clienth != newh) {
-                inputfield.css("height", newh + "px");
-                doWindowResize();
-            }
-        }
-        prev_text_len = curr_text_len;
+      input.height(wrapper.height() - (input.offset().top - wrapper.offset().top));
     }
 }();
 
 // Handle resizing of client
 function doWindowResize() {
-    var formh = $('#inputform').outerHeight(true);
-    var message_scrollh = $("#messagewindow").prop("scrollHeight");
-    $("#messagewindow")
-        .css({"bottom": formh}) // leave space for the input form
-        .scrollTop(message_scrollh); // keep the output window scrolled to the bottom
+      resizeInputField();
+      var resizable = $("[data-update-append]");
+      var parents = resizable.closest(".split")
+      parents.animate({
+          scrollTop: parents.prop("scrollHeight")
+      }, 0);
 }
 
 // Handle text coming from the server
 function onText(args, kwargs) {
-    // append message to previous ones, then scroll so latest is at
-    // the bottom. Send 'cls' kwarg to modify the output class.
-    var renderto = "main";
-    if (kwargs["type"] == "help") {
-        if (("helppopup" in options) && (options["helppopup"])) {
-            renderto = "#helpdialog";
+    var use_default_pane = true;
+
+    if ( kwargs && 'type' in kwargs ) {
+        var msgtype = kwargs['type'];
+        if ( ! known_types.includes(msgtype) ) {
+            // this is a new output type that can be mapped to panes
+            console.log('detected new output type: ' + msgtype)
+            known_types.push(msgtype);
+        }
+
+        if ( msgtype == 'help' ) {
+            if (("helppopup" in options) && (options["helppopup"])) {
+                openPopup("#helpdialog", args[0]);
+                return;
+            }
+            // fall through to the default output
+
+        } else {
+            // pass this message to each pane that has this msgtype mapped
+            if( SplitHandler ) {
+                for ( var key in SplitHandler.split_panes) {
+                    var pane = SplitHandler.split_panes[key];
+		    console.log(pane);
+                    // is this message type mapped to this pane?
+                    if ( (pane['types'].length > 0) && pane['types'].includes(msgtype) ) {
+                        // yes, so append/replace this pane's inner div with this message
+                        if ( pane['update_method'] == 'replace' ) {
+                            $('#'+key).html(args[0])
+                        } else {
+                            $('#'+key).append(args[0]).animate({ scrollTop: document.getElementById("#"+key).scrollHeight }, 0);
+                        }
+                        // record sending this message to a pane, no need to update the default div
+                        use_default_pane = false;
+                    }
+                }
+            }
         }
     }
 
-    if (renderto == "main") {
+    // append message to default pane, then scroll so latest is at the bottom.
+    if(use_default_pane) {
         var mwin = $("#messagewindow");
         var cls = kwargs == null ? 'out' : kwargs['cls'];
         mwin.append("<div class='" + cls + "'>" + args[0] + "</div>");
@@ -271,8 +284,6 @@ function onText(args, kwargs) {
         }, 0);
 
         onNewLine(args[0], null);
-    } else {
-        openPopup(renderto, args[0]);
     }
 }
 
@@ -377,7 +388,10 @@ function onNewLine(text, originator) {
     document.title = "(" + unread + ") " + originalTitle;
     if ("Notification" in window){
       if (("notification_popup" in options) && (options["notification_popup"])) {
-          Notification.requestPermission().then(function(result) {
+          // There is a Promise-based API for this, but it’s not supported
+          // in Safari and some older browsers:
+          // https://developer.mozilla.org/en-US/docs/Web/API/Notification/requestPermission#Browser_compatibility
+          Notification.requestPermission(function(result) {
               if(result === "granted") {
               var title = originalTitle === "" ? "Evennia" : originalTitle;
               var options = {
@@ -427,6 +441,81 @@ function doStartDragDialog(event) {
     $(document).bind("mouseup", undrag);
 }
 
+
+function onSplitDialogClose() {
+    var pane      = $("input[name=pane]:checked").attr("value");
+    var direction = $("input[name=direction]:checked").attr("value");
+    var flow1     = $("input[name=flow1]:checked").attr("value");
+    var flow2     = $("input[name=flow2]:checked").attr("value");
+
+    SplitHandler.dynamic_split( pane, direction, flow1, flow2 );
+
+    closePopup("#splitdialog");
+}
+
+
+function onSplitDialog() {
+    var dialog = $("#splitdialogcontent");
+    dialog.empty();
+
+    dialog.append("<h3>Split?</h3>");
+    dialog.append('<input type="radio" name="direction" value="vertical" checked> top/bottom<br />');
+    dialog.append('<input type="radio" name="direction" value="horizontal"> side-by-side<br />');
+
+    dialog.append("<h3>Split Which Pane?</h3>");
+    for ( var pane in SplitHandler.split_panes ) {
+        dialog.append('<input type="radio" name="pane" value="'+ pane +'">'+ pane +'<br />');
+    }
+
+    dialog.append("<h3>New First Pane Flow</h3>");
+    dialog.append('<input type="radio" name="flow1" value="append" checked>append<br />');
+    dialog.append('<input type="radio" name="flow1" value="replace">replace<br />');
+
+    dialog.append("<h3>New Second Pane Flow</h3>");
+    dialog.append('<input type="radio" name="flow2" value="append" checked>append<br />');
+    dialog.append('<input type="radio" name="flow2" value="replace">replace<br />');
+
+    dialog.append('<div id="splitclose" class="button">Split It</div>');
+
+    $("#splitclose").bind("click", onSplitDialogClose);
+
+    openPopup("#splitdialog");
+}
+
+function onPaneControlDialogClose() {
+    var pane = $("input[name=pane]:checked").attr("value");
+
+    var types = new Array; 
+    $('#splitdialogcontent input[type=checkbox]:checked').each(function() {
+        types.push( $(this).attr('value') );
+    });
+
+    SplitHandler.set_pane_types( pane, types );
+
+    closePopup("#splitdialog");
+}
+
+function onPaneControlDialog() {
+    var dialog = $("#splitdialogcontent");
+    dialog.empty();
+
+    dialog.append("<h3>Set Which Pane?</h3>");
+    for ( var pane in SplitHandler.split_panes ) {
+        dialog.append('<input type="radio" name="pane" value="'+ pane +'">'+ pane +'<br />');
+    }
+
+    dialog.append("<h3>Which content types?</h3>");
+    for ( var type in known_types ) {
+        dialog.append('<input type="checkbox" value="'+ known_types[type] +'">'+ known_types[type] +'<br />');
+    }
+
+    dialog.append('<div id="paneclose" class="button">Make It So</div>');
+
+    $("#paneclose").bind("click", onPaneControlDialogClose);
+
+    openPopup("#splitdialog");
+}
+
 //
 // Register Events
 //
@@ -434,6 +523,16 @@ function doStartDragDialog(event) {
 // Event when client finishes loading
 $(document).ready(function() {
 
+    if( SplitHandler ) {
+      SplitHandler.init();
+      SplitHandler.split_panes['main-sub'] = {'types': ['help'], 'update_method': 'replace'};
+      $("#splitbutton").bind("click", onSplitDialog);
+      $("#panebutton").bind("click", onPaneControlDialog);
+    } else {
+      $("#splitbutton").hide();
+      $("#panebutton").hide();
+    }
+
     if ("Notification" in window) {
       Notification.requestPermission();
     }
@@ -450,7 +549,7 @@ $(document).ready(function() {
 
     //$(document).on("visibilitychange", onVisibilityChange);
 
-    $("#inputfield").bind("resize", doWindowResize)
+    $("[data-role-input]").bind("resize", doWindowResize)
         .keypress(onKeyPress)
         .bind("paste", resizeInputField)
         .bind("cut", resizeInputField);
@@ -503,6 +602,7 @@ $(document).ready(function() {
     },
     60000*3
     );
+    console.log("Completed GUI setup");
 
 
 });
diff --git a/evennia/web/webclient/templates/webclient/base.html b/evennia/web/webclient/templates/webclient/base.html
index f5f47b230f..f31e4c89f1 100644
--- a/evennia/web/webclient/templates/webclient/base.html
+++ b/evennia/web/webclient/templates/webclient/base.html
@@ -14,55 +14,16 @@ JQuery available.
     <meta name="author" content="Evennia" />
     <meta name="generator" content="Evennia" />
 
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+    <!-- Bootstrap CSS -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
+
     <link rel='stylesheet' type="text/css" media="screen" href={% static "webclient/css/webclient.css" %}>
 
-    <link rel="icon" type="image/x-icon" href="/static/website/images/evennia_logo.png" />
-
-    <!-- Import JQuery and warn if there is a problem -->
-    {% block jquery_import %}
-        <script src="https://code.jquery.com/jquery-2.1.1.min.js" type="text/javascript" charset="utf-8"></script>
-    {% endblock %}
-
-    <script type="text/javascript" charset="utf-8">
-        if(!window.jQuery) {
-            document.write("<div class='err'>jQuery library not found or the online version could not be reached. Check so Javascript is not blocked in your browser.</div>");
-        }
-    </script>
-
-    <!-- Set up Websocket url and load the evennia.js library-->
-    <script language="javascript" type="text/javascript">
-        {% if websocket_enabled %}
-            var wsactive = true;
-        {% else %}
-            var wsactive = false;
-        {% endif %}
-
-        {% if browser_sessid %}
-           var csessid = "{{browser_sessid}}";
-        {% else %}
-           var csessid = false;
-        {% endif %}
-
-        {% if websocket_url %}
-            var wsurl = "{{websocket_url}}:{{websocket_port}}";
-        {% else %}
-            var wsurl = "ws://" + this.location.hostname + ":{{websocket_port}}";
-        {% endif %}
-    </script>
-    <script src={% static "webclient/js/evennia.js" %} language="javascript" type="text/javascript" charset="utf-8"/></script>
-
-    <!-- Load gui library -->
-    {% block guilib_import %}
-        <script src={% static "webclient/js/webclient_gui.js" %} language="javascript" type="text/javascript" charset="utf-8"></script>
-    {% endblock %}
-
     <script src="https://cdn.rawgit.com/ejci/favico.js/master/favico-0.3.10.min.js" language="javascript" type="text/javascript" charset="utf-8"></script>
-    <script type="text/javascript" charset="utf-8">
-        if(!window.Favico) {
-            document.write("<div class='err'>Favico.js library not found or the online version could not be reached. Check so Javascript is not blocked in your browser.</div>");
-        }
-    </script>
 
+    <link rel="icon" type="image/x-icon" href="/static/website/images/evennia_logo.png" />
 
   </head>
   <body>
@@ -79,17 +40,69 @@ JQuery available.
             web browser supporting javascript. <p>
             This error could also be due to not being able to access
             the online jQuery javascript library.</p>
-        <!-- This is will only fire if javascript is actually active -->
-        <script language="javascript" type="text/javascript">
-            $('#noscript').remove();
-        </script>
     </div>
 
     <!-- main client -->
-    <div id=clientwrapper>
+    <div id=clientwrapper class="d-none">
         {% block client %}
         {% endblock %}
     </div>
 
+
+    <!-- Import JQuery and warn if there is a problem -->
+    {% block jquery_import %}
+    <script src="https://code.jquery.com/jquery-3.2.1.min.js" type="text/javascript" charset="utf-8"></script>
+    {% endblock %}
+
+    <script type="text/javascript" charset="utf-8">
+      if(!window.jQuery) {
+        document.write("<div class='err'>jQuery library not found or the online version could not be reached.</div>");
+      }
+    </script>
+
+    <!-- This is will only fire if javascript is actually active -->
+    <script language="javascript" type="text/javascript">
+      $(document).ready(function() {
+        $('#noscript').remove();
+        $('#clientwrapper').removeClass('d-none');
+      })
+    </script>
+
+    <!-- Set up Websocket url and load the evennia.js library-->
+    <script language="javascript" type="text/javascript">
+      {% if websocket_enabled %}
+        var wsactive = true;
+      {% else %}
+        var wsactive = false;
+      {% endif %}
+      {% if browser_sessid %}
+        var csessid = "{{browser_sessid}}";
+      {% else %}
+        var csessid = false;
+      {% endif %}
+      {% if websocket_url %}
+        var wsurl = "{{websocket_url}}";
+      {% else %}
+        var wsurl = "ws://" + this.location.hostname + ":{{websocket_port}}";
+      {% endif %}
+    </script>
+
+    <script src={% static "webclient/js/evennia.js" %} language="javascript" type="text/javascript" charset="utf-8"/></script>
+
+    <!-- set up splits before loading the GUI -->
+    <script src="https://unpkg.com/split.js/split.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/2.3.0/mustache.min.js"></script>
+    <script src={% static "webclient/js/splithandler.js" %} language="javascript"></script>
+
+    <!-- Load gui library -->
+    {% block guilib_import %}
+    <script src={% static "webclient/js/webclient_gui.js" %} language="javascript" type="text/javascript" charset="utf-8"></script>
+    {% endblock %}
+
+    <!-- jQuery first, then Tether, then Bootstrap JS. -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
+    {% block scripts %}
+    {% endblock %}
   </body>
 </html>
diff --git a/evennia/web/webclient/templates/webclient/webclient.html b/evennia/web/webclient/templates/webclient/webclient.html
index 1c641bffb0..2b138cb8bd 100644
--- a/evennia/web/webclient/templates/webclient/webclient.html
+++ b/evennia/web/webclient/templates/webclient/webclient.html
@@ -8,20 +8,30 @@
 
 
 {% block client %}
+<div id="toolbar">
+  <button id="optionsbutton" type="button" aria-haspopup="true" aria-owns="#optionsdialog">&#x2699;<span class="sr-only sr-only-focusable">Settings</span></button>
+  <button id="splitbutton" type="button" aria-haspopup="true" aria-owns="#optionsdialog">&#x21f9;<span class="sr-only sr-only-focusable">Splits</span></button>
+  <button id="panebutton" type="button" aria-haspopup="true" aria-owns="#optionsdialog">&#x2699;<span class="sr-only sr-only-focusable">Splits</span></button>
+</div>
 
-<div id="wrapper">
-    <div id="toolbar">
-        <button id="optionsbutton" type="button" class="hidden">&#x2699;</button>
-    </div>
-    <div id="messagewindow" role="log"></div>
-    <div id="inputform">
-        <div id="prompt"></div>
-        <div id="inputcontrol">
-            <textarea id="inputfield" type="text"></textarea>
-            <input id="inputsend" type="button" value="&gt;"/>
+<!-- The "Main" Content -->
+<div id="main"  class="split split-vertical" data-role-default>
+  <div id="main-sub">
+    <div id="messagewindow"></div>
+  </div>
+</div>
+
+<!-- The "Input" Pane -->
+<div id="input" class="split split-vertical" data-role-input data-update-append>
+</div>
+
+<!-- Basic UI Components -->
+<div id="splitdialog" class="dialog">
+    <div class="dialogtitle">Split Pane<span class="dialogclose">&times;</span></div>
+    <div class="dialogcontentparent">
+        <div id="splitdialogcontent" class="dialogcontent">
         </div>
     </div>
-    <div id="inputsizer"></div>
 </div>
 
 <div id="optionsdialog" class="dialog">
@@ -47,4 +57,29 @@
     </div>
 </div>
 
+<script type="text/html" id="split-template">
+  <div class="split content<%#horizontal%> split-horizontal<%/horizontal%>" id='<%id%>'>
+
+  </div>
+</script>
+
+<script type="text/html" id="output-template">
+  <div id="<%id%>" role="log" data-role-output data-update-append data-tags='[<%#tags%>"<%.%>", <%/tags%>]'></div>
+</script>
+
+<script type="text/html" id="input-template">
+  <div id="inputform" class="wrapper">
+    <div id="prompt" class="prompt">
+    </div>
+    <div id="inputcontrol" class="input-group">
+      <textarea id="inputfield" type="text" class="form-control"></textarea>
+      <span class="input-group-btn">
+        <button class="btn btn-large btn-outline-primary" id="inputsend" type="button" value="">&gt;</button>
+      </span>
+    </div>
+  </div>
+</script>
+
+{% endblock %}
+{% block scripts %}
 {% endblock %}

From 8680708d52f8756aeb0bf5272ee309a02aee248e Mon Sep 17 00:00:00 2001
From: friarzen <friarzen@gmail.com>
Date: Sat, 17 Mar 2018 21:50:11 +0000
Subject: [PATCH 190/217] Example of how to tag msg() with a type

---
 evennia/commands/default/general.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 2f4c51a227..aef5309d32 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -71,7 +71,7 @@ class CmdLook(COMMAND_DEFAULT_CLASS):
             target = caller.search(self.args)
             if not target:
                 return
-        self.msg(caller.at_look(target))
+        self.msg((caller.at_look(target), {'type':'look'}), options=None)
 
 
 class CmdNick(COMMAND_DEFAULT_CLASS):

From 856c889e3f62dad7af489384fe5b212fd14d9d20 Mon Sep 17 00:00:00 2001
From: friarzen <friarzen@gmail.com>
Date: Sun, 18 Mar 2018 00:33:08 +0000
Subject: [PATCH 191/217] move the initial settings for the main split where it
 belongs

---
 evennia/web/webclient/static/webclient/js/splithandler.js  | 2 ++
 evennia/web/webclient/static/webclient/js/webclient_gui.js | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/evennia/web/webclient/static/webclient/js/splithandler.js b/evennia/web/webclient/static/webclient/js/splithandler.js
index 56890009e5..7ba8e45e17 100644
--- a/evennia/web/webclient/static/webclient/js/splithandler.js
+++ b/evennia/web/webclient/static/webclient/js/splithandler.js
@@ -63,6 +63,8 @@ var SplitHandler = (function () {
       minSize: [50,50],
     });
 
+    split_panes['main-sub'] = {'types': [], 'update_method': 'append'};
+
     var input_render = Mustache.render(input_template);
     $('[data-role-input]').html(input_render);
     console.log("SplitHandler initialized");
diff --git a/evennia/web/webclient/static/webclient/js/webclient_gui.js b/evennia/web/webclient/static/webclient/js/webclient_gui.js
index b4e5168769..d07239039f 100644
--- a/evennia/web/webclient/static/webclient/js/webclient_gui.js
+++ b/evennia/web/webclient/static/webclient/js/webclient_gui.js
@@ -525,7 +525,6 @@ $(document).ready(function() {
 
     if( SplitHandler ) {
       SplitHandler.init();
-      SplitHandler.split_panes['main-sub'] = {'types': ['help'], 'update_method': 'replace'};
       $("#splitbutton").bind("click", onSplitDialog);
       $("#panebutton").bind("click", onPaneControlDialog);
     } else {

From 665ba8d0f42dfc3a5f004000fbd1944f398ac9be Mon Sep 17 00:00:00 2001
From: friarzen <friarzen@gmail.com>
Date: Sun, 18 Mar 2018 00:45:23 +0000
Subject: [PATCH 192/217] Make the initial login 'look' match CmdLook

---
 evennia/objects/objects.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index f583570707..a588af0000 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -1762,7 +1762,7 @@ class DefaultCharacter(DefaultObject):
 
         """
         self.msg("\nYou become |c%s|n.\n" % self.name)
-        self.msg(self.at_look(self.location))
+        self.msg((self.at_look(self.location), {'type':'look'}), options = None)
 
         def message(obj, from_obj):
             obj.msg("%s has entered the game." % self.get_display_name(obj), from_obj=from_obj)

From 36e294a9d4ee3d4cefc028abf60662a2042a97e9 Mon Sep 17 00:00:00 2001
From: friarzen <friarzen@gmail.com>
Date: Mon, 19 Mar 2018 00:59:28 +0000
Subject: [PATCH 193/217] Fix append scrolling -- needs more testing

---
 .../web/webclient/static/webclient/js/webclient_gui.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/evennia/web/webclient/static/webclient/js/webclient_gui.js b/evennia/web/webclient/static/webclient/js/webclient_gui.js
index d07239039f..4189e026fb 100644
--- a/evennia/web/webclient/static/webclient/js/webclient_gui.js
+++ b/evennia/web/webclient/static/webclient/js/webclient_gui.js
@@ -257,14 +257,15 @@ function onText(args, kwargs) {
             if( SplitHandler ) {
                 for ( var key in SplitHandler.split_panes) {
                     var pane = SplitHandler.split_panes[key];
-		    console.log(pane);
                     // is this message type mapped to this pane?
                     if ( (pane['types'].length > 0) && pane['types'].includes(msgtype) ) {
                         // yes, so append/replace this pane's inner div with this message
                         if ( pane['update_method'] == 'replace' ) {
                             $('#'+key).html(args[0])
                         } else {
-                            $('#'+key).append(args[0]).animate({ scrollTop: document.getElementById("#"+key).scrollHeight }, 0);
+                            $('#'+key).append(args[0]);
+                            var scrollHeight = $('#'+key).parent().prop("scrollHeight");
+                            $('#'+key).parent().animate({ scrollTop: scrollHeight }, 0);
                         }
                         // record sending this message to a pane, no need to update the default div
                         use_default_pane = false;
@@ -279,9 +280,8 @@ function onText(args, kwargs) {
         var mwin = $("#messagewindow");
         var cls = kwargs == null ? 'out' : kwargs['cls'];
         mwin.append("<div class='" + cls + "'>" + args[0] + "</div>");
-        mwin.animate({
-            scrollTop: document.getElementById("messagewindow").scrollHeight
-        }, 0);
+        var scrollHeight = mwin.parent().parent().prop("scrollHeight");
+        mwin.parent().parent().animate({ scrollTop: scrollHeight }, 0);
 
         onNewLine(args[0], null);
     }

From acc78186e34bfbf0f21aa7ed2d65803ff319673c Mon Sep 17 00:00:00 2001
From: Nicholas Matlaga <nmatlaga@outlawtack.com>
Date: Mon, 19 Mar 2018 11:20:08 -0400
Subject: [PATCH 194/217] fix webclient/base.html (500 error)

---
 .../webclient/templates/webclient/base.html   | 100 +++++++-----------
 1 file changed, 37 insertions(+), 63 deletions(-)

diff --git a/evennia/web/webclient/templates/webclient/base.html b/evennia/web/webclient/templates/webclient/base.html
index 3852b45273..a5c65fad2c 100644
--- a/evennia/web/webclient/templates/webclient/base.html
+++ b/evennia/web/webclient/templates/webclient/base.html
@@ -13,16 +13,18 @@ JQuery available.
     <meta http-equiv="content-type", content="application/xhtml+xml; charset=UTF-8" />
     <meta name="author" content="Evennia" />
     <meta name="generator" content="Evennia" />
-
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-
     <!-- Bootstrap CSS -->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
 
+    <link rel='stylesheet' type="text/css" media="screen" href={% static "webclient/css/webclient.css" %}>
+
+    <link rel="icon" type="image/x-icon" href="/static/website/images/evennia_logo.png" />
+
     <!-- Import JQuery and warn if there is a problem -->
     {% block jquery_import %}
-        <script src="https://code.jquery.com/jquery-2.1.1.min.js" type="text/javascript" charset="utf-8"></script>
+      <script src="https://code.jquery.com/jquery-3.2.1.min.js" type="text/javascript" charset="utf-8"></script>
     {% endblock %}
 
     <script type="text/javascript" charset="utf-8">
@@ -31,6 +33,14 @@ JQuery available.
         }
     </script>
 
+    <!-- This is will only fire if javascript is actually active -->
+    <script language="javascript" type="text/javascript">
+      $(document).ready(function() {
+        $('#noscript').remove();
+        $('#clientwrapper').removeClass('d-none');
+      })
+    </script>
+
     <!-- Set up Websocket url and load the evennia.js library-->
     <script language="javascript" type="text/javascript">
         {% if websocket_enabled %}
@@ -53,12 +63,29 @@ JQuery available.
     </script>
     <script src={% static "webclient/js/evennia.js" %} language="javascript" type="text/javascript" charset="utf-8"/></script>
 
-    <link rel='stylesheet' type="text/css" media="screen" href={% static "webclient/css/webclient.css" %}>
+
+    <!-- set up splits before loading the GUI -->
+    <script src="https://unpkg.com/split.js/split.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/2.3.0/mustache.min.js"></script>
+    <script src={% static "webclient/js/splithandler.js" %} language="javascript"></script>
+
+    <!-- Load gui library -->
+    {% block guilib_import %}
+        <script src={% static "webclient/js/webclient_gui.js" %} language="javascript" type="text/javascript" charset="utf-8"></script>
+    {% endblock %}
 
     <script src="https://cdn.rawgit.com/ejci/favico.js/master/favico-0.3.10.min.js" language="javascript" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript" charset="utf-8">
+        if(!window.Favico) {
+            document.write("<div class='err'>Favico.js library not found or the online version could not be reached. Check so Javascript is not blocked in your browser.</div>");
+        }
+    </script>
 
-    <link rel="icon" type="image/x-icon" href="/static/website/images/evennia_logo.png" />
-
+    <!-- jQuery first, then Tether, then Bootstrap JS. -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
+    {% block scripts %}
+    {% endblock %}
   </head>
   <body>
 
@@ -74,6 +101,10 @@ JQuery available.
             web browser supporting javascript. <p>
             This error could also be due to not being able to access
             the online jQuery javascript library.</p>
+        <!-- This is will only fire if javascript is actually active -->
+        <script language="javascript" type="text/javascript">
+            $('#noscript').remove();
+        </script>
     </div>
 
     <!-- main client -->
@@ -81,62 +112,5 @@ JQuery available.
         {% block client %}
         {% endblock %}
     </div>
-
-
-    <!-- Import JQuery and warn if there is a problem -->
-    {% block jquery_import %}
-    <script src="https://code.jquery.com/jquery-3.2.1.min.js" type="text/javascript" charset="utf-8"></script>
-    {% endblock %}
-
-    <script type="text/javascript" charset="utf-8">
-      if(!window.jQuery) {
-        document.write("<div class='err'>jQuery library not found or the online version could not be reached.</div>");
-      }
-    </script>
-
-    <!-- This is will only fire if javascript is actually active -->
-    <script language="javascript" type="text/javascript">
-      $(document).ready(function() {
-        $('#noscript').remove();
-        $('#clientwrapper').removeClass('d-none');
-      })
-    </script>
-
-    <!-- Set up Websocket url and load the evennia.js library-->
-    <script language="javascript" type="text/javascript">
-      {% if websocket_enabled %}
-        var wsactive = true;
-      {% else %}
-        var wsactive = false;
-      {% endif %}
-      {% if browser_sessid %}
-        var csessid = "{{browser_sessid}}";
-      {% else %}
-        var csessid = false;
-      {% endif %}
-      {% if websocket_url %}
-        var wsurl = "{{websocket_url}}";
-      {% else %}
-        var wsurl = "ws://" + this.location.hostname + ":{{websocket_port}}";
-      {% endif %}
-    </script>
-
-    <script src={% static "webclient/js/evennia.js" %} language="javascript" type="text/javascript" charset="utf-8"/></script>
-
-    <!-- set up splits before loading the GUI -->
-    <script src="https://unpkg.com/split.js/split.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/2.3.0/mustache.min.js"></script>
-    <script src={% static "webclient/js/splithandler.js" %} language="javascript"></script>
-
-    <!-- Load gui library -->
-    {% block guilib_import %}
-    <script src={% static "webclient/js/webclient_gui.js" %} language="javascript" type="text/javascript" charset="utf-8"></script>
-    {% endblock %}
-
-    <!-- jQuery first, then Tether, then Bootstrap JS. -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
-    {% block scripts %}
-    {% endblock %}
   </body>
 </html>

From 36c89799cddd39905d82b54fce926dc6d44e87be Mon Sep 17 00:00:00 2001
From: friarzen <friarzen@gmail.com>
Date: Wed, 21 Mar 2018 18:35:48 +0000
Subject: [PATCH 195/217] Add user selected names to each new pane and some CSS

---
 .../static/webclient/css/webclient.css        | 17 +++++
 .../static/webclient/js/splithandler.js       | 44 +++++------
 .../static/webclient/js/webclient_gui.js      | 73 ++++++++++++-------
 .../templates/webclient/webclient.html        |  6 +-
 4 files changed, 86 insertions(+), 54 deletions(-)

diff --git a/evennia/web/webclient/static/webclient/css/webclient.css b/evennia/web/webclient/static/webclient/css/webclient.css
index 94344386a1..1e9adb283b 100644
--- a/evennia/web/webclient/static/webclient/css/webclient.css
+++ b/evennia/web/webclient/static/webclient/css/webclient.css
@@ -147,6 +147,19 @@ div {margin:0px;}
     cursor: pointer;
 }
 
+.button {
+    width: fit-content;
+    padding: 1em;
+    color: black;
+    border: 1px solid black;
+    background-color: darkgray;
+    margin: 0 auto;
+}
+
+.splitbutton:hover {
+    cursor: pointer;
+}
+
 #optionsbutton {
     width: 2rem;
     font-size: 2rem;
@@ -256,6 +269,10 @@ div {margin:0px;}
     overflow-x: hidden;
 }
 
+.split-sub {
+    padding: .5rem;
+}
+
 .content {
     border: 1px solid #C0C0C0;
     box-shadow: inset 0 1px 2px #e4e4e4;
diff --git a/evennia/web/webclient/static/webclient/js/splithandler.js b/evennia/web/webclient/static/webclient/js/splithandler.js
index 7ba8e45e17..aa6ea4364a 100644
--- a/evennia/web/webclient/static/webclient/js/splithandler.js
+++ b/evennia/web/webclient/static/webclient/js/splithandler.js
@@ -1,50 +1,50 @@
 // Use split.js to create a basic ui
 var SplitHandler = (function () {
-  var num_splits = 0;
   var split_panes = {};
 
   var set_pane_types = function(splitpane, types) {
     split_panes[splitpane]['types'] = types;
   }
 
-  var dynamic_split = function(splitpane, direction, update_method1, update_method2) {
-    var first  = ++num_splits;
-    var second = ++num_splits;
 
-    var first_div  = $( '<div id="split_'+first +'" class="split split-'+direction+'" />' )
-    var first_sub  = $( '<div id="split_'+first +'-sub"/>' )
-    var second_div = $( '<div id="split_'+second+'" class="split split-'+direction+'" />' )
-    var second_sub = $( '<div id="split_'+second+'-sub"/>' )
+  var dynamic_split = function(splitpane, direction, pane_name1, pane_name2, update_method1, update_method2, sizes) {
+    // find the sub-div of the pane we are being asked to split
+    splitpanesub = splitpane + '-sub';
 
-    // check to see if this pane contains the primary message window.
-    contents = $('#'+splitpane).contents();
+    // create the new div stack to replace the sub-div with.
+    var first_div  = $( '<div id="'+pane_name1+'" class="split split-'+direction+'" />' )
+    var first_sub  = $( '<div id="'+pane_name1+'-sub" class="split-sub" />' )
+    var second_div = $( '<div id="'+pane_name2+'" class="split split-'+direction+'" />' )
+    var second_sub = $( '<div id="'+pane_name2+'-sub" class="split-sub" />' )
+
+    // check to see if this sub-pane contains anything
+    contents = $('#'+splitpanesub).contents();
     if( contents ) {
-      // it does, so move it to the first new div (TODO -- selectable between first/second?)
+      // it does, so move it to the first new div-sub (TODO -- selectable between first/second?)
       contents.appendTo(first_sub);
     }
-
     first_div.append( first_sub );
     second_div.append( second_sub );
 
-    // update the split_panes array to remove this split
+    // update the split_panes array to remove this pane name
     delete( split_panes[splitpane] );
 
     // now vaporize the current split_N-sub placeholder and create two new panes.
-    $('#'+splitpane).parent().append(first_div);
-    $('#'+splitpane).parent().append(second_div);
-    $('#'+splitpane).remove();
+    $('#'+splitpane).append(first_div);
+    $('#'+splitpane).append(second_div);
+    $('#'+splitpane+'-sub').remove();
 
     // And split
-    Split(['#split_'+first,'#split_'+second], {
+    Split(['#'+pane_name1,'#'+pane_name2], {
       direction: direction,
-      sizes: [50,50],
+      sizes: sizes,
       gutterSize: 4,
       minSize: [50,50],
     });
 
-    // store our new splits for future splits/uses by the main UI.
-    split_panes['split_'+first +'-sub'] = { 'types': [], 'update_method': update_method1 };
-    split_panes['split_'+second+'-sub'] = { 'types': [], 'update_method': update_method2 };
+    // store our new split sub-divs for future splits/uses by the main UI.
+    split_panes[pane_name1] = { 'types': [], 'update_method': update_method1 };
+    split_panes[pane_name2] = { 'types': [], 'update_method': update_method2 };
   }
 
 
@@ -63,7 +63,7 @@ var SplitHandler = (function () {
       minSize: [50,50],
     });
 
-    split_panes['main-sub'] = {'types': [], 'update_method': 'append'};
+    split_panes['main']  = { 'types': [], 'update_method': 'append' };
 
     var input_render = Mustache.render(input_template);
     $('[data-role-input]').html(input_render);
diff --git a/evennia/web/webclient/static/webclient/js/webclient_gui.js b/evennia/web/webclient/static/webclient/js/webclient_gui.js
index 4189e026fb..7a7c218921 100644
--- a/evennia/web/webclient/static/webclient/js/webclient_gui.js
+++ b/evennia/web/webclient/static/webclient/js/webclient_gui.js
@@ -15,6 +15,7 @@
 (function () {
 "use strict"
 
+var num_splits = 0;
 
 var options = {};
 
@@ -167,7 +168,7 @@ function onKeydown (event) {
       return;
     }
 
-    inputfield.focus();
+    //inputfield.focus();
 
     if (code === 13) { // Enter key sends text
         doSendText();
@@ -245,31 +246,23 @@ function onText(args, kwargs) {
             known_types.push(msgtype);
         }
 
-        if ( msgtype == 'help' ) {
-            if (("helppopup" in options) && (options["helppopup"])) {
-                openPopup("#helpdialog", args[0]);
-                return;
-            }
-            // fall through to the default output
-
-        } else {
-            // pass this message to each pane that has this msgtype mapped
-            if( SplitHandler ) {
-                for ( var key in SplitHandler.split_panes) {
-                    var pane = SplitHandler.split_panes[key];
-                    // is this message type mapped to this pane?
-                    if ( (pane['types'].length > 0) && pane['types'].includes(msgtype) ) {
-                        // yes, so append/replace this pane's inner div with this message
-                        if ( pane['update_method'] == 'replace' ) {
-                            $('#'+key).html(args[0])
-                        } else {
-                            $('#'+key).append(args[0]);
-                            var scrollHeight = $('#'+key).parent().prop("scrollHeight");
-                            $('#'+key).parent().animate({ scrollTop: scrollHeight }, 0);
-                        }
-                        // record sending this message to a pane, no need to update the default div
-                        use_default_pane = false;
+        // pass this message to each pane that has this msgtype mapped
+        if( SplitHandler ) {
+            for ( var key in SplitHandler.split_panes) {
+                var pane = SplitHandler.split_panes[key];
+                // is this message type mapped to this pane?
+                if ( (pane['types'].length > 0) && pane['types'].includes(msgtype) ) {
+                    // yes, so append/replace this pane's inner div with this message
+                    var text_div = $('#'+key+'-sub');
+                    if ( pane['update_method'] == 'replace' ) {
+                        text_div.html(args[0])
+                    } else {
+                        text_div.append(args[0]);
+                        var scrollHeight = text_div.parent().prop("scrollHeight");
+                        text_div.parent().animate({ scrollTop: scrollHeight }, 0);
                     }
+                    // record sending this message to a pane, no need to update the default div
+                    use_default_pane = false;
                 }
             }
         }
@@ -441,19 +434,39 @@ function doStartDragDialog(event) {
     $(document).bind("mouseup", undrag);
 }
 
-
 function onSplitDialogClose() {
     var pane      = $("input[name=pane]:checked").attr("value");
     var direction = $("input[name=direction]:checked").attr("value");
+    var new_pane1 = $("input[name=new_pane1]").val();
+    var new_pane2 = $("input[name=new_pane2]").val();
     var flow1     = $("input[name=flow1]:checked").attr("value");
     var flow2     = $("input[name=flow2]:checked").attr("value");
 
-    SplitHandler.dynamic_split( pane, direction, flow1, flow2 );
+    if( new_pane1 == "" ) {
+        new_pane1 = 'pane_'+num_splits;
+        num_splits++;
+    }
+
+    if( new_pane2 == "" ) {
+        new_pane2 = 'pane_'+num_splits;
+        num_splits++;
+    }
+
+    if( document.getElementById(new_pane1) ) {
+        alert('An element: "' + new_pane1 + '" already exists');
+        return;
+    }
+
+    if( document.getElementById(new_pane2) ) {
+        alert('An element: "' + new_pane2 + '" already exists');
+        return;
+    }
+
+    SplitHandler.dynamic_split( pane, direction, new_pane1, new_pane2, flow1, flow2, [50,50] );
 
     closePopup("#splitdialog");
 }
 
-
 function onSplitDialog() {
     var dialog = $("#splitdialogcontent");
     dialog.empty();
@@ -467,6 +480,10 @@ function onSplitDialog() {
         dialog.append('<input type="radio" name="pane" value="'+ pane +'">'+ pane +'<br />');
     }
 
+    dialog.append("<h3>New Pane Names</h3>");
+    dialog.append('<input type="text" name="new_pane1" value="" />');
+    dialog.append('<input type="text" name="new_pane2" value="" />');
+
     dialog.append("<h3>New First Pane Flow</h3>");
     dialog.append('<input type="radio" name="flow1" value="append" checked>append<br />');
     dialog.append('<input type="radio" name="flow1" value="replace">replace<br />');
diff --git a/evennia/web/webclient/templates/webclient/webclient.html b/evennia/web/webclient/templates/webclient/webclient.html
index 2b138cb8bd..b750257048 100644
--- a/evennia/web/webclient/templates/webclient/webclient.html
+++ b/evennia/web/webclient/templates/webclient/webclient.html
@@ -16,14 +16,12 @@
 
 <!-- The "Main" Content -->
 <div id="main"  class="split split-vertical" data-role-default>
-  <div id="main-sub">
+  <div id="main-sub" class="split-sub">
     <div id="messagewindow"></div>
   </div>
 </div>
-
 <!-- The "Input" Pane -->
-<div id="input" class="split split-vertical" data-role-input data-update-append>
-</div>
+<div id="input" class="split split-vertical" data-role-input data-update-append></div>
 
 <!-- Basic UI Components -->
 <div id="splitdialog" class="dialog">

From 8bde43a3e34e99b58d980fda2ecd17dc2847dfcc Mon Sep 17 00:00:00 2001
From: friarzen <friarzen@gmail.com>
Date: Thu, 22 Mar 2018 00:52:19 +0000
Subject: [PATCH 196/217] adjust css to match existing toolbar and toggle
 split/pane popup

---
 .../static/webclient/css/webclient.css        | 22 +++++++++++++------
 .../static/webclient/js/webclient_gui.js      |  4 ++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/evennia/web/webclient/static/webclient/css/webclient.css b/evennia/web/webclient/static/webclient/css/webclient.css
index 1e9adb283b..75dd91ce2a 100644
--- a/evennia/web/webclient/static/webclient/css/webclient.css
+++ b/evennia/web/webclient/static/webclient/css/webclient.css
@@ -129,20 +129,28 @@ div {margin:0px;}
   max-height: 3rem;
 }
 
-.splitbutton {
-    position: absolute;
-    right: 1%;
-    top: 1%;
-    z-index: 1;
+#splitbutton {
     width: 2rem;
-    height: 2rem;
     font-size: 2rem;
     color: #a6a6a6;
     background-color: transparent;
     border: 0px;
 }
 
-.splitbutton:hover {
+#splitbutton:hover {
+    color: white;
+    cursor: pointer;
+}
+
+#panebutton {
+    width: 2rem;
+    font-size: 2rem;
+    color: #a6a6a6;
+    background-color: transparent;
+    border: 0px;
+}
+
+#panebutton:hover {
     color: white;
     cursor: pointer;
 }
diff --git a/evennia/web/webclient/static/webclient/js/webclient_gui.js b/evennia/web/webclient/static/webclient/js/webclient_gui.js
index 7a7c218921..b975ae7044 100644
--- a/evennia/web/webclient/static/webclient/js/webclient_gui.js
+++ b/evennia/web/webclient/static/webclient/js/webclient_gui.js
@@ -496,7 +496,7 @@ function onSplitDialog() {
 
     $("#splitclose").bind("click", onSplitDialogClose);
 
-    openPopup("#splitdialog");
+    togglePopup("#splitdialog");
 }
 
 function onPaneControlDialogClose() {
@@ -530,7 +530,7 @@ function onPaneControlDialog() {
 
     $("#paneclose").bind("click", onPaneControlDialogClose);
 
-    openPopup("#splitdialog");
+    togglePopup("#splitdialog");
 }
 
 //

From 9f3c3c5cb90d3c35970ed84ce7ba3a1b1ffd9b73 Mon Sep 17 00:00:00 2001
From: Rachel Blackman <packetdancer@gmail.com>
Date: Thu, 29 Mar 2018 18:02:45 -0700
Subject: [PATCH 197/217] Add 'INFO' command to unlogged-in command set, so
 that we can be polled by Mudconnector and Mudstats.

---
 evennia/commands/default/cmdset_unloggedin.py |  1 +
 evennia/commands/default/unloggedin.py        | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/evennia/commands/default/cmdset_unloggedin.py b/evennia/commands/default/cmdset_unloggedin.py
index 5e43d5e8c8..1c45d908aa 100644
--- a/evennia/commands/default/cmdset_unloggedin.py
+++ b/evennia/commands/default/cmdset_unloggedin.py
@@ -23,3 +23,4 @@ class UnloggedinCmdSet(CmdSet):
         self.add(unloggedin.CmdUnconnectedHelp())
         self.add(unloggedin.CmdUnconnectedEncoding())
         self.add(unloggedin.CmdUnconnectedScreenreader())
+        self.add(unloggedin.CmdUnconnectedInfo())
diff --git a/evennia/commands/default/unloggedin.py b/evennia/commands/default/unloggedin.py
index 429948b0fb..28c126e6d8 100644
--- a/evennia/commands/default/unloggedin.py
+++ b/evennia/commands/default/unloggedin.py
@@ -3,6 +3,7 @@ Commands that are available from the connect screen.
 """
 import re
 import time
+import datetime
 from collections import defaultdict
 from random import getrandbits
 from django.conf import settings
@@ -11,8 +12,9 @@ from evennia.accounts.models import AccountDB
 from evennia.objects.models import ObjectDB
 from evennia.server.models import ServerConfig
 from evennia.comms.models import ChannelDB
+from evennia.server.sessionhandler import SESSIONS
 
-from evennia.utils import create, logger, utils
+from evennia.utils import create, logger, utils, gametime
 from evennia.commands.cmdhandler import CMD_LOGINSTART
 
 COMMAND_DEFAULT_CLASS = utils.class_from_module(settings.COMMAND_DEFAULT_CLASS)
@@ -516,6 +518,23 @@ class CmdUnconnectedScreenreader(COMMAND_DEFAULT_CLASS):
         self.session.sessionhandler.session_portal_sync(self.session)
 
 
+class CmdUnconnectedInfo(COMMAND_DEFAULT_CLASS):
+    """
+    Provides MUDINFO output, so that Evennia games can be added to Mudconnector
+    and Mudstats.
+    """
+    key = "info"
+    locks = "cmd:all()"
+
+    def func(self):
+        self.caller.msg("## BEGIN INFO 1.1")
+        self.caller.msg("Name: %s" % settings.SERVERNAME)
+        self.caller.msg("Uptime: %s" % datetime.datetime.fromtimestamp(gametime.SERVER_START_TIME).ctime())
+        self.caller.msg("Connected: %d" % SESSIONS.account_count())
+        self.caller.msg("Version: Evennia %s" % utils.get_evennia_version())
+        self.caller.msg("## END INFO")
+
+
 def _create_account(session, accountname, password, permissions, typeclass=None, email=None):
     """
     Helper function, creates an account of the specified typeclass.

From e875717b327d67df6495d8f6ae0f6f0149911d01 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 31 Mar 2018 12:40:57 +0200
Subject: [PATCH 198/217] Fix of output handling in msg() when text is None

---
 evennia/accounts/accounts.py | 16 +++++++++-------
 evennia/objects/objects.py   | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py
index 48d03d8dc8..fe7693cce0 100644
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@@ -421,17 +421,19 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
 
         kwargs["options"] = options
 
-        if not (isinstance(text, basestring) or isinstance(text, tuple)):
-            # sanitize text before sending across the wire
-            try:
-                text = to_str(text, force_string=True)
-            except Exception:
-                text = repr(text)
+        if text is not None:
+            if not (isinstance(text, basestring) or isinstance(text, tuple)):
+                # sanitize text before sending across the wire
+                try:
+                    text = to_str(text, force_string=True)
+                except Exception:
+                    text = repr(text)
+            kwargs['text'] = text
 
         # session relay
         sessions = make_iter(session) if session else self.sessions.all()
         for session in sessions:
-            session.data_out(text=text, **kwargs)
+            session.data_out(**kwargs)
 
     def execute_cmd(self, raw_string, session=None, **kwargs):
         """
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index f583570707..8cdf546706 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -535,17 +535,19 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
         except Exception:
             logger.log_trace()
 
-        if not (isinstance(text, basestring) or isinstance(text, tuple)):
-            # sanitize text before sending across the wire
-            try:
-                text = to_str(text, force_string=True)
-            except Exception:
-                text = repr(text)
+        if text is not None:
+            if not (isinstance(text, basestring) or isinstance(text, tuple)):
+                # sanitize text before sending across the wire
+                try:
+                    text = to_str(text, force_string=True)
+                except Exception:
+                    text = repr(text)
+            kwargs['text'] = text
 
         # relay to session(s)
         sessions = make_iter(session) if session else self.sessions.all()
         for session in sessions:
-            session.data_out(text=text, **kwargs)
+            session.data_out(**kwargs)
 
 
     def for_contents(self, func, exclude=None, **kwargs):

From 567243a3fc87ee929f98c95ab3bd77b44b493c2e Mon Sep 17 00:00:00 2001
From: Rachel Blackman <packetdancer@gmail.com>
Date: Sat, 31 Mar 2018 23:15:28 -0700
Subject: [PATCH 199/217] Update INFO command to take a single msg() call, and
 add better docstring.

---
 evennia/commands/default/unloggedin.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/evennia/commands/default/unloggedin.py b/evennia/commands/default/unloggedin.py
index 28c126e6d8..293e022a19 100644
--- a/evennia/commands/default/unloggedin.py
+++ b/evennia/commands/default/unloggedin.py
@@ -521,18 +521,19 @@ class CmdUnconnectedScreenreader(COMMAND_DEFAULT_CLASS):
 class CmdUnconnectedInfo(COMMAND_DEFAULT_CLASS):
     """
     Provides MUDINFO output, so that Evennia games can be added to Mudconnector
-    and Mudstats.
+    and Mudstats.  Sadly, the MUDINFO specification seems to have dropped off the
+    face of the net, but it is still used by some crawlers.  This implementation
+    was created by looking at the MUDINFO implementation in MUX2, TinyMUSH, Rhost,
+    and PennMUSH.
     """
     key = "info"
     locks = "cmd:all()"
 
     def func(self):
-        self.caller.msg("## BEGIN INFO 1.1")
-        self.caller.msg("Name: %s" % settings.SERVERNAME)
-        self.caller.msg("Uptime: %s" % datetime.datetime.fromtimestamp(gametime.SERVER_START_TIME).ctime())
-        self.caller.msg("Connected: %d" % SESSIONS.account_count())
-        self.caller.msg("Version: Evennia %s" % utils.get_evennia_version())
-        self.caller.msg("## END INFO")
+        self.caller.msg("## BEGIN INFO 1.1\nName: %s\nUptime: %s\nConnected: %d\nVersion: Evennia %s\n## END INFO" % (
+                        settings.SERVERNAME,
+                        datetime.datetime.fromtimestamp(gametime.SERVER_START_TIME).ctime(),
+                        SESSIONS.account_count(), utils.get_evennia_version()))
 
 
 def _create_account(session, accountname, password, permissions, typeclass=None, email=None):

From 2ab99ee1bf97f2f4bc715340f0bd6478e7677175 Mon Sep 17 00:00:00 2001
From: Rachel Blackman <packetdancer@gmail.com>
Date: Sun, 1 Apr 2018 00:39:16 -0700
Subject: [PATCH 200/217] Add test for unconnected commands, add INFO command
 to test set.

---
 evennia/commands/default/tests.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 41654077a4..a645014482 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -14,15 +14,16 @@ main test suite started with
 
 import re
 import types
+import datetime
 
 from django.conf import settings
 from mock import Mock, mock
 
 from evennia.commands.default.cmdset_character import CharacterCmdSet
 from evennia.utils.test_resources import EvenniaTest
-from evennia.commands.default import help, general, system, admin, account, building, batchprocess, comms
+from evennia.commands.default import help, general, system, admin, account, building, batchprocess, comms, unloggedin
 from evennia.commands.command import Command, InterruptCommand
-from evennia.utils import ansi, utils
+from evennia.utils import ansi, utils, gametime
 from evennia.server.sessionhandler import SESSIONS
 from evennia import search_object
 from evennia import DefaultObject, DefaultCharacter
@@ -433,3 +434,12 @@ class TestInterruptCommand(CommandTest):
     def test_interrupt_command(self):
         ret = self.call(CmdInterrupt(), "")
         self.assertEqual(ret, "")
+
+
+class TestUnconnectedCommand(CommandTest):
+    def test_info_command(self):
+        expected = "## BEGIN INFO 1.1\nName: %s\nUptime: %s\nConnected: %d\nVersion: Evennia %s\n## END INFO" % (
+                        settings.SERVERNAME,
+                        datetime.datetime.fromtimestamp(gametime.SERVER_START_TIME).ctime(),
+                        SESSIONS.account_count(), utils.get_evennia_version())
+        self.call(unloggedin.CmdUnconnectedInfo(), "", expected)
\ No newline at end of file

From ab811c81c8a9bf7c1afac07bd931b886c9472b4a Mon Sep 17 00:00:00 2001
From: Brenden Tuck <friarzen@gmail.com>
Date: Sun, 8 Apr 2018 12:33:38 -0400
Subject: [PATCH 201/217] Added an undo button for multi-level undo of splits

---
 .../static/webclient/css/webclient.css        | 13 ++++
 .../static/webclient/js/splithandler.js       | 68 ++++++++++++++++++-
 .../static/webclient/js/webclient_gui.js      |  5 +-
 .../templates/webclient/webclient.html        |  1 +
 4 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/evennia/web/webclient/static/webclient/css/webclient.css b/evennia/web/webclient/static/webclient/css/webclient.css
index 75dd91ce2a..7a33cfa207 100644
--- a/evennia/web/webclient/static/webclient/css/webclient.css
+++ b/evennia/web/webclient/static/webclient/css/webclient.css
@@ -155,6 +155,19 @@ div {margin:0px;}
     cursor: pointer;
 }
 
+#undobutton {
+    width: 2rem;
+    font-size: 2rem;
+    color: #a6a6a6;
+    background-color: transparent;
+    border: 0px;
+}
+
+#undobutton:hover {
+    color: white;
+    cursor: pointer;
+}
+
 .button {
     width: fit-content;
     padding: 1em;
diff --git a/evennia/web/webclient/static/webclient/js/splithandler.js b/evennia/web/webclient/static/webclient/js/splithandler.js
index aa6ea4364a..81210df854 100644
--- a/evennia/web/webclient/static/webclient/js/splithandler.js
+++ b/evennia/web/webclient/static/webclient/js/splithandler.js
@@ -1,6 +1,7 @@
 // Use split.js to create a basic ui
 var SplitHandler = (function () {
   var split_panes = {};
+  var backout_list = new Array;
 
   var set_pane_types = function(splitpane, types) {
     split_panes[splitpane]['types'] = types;
@@ -26,7 +27,8 @@ var SplitHandler = (function () {
     first_div.append( first_sub );
     second_div.append( second_sub );
 
-    // update the split_panes array to remove this pane name
+    // update the split_panes array to remove this pane name, but store it for the backout stack
+    var backout_settings = split_panes[splitpane];
     delete( split_panes[splitpane] );
 
     // now vaporize the current split_N-sub placeholder and create two new panes.
@@ -45,6 +47,69 @@ var SplitHandler = (function () {
     // store our new split sub-divs for future splits/uses by the main UI.
     split_panes[pane_name1] = { 'types': [], 'update_method': update_method1 };
     split_panes[pane_name2] = { 'types': [], 'update_method': update_method2 };
+
+    // add our new split to the backout stack
+    backout_list.push( {'pane1': pane_name1, 'pane2': pane_name2, 'undo': backout_settings} );
+  }
+
+
+  var undo_split = function() {
+    // pop off the last split pair
+    var back = backout_list.pop();
+    if( !back ) {
+      return;
+    }
+
+    // Collect all the divs/subs in play
+    var pane1 = back['pane1'];
+    var pane2 = back['pane2'];
+    var pane1_sub = $('#'+pane1+'-sub');
+    var pane2_sub = $('#'+pane2+'-sub');
+    var pane1_parent = $('#'+pane1).parent();
+    var pane2_parent = $('#'+pane2).parent();
+
+    if( pane1_parent.attr('id') != pane2_parent.attr('id') ) {
+      // sanity check failed...somebody did something weird...bail out
+      console.log( pane1 );
+      console.log( pane2 );
+      console.log( pane1_parent );
+      console.log( pane2_parent );
+      return;
+    }
+
+    // create a new sub-pane in the panes parent
+    var parent_sub = $( '<div id="'+pane1_parent.attr('id')+'-sub" class="split-sub" />' )
+
+    // check to see if the special #messagewindow is in either of our sub-panes.
+    var msgwindow = pane1_sub.find('#messagewindow')
+    if( !msgwindow ) {
+        //didn't find it in pane 1, try pane 2
+        msgwindow = pane2_sub.find('#messagewindow')
+    }
+    if( msgwindow ) {
+        // It is, so collect all contents into it instead of our parent_sub div
+        // then move it to parent sub div, this allows future #messagewindow divs to flow properly
+        msgwindow.append( pane1_sub.contents() );
+        msgwindow.append( pane2_sub.contents() );
+        parent_sub.append( msgwindow );
+    } else {
+        //didn't find it, so move the contents of the two panes' sub-panes into the new sub-pane
+        parent_sub.append( pane1_sub.contents() );
+        parent_sub.append( pane2_sub.contents() );
+    }
+
+    // clear the parent
+    pane1_parent.empty();
+
+    // add the new sub-pane back to the parent div
+    pane1_parent.append(parent_sub);
+
+    // pull the sub-div's from split_panes
+    delete split_panes[pane1];
+    delete split_panes[pane2];
+
+    // add our parent pane back into the split_panes list for future splitting
+    split_panes[pane1_parent.attr('id')] = back['undo'];
   }
 
 
@@ -75,5 +140,6 @@ var SplitHandler = (function () {
     set_pane_types: set_pane_types,
     dynamic_split: dynamic_split,
     split_panes: split_panes,
+    undo_split: undo_split,
   }
 })();
diff --git a/evennia/web/webclient/static/webclient/js/webclient_gui.js b/evennia/web/webclient/static/webclient/js/webclient_gui.js
index b975ae7044..8929a7529c 100644
--- a/evennia/web/webclient/static/webclient/js/webclient_gui.js
+++ b/evennia/web/webclient/static/webclient/js/webclient_gui.js
@@ -15,7 +15,7 @@
 (function () {
 "use strict"
 
-var num_splits = 0;
+var num_splits = 0; //unique id counter for default split-panel names
 
 var options = {};
 
@@ -544,9 +544,12 @@ $(document).ready(function() {
       SplitHandler.init();
       $("#splitbutton").bind("click", onSplitDialog);
       $("#panebutton").bind("click", onPaneControlDialog);
+      $("#undobutton").bind("click", SplitHandler.undo_split);
+      $("#optionsbutton").hide();
     } else {
       $("#splitbutton").hide();
       $("#panebutton").hide();
+      $("#undobutton").hide();
     }
 
     if ("Notification" in window) {
diff --git a/evennia/web/webclient/templates/webclient/webclient.html b/evennia/web/webclient/templates/webclient/webclient.html
index b750257048..74bef631cf 100644
--- a/evennia/web/webclient/templates/webclient/webclient.html
+++ b/evennia/web/webclient/templates/webclient/webclient.html
@@ -12,6 +12,7 @@
   <button id="optionsbutton" type="button" aria-haspopup="true" aria-owns="#optionsdialog">&#x2699;<span class="sr-only sr-only-focusable">Settings</span></button>
   <button id="splitbutton" type="button" aria-haspopup="true" aria-owns="#optionsdialog">&#x21f9;<span class="sr-only sr-only-focusable">Splits</span></button>
   <button id="panebutton" type="button" aria-haspopup="true" aria-owns="#optionsdialog">&#x2699;<span class="sr-only sr-only-focusable">Splits</span></button>
+  <button id="undobutton" type="button" aria-haspopup="true" aria-owns="#optionsdialog">&#x21B6;<span class="sr-only sr-only-focusable">Splits</span></button>
 </div>
 
 <!-- The "Main" Content -->

From 235d41a10494be37f6c23e893ff2ea5a17a70282 Mon Sep 17 00:00:00 2001
From: CloudKeeper1 <cloud_keeper51@hotmail.com>
Date: Sat, 14 Apr 2018 00:23:52 +1000
Subject: [PATCH 202/217] Wrong symbol on line 499

Wrong symbol on line 499
---
 evennia/commands/default/general.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 2f4c51a227..f9634ed675 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -496,7 +496,7 @@ class CmdWhisper(COMMAND_DEFAULT_CLASS):
 
     Usage:
       whisper <character> = <message>
-      whisper <char1>, <char2> = <message?
+      whisper <char1>, <char2> = <message>
 
     Talk privately to one or more characters in your current location, without
     others in the room being informed.

From 7ae3a434241c17b25b6b11b6514ceff509633524 Mon Sep 17 00:00:00 2001
From: Aditya Arora <adityadvlp@gmail.com>
Date: Mon, 16 Apr 2018 18:41:02 +0530
Subject: [PATCH 203/217] Update rpsystem.py

---
 evennia/contrib/rpsystem.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/contrib/rpsystem.py b/evennia/contrib/rpsystem.py
index a56d2de731..efba0fe7fd 100644
--- a/evennia/contrib/rpsystem.py
+++ b/evennia/contrib/rpsystem.py
@@ -1088,7 +1088,7 @@ class CmdMask(RPCommand):
         if self.cmdstring == "mask":
             # wear a mask
             if not self.args:
-                caller.msg("Usage: (un)wearmask sdesc")
+                caller.msg("Usage: (un)mask sdesc")
                 return
             if caller.db.unmasked_sdesc:
                 caller.msg("You are already wearing a mask.")
@@ -1111,7 +1111,7 @@ class CmdMask(RPCommand):
             del caller.db.unmasked_sdesc
             caller.locks.remove("enable_recog")
             caller.sdesc.add(old_sdesc)
-            caller.msg("You remove your mask and is again '%s'." % old_sdesc)
+            caller.msg("You remove your mask and are again '%s'." % old_sdesc)
 
 
 class RPSystemCmdSet(CmdSet):

From 33347bd2cbfd6d18b5c0a3adf8fd1e4be54ae39d Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 16 Apr 2018 20:34:52 +0200
Subject: [PATCH 204/217] Fix unittest

---
 evennia/commands/default/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 6847afe8c4..7f0ed17924 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -502,5 +502,5 @@ class TestUnconnectedCommand(CommandTest):
         expected = "## BEGIN INFO 1.1\nName: %s\nUptime: %s\nConnected: %d\nVersion: Evennia %s\n## END INFO" % (
                         settings.SERVERNAME,
                         datetime.datetime.fromtimestamp(gametime.SERVER_START_TIME).ctime(),
-                        SESSIONS.account_count(), utils.get_evennia_version())
+                        SESSIONS.account_count(), utils.get_evennia_version().replace("-",""))
         self.call(unloggedin.CmdUnconnectedInfo(), "", expected)

From 0538160c5fe0ed0d14ca6566e4c83dd0ec6901c1 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 17 Apr 2018 22:49:01 +0200
Subject: [PATCH 205/217] style fix

---
 evennia/commands/default/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 7f0ed17924..b2d0f58870 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -502,5 +502,5 @@ class TestUnconnectedCommand(CommandTest):
         expected = "## BEGIN INFO 1.1\nName: %s\nUptime: %s\nConnected: %d\nVersion: Evennia %s\n## END INFO" % (
                         settings.SERVERNAME,
                         datetime.datetime.fromtimestamp(gametime.SERVER_START_TIME).ctime(),
-                        SESSIONS.account_count(), utils.get_evennia_version().replace("-",""))
+                        SESSIONS.account_count(), utils.get_evennia_version().replace("-", ""))
         self.call(unloggedin.CmdUnconnectedInfo(), "", expected)

From e48ce5b9a3605f9763eb8ab36ce0a19bfc8ce0cd Mon Sep 17 00:00:00 2001
From: Tehom <surly.mime@gmail.com>
Date: Wed, 18 Apr 2018 02:26:01 -0400
Subject: [PATCH 206/217] Fix CommandTest to stop if at_pre_cmd should stop
 execution.

---
 evennia/commands/default/tests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 41654077a4..8ddcee78b0 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -75,7 +75,8 @@ class CommandTest(EvenniaTest):
         returned_msg = ""
         try:
             receiver.msg = Mock()
-            cmdobj.at_pre_cmd()
+            if cmdobj.at_pre_cmd():
+                return
             cmdobj.parse()
             ret = cmdobj.func()
             if isinstance(ret, types.GeneratorType):

From 405516d5304a1dc2d814f5101c55211c4850e2b5 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 19 Apr 2018 22:47:13 +0200
Subject: [PATCH 207/217] Cherry-pick EvMenu list_node decorator from olc
 branch

---
 evennia/utils/evmenu.py | 241 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 211 insertions(+), 30 deletions(-)

diff --git a/evennia/utils/evmenu.py b/evennia/utils/evmenu.py
index 3d8fb6b789..a2a92f5e34 100644
--- a/evennia/utils/evmenu.py
+++ b/evennia/utils/evmenu.py
@@ -43,13 +43,18 @@ command definition too) with function definitions:
     def node_with_other_name(caller, input_string):
         # code
         return text, options
+
+    def another_node(caller, input_string, **kwargs):
+        # code
+        return text, options
 ```
 
 Where caller is the object using the menu and input_string is the
 command entered by the user on the *previous* node (the command
 entered to get to this node). The node function code will only be
 executed once per node-visit and the system will accept nodes with
-both one or two arguments interchangeably.
+both one or two arguments interchangeably. It also accepts nodes
+that takes **kwargs.
 
 The menu tree itself is available on the caller as
 `caller.ndb._menutree`. This makes it a convenient place to store
@@ -82,12 +87,14 @@ menu is immediately exited and the default "look" command is called.
                 the callable. Those kwargs will also be passed into the next node if possible.
                 Such a callable should return either a str or a (str, dict), where the
                 string is the name of the next node to go to and the dict is the new,
-                (possibly modified) kwarg to pass into the next node.
+                (possibly modified) kwarg to pass into the next node. If the callable returns
+                None or the empty string, the current node will be revisited.
             - `exec` (str, callable or tuple, optional): This takes the same input as `goto` above
                 and runs before it. If given a node name, the node will be executed but will not
                 be considered the next node. If node/callback returns str or (str, dict), these will
                 replace the `goto` step (`goto` callbacks will not fire), with the string being the
                 next node name and the optional dict acting as the kwargs-input for the next node.
+                If an exec callable returns the empty string (only), the current node is re-run.
 
 If key is not given, the option will automatically be identified by
 its number 1..N.
@@ -167,7 +174,7 @@ from evennia import Command, CmdSet
 from evennia.utils import logger
 from evennia.utils.evtable import EvTable
 from evennia.utils.ansi import strip_ansi
-from evennia.utils.utils import mod_import, make_iter, pad, m_len
+from evennia.utils.utils import mod_import, make_iter, pad, m_len, is_iter
 from evennia.commands import cmdhandler
 
 # read from protocol NAWS later?
@@ -182,7 +189,8 @@ _CMD_NOINPUT = cmdhandler.CMD_NOINPUT
 
 # i18n
 from django.utils.translation import ugettext as _
-_ERR_NOT_IMPLEMENTED = _("Menu node '{nodename}' is not implemented. Make another choice.")
+_ERR_NOT_IMPLEMENTED = _("Menu node '{nodename}' is either not implemented or "
+                         "caused an error. Make another choice.")
 _ERR_GENERAL = _("Error in menu node '{nodename}'.")
 _ERR_NO_OPTION_DESC = _("No description.")
 _HELP_FULL = _("Commands: <menu option>, help, quit")
@@ -573,6 +581,7 @@ class EvMenu(object):
         except EvMenuError:
             errmsg = _ERR_GENERAL.format(nodename=callback)
             self.caller.msg(errmsg, self._session)
+            logger.log_trace()
             raise
 
         return ret
@@ -606,9 +615,11 @@ class EvMenu(object):
                 nodetext, options = ret, None
         except KeyError:
             self.caller.msg(_ERR_NOT_IMPLEMENTED.format(nodename=nodename), session=self._session)
+            logger.log_trace()
             raise EvMenuError
         except Exception:
             self.caller.msg(_ERR_GENERAL.format(nodename=nodename), session=self._session)
+            logger.log_trace()
             raise
 
         # store options to make them easier to test
@@ -665,9 +676,49 @@ class EvMenu(object):
 
         if isinstance(ret, basestring):
             # only return a value if a string (a goto target), ignore all other returns
+            if not ret:
+                # an empty string - rerun the same node
+                return self.nodename
             return ret, kwargs
         return None
 
+    def extract_goto_exec(self, nodename, option_dict):
+        """
+        Helper: Get callables and their eventual kwargs.
+
+        Args:
+            nodename (str): The current node name (used for error reporting).
+            option_dict (dict): The seleted option's dict.
+
+        Returns:
+            goto (str, callable or None): The goto directive in the option.
+            goto_kwargs (dict): Kwargs for `goto` if the former is callable, otherwise empty.
+            execute (callable or None): Executable given by the `exec` directive.
+            exec_kwargs (dict): Kwargs for `execute` if it's callable, otherwise empty.
+
+        """
+        goto_kwargs, exec_kwargs = {}, {}
+        goto, execute = option_dict.get("goto", None), option_dict.get("exec", None)
+        if goto and isinstance(goto, (tuple, list)):
+            if len(goto) > 1:
+                goto, goto_kwargs = goto[:2]  # ignore any extra arguments
+                if not hasattr(goto_kwargs, "__getitem__"):
+                    #  not a dict-like structure
+                    raise EvMenuError("EvMenu node {}: goto kwargs is not a dict: {}".format(
+                                                            nodename, goto_kwargs))
+            else:
+                goto = goto[0]
+        if execute and isinstance(execute, (tuple, list)):
+            if len(execute) > 1:
+                execute, exec_kwargs = execute[:2]  # ignore any extra arguments
+                if not hasattr(exec_kwargs, "__getitem__"):
+                    #  not a dict-like structure
+                    raise EvMenuError("EvMenu node {}: exec kwargs is not a dict: {}".format(
+                                                            nodename, goto_kwargs))
+            else:
+                execute = execute[0]
+        return goto, goto_kwargs, execute, exec_kwargs
+
     def goto(self, nodename, raw_string, **kwargs):
         """
         Run a node by name, optionally dynamically generating that name first.
@@ -681,29 +732,6 @@ class EvMenu(object):
                 argument)
 
         """
-        def _extract_goto_exec(option_dict):
-            "Helper: Get callables and their eventual kwargs"
-            goto_kwargs, exec_kwargs = {}, {}
-            goto, execute = option_dict.get("goto", None), option_dict.get("exec", None)
-            if goto and isinstance(goto, (tuple, list)):
-                if len(goto) > 1:
-                    goto, goto_kwargs = goto[:2]  # ignore any extra arguments
-                    if not hasattr(goto_kwargs, "__getitem__"):
-                        #  not a dict-like structure
-                        raise EvMenuError("EvMenu node {}: goto kwargs is not a dict: {}".format(
-                                                                nodename, goto_kwargs))
-                else:
-                    goto = goto[0]
-            if execute and isinstance(execute, (tuple, list)):
-                if len(execute) > 1:
-                    execute, exec_kwargs = execute[:2]  # ignore any extra arguments
-                    if not hasattr(exec_kwargs, "__getitem__"):
-                        #  not a dict-like structure
-                        raise EvMenuError("EvMenu node {}: exec kwargs is not a dict: {}".format(
-                                                                nodename, goto_kwargs))
-                else:
-                    execute = execute[0]
-            return goto, goto_kwargs, execute, exec_kwargs
 
         if callable(nodename):
             # run the "goto" callable, if possible
@@ -714,6 +742,9 @@ class EvMenu(object):
                     raise EvMenuError(
                             "{}: goto callable must return str or (str, dict)".format(inp_nodename))
                 nodename, kwargs = nodename[:2]
+            if not nodename:
+                # no nodename return. Re-run current node
+                nodename = self.nodename
         try:
             # execute the found node, make use of the returns.
             nodetext, options = self._execute_node(nodename, raw_string, **kwargs)
@@ -746,12 +777,12 @@ class EvMenu(object):
                 desc = dic.get("desc", dic.get("text", None))
                 if "_default" in keys:
                     keys = [key for key in keys if key != "_default"]
-                    goto, goto_kwargs, execute, exec_kwargs = _extract_goto_exec(dic)
+                    goto, goto_kwargs, execute, exec_kwargs = self.extract_goto_exec(nodename, dic)
                     self.default = (goto, goto_kwargs, execute, exec_kwargs)
                 else:
                     # use the key (only) if set, otherwise use the running number
                     keys = list(make_iter(dic.get("key", str(inum + 1).strip())))
-                    goto, goto_kwargs, execute, exec_kwargs = _extract_goto_exec(dic)
+                    goto, goto_kwargs, execute, exec_kwargs = self.extract_goto_exec(nodename, dic)
                 if keys:
                     display_options.append((keys[0], desc))
                     for key in keys:
@@ -945,14 +976,164 @@ class EvMenu(object):
             node (str): The formatted node to display.
 
         """
+        screen_width = self._session.protocol_flags.get("SCREENWIDTH", {0: 78})[0]
+
         nodetext_width_max = max(m_len(line) for line in nodetext.split("\n"))
         options_width_max = max(m_len(line) for line in optionstext.split("\n"))
-        total_width = max(options_width_max, nodetext_width_max)
+        total_width = min(screen_width, max(options_width_max, nodetext_width_max))
         separator1 = "_" * total_width + "\n\n" if nodetext_width_max else ""
         separator2 = "\n" + "_" * total_width + "\n\n" if total_width else ""
         return separator1 + "|n" + nodetext + "|n" + separator2 + "|n" + optionstext
 
 
+# -----------------------------------------------------------
+#
+# List node (decorator turning a node into a list with
+#   look/edit/add functionality for the elements)
+#
+# -----------------------------------------------------------
+
+def list_node(option_generator, select=None, pagesize=10):
+    """
+    Decorator for making an EvMenu node into a multi-page list node. Will add new options,
+    prepending those options added in the node.
+
+    Args:
+        option_generator (callable or list): A list of strings indicating the options, or a callable
+            that is called as option_generator(caller) to produce such a list.
+        select (callable, option): Will be called as select(caller, menuchoice)
+            where menuchoice is the chosen option as a string. Should return the target node to
+            goto after this selection (or None to repeat the list-node). Note that if this is not
+            given, the decorated node must itself provide a way to continue from the node!
+        pagesize (int): How many options to show per page.
+
+    Example:
+        @list_node(['foo', 'bar'], select)
+        def node_index(caller):
+            text = "describing the list"
+            return text, []
+
+    Notes:
+        All normal `goto` or `exec` callables returned from the decorated nodes will, if they accept
+        **kwargs, get a new kwarg 'available_choices' injected. These are the ordered list of named
+        options (descs) visible on the current node page.
+
+    """
+
+    def decorator(func):
+
+        def _select_parser(caller, raw_string, **kwargs):
+            """
+            Parse the select action
+            """
+            available_choices = kwargs.get("available_choices", [])
+
+            try:
+                index = int(raw_string.strip()) - 1
+                selection = available_choices[index]
+            except Exception:
+                caller.msg("|rInvalid choice.|n")
+            else:
+                if select:
+                    try:
+                        return select(caller, selection)
+                    except Exception:
+                        logger.log_trace()
+            return None
+
+        def _list_node(caller, raw_string, **kwargs):
+
+            option_list = option_generator(caller) \
+                    if callable(option_generator) else option_generator
+
+            npages = 0
+            page_index = 0
+            page = []
+            options = []
+
+            if option_list:
+                nall_options = len(option_list)
+                pages = [option_list[ind:ind + pagesize]
+                         for ind in range(0, nall_options, pagesize)]
+                npages = len(pages)
+
+                page_index = max(0, min(npages - 1, kwargs.get("optionpage_index", 0)))
+                page = pages[page_index]
+
+            text = ""
+            extra_text = None
+
+            # dynamic, multi-page option list. Each selection leads to the `select`
+            # callback being called with a result from the available choices
+            options.extend([{"desc": opt,
+                             "goto": (_select_parser,
+                                      {"available_choices": page})} for opt in page])
+
+            if npages > 1:
+                # if the goto callable returns None, the same node is rerun, and
+                # kwargs not used by the callable are passed on to the node. This
+                # allows us to call ourselves over and over, using different kwargs.
+                options.append({"key": ("|Wcurrent|n", "c"),
+                                "desc": "|W({}/{})|n".format(page_index + 1, npages),
+                                "goto": (lambda caller: None,
+                                         {"optionpage_index": page_index})})
+                if page_index > 0:
+                    options.append({"key": ("|wp|Wrevious page|n", "p"),
+                                    "goto": (lambda caller: None,
+                                             {"optionpage_index": page_index - 1})})
+                if page_index < npages - 1:
+                    options.append({"key": ("|wn|Wext page|n", "n"),
+                                    "goto": (lambda caller: None,
+                                             {"optionpage_index": page_index + 1})})
+
+            # add data from the decorated node
+
+            decorated_options = []
+            try:
+                text, decorated_options = func(caller, raw_string)
+            except TypeError:
+                try:
+                    text, decorated_options = func(caller)
+                except Exception:
+                    raise
+            except Exception:
+                logger.log_trace()
+            else:
+                if isinstance(decorated_options, {}):
+                    decorated_options = [decorated_options]
+                else:
+                    decorated_options = make_iter(decorated_options)
+
+            extra_options = []
+            for eopt in decorated_options:
+                cback = ("goto" in eopt and "goto") or ("exec" in eopt and "exec") or None
+                if cback:
+                    signature = eopt[cback]
+                    if callable(signature):
+                        # callable with no kwargs defined
+                        eopt[cback] = (signature, {"available_choices": page})
+                    elif is_iter(signature):
+                        if len(signature) > 1 and isinstance(signature[1], dict):
+                            signature[1]["available_choices"] = page
+                            eopt[cback] = signature
+                        elif signature:
+                            # a callable alone in a tuple (i.e. no previous kwargs)
+                            eopt[cback] = (signature[0], {"available_choices": page})
+                        else:
+                            # malformed input.
+                            logger.log_err("EvMenu @list_node decorator found "
+                                           "malformed option to decorate: {}".format(eopt))
+                extra_options.append(eopt)
+
+            options.extend(extra_options)
+            text = text + "\n\n" + extra_text if extra_text else text
+
+            return text, options
+
+        return _list_node
+    return decorator
+
+
 # -------------------------------------------------------------------------------------------------
 #
 # Simple input shortcuts

From 894969da13480e5720788ca01337a521fe51e2f1 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 20 Apr 2018 19:51:12 +0200
Subject: [PATCH 208/217] Fix unittests

---
 evennia/contrib/tests.py | 18 +++++++++---------
 evennia/utils/evmenu.py  |  6 +++++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py
index 30bf71dcc8..be5921ff67 100644
--- a/evennia/contrib/tests.py
+++ b/evennia/contrib/tests.py
@@ -670,7 +670,7 @@ class TestGenderSub(CommandTest):
         char = create_object(gendersub.GenderCharacter, key="Gendered", location=self.room1)
         txt = "Test |p gender"
         self.assertEqual(gendersub._RE_GENDER_PRONOUN.sub(char._get_pronoun, txt), "Test their gender")
-              
+
 # test health bar contrib
 
 from evennia.contrib import health_bar
@@ -798,7 +798,7 @@ from evennia.contrib import talking_npc
 class TestTalkingNPC(CommandTest):
     def test_talkingnpc(self):
         npc = create_object(talking_npc.TalkingNPC, key="npctalker", location=self.room1)
-        self.call(talking_npc.CmdTalk(), "", "(You walk up and talk to Char.)|")
+        self.call(talking_npc.CmdTalk(), "", "(You walk up and talk to Char.)")
         npc.delete()
 
 
@@ -966,7 +966,7 @@ class TestTurnBattleCmd(CommandTest):
         self.call(tb_basic.CmdPass(), "", "You can only do that in combat. (see: help fight)")
         self.call(tb_basic.CmdDisengage(), "", "You can only do that in combat. (see: help fight)")
         self.call(tb_basic.CmdRest(), "", "Char rests to recover HP.")
-        
+
     # Test equipment commands
     def test_turnbattleequipcmd(self):
         # Start with equip module specific commands.
@@ -984,7 +984,7 @@ class TestTurnBattleCmd(CommandTest):
         self.call(tb_equip.CmdPass(), "", "You can only do that in combat. (see: help fight)")
         self.call(tb_equip.CmdDisengage(), "", "You can only do that in combat. (see: help fight)")
         self.call(tb_equip.CmdRest(), "", "Char rests to recover HP.")
-        
+
     # Test range commands
     def test_turnbattlerangecmd(self):
         # Start with range module specific commands.
@@ -998,7 +998,7 @@ class TestTurnBattleCmd(CommandTest):
         self.call(tb_range.CmdPass(), "", "You can only do that in combat. (see: help fight)")
         self.call(tb_range.CmdDisengage(), "", "You can only do that in combat. (see: help fight)")
         self.call(tb_range.CmdRest(), "", "Char rests to recover HP.")
-        
+
 
 class TestTurnBattleFunc(EvenniaTest):
 
@@ -1080,7 +1080,7 @@ class TestTurnBattleFunc(EvenniaTest):
         self.assertTrue(turnhandler.db.fighters == [joiner, attacker, defender])
         # Remove the script at the end
         turnhandler.stop()
-        
+
     # Test the combat functions in tb_equip too. They work mostly the same.
     def test_tbequipfunc(self):
         attacker = create_object(tb_equip.TBEquipCharacter, key="Attacker")
@@ -1159,7 +1159,7 @@ class TestTurnBattleFunc(EvenniaTest):
         self.assertTrue(turnhandler.db.fighters == [joiner, attacker, defender])
         # Remove the script at the end
         turnhandler.stop()
-        
+
     # Test combat functions in tb_range too.
     def test_tbrangefunc(self):
         testroom = create_object(DefaultRoom, key="Test Room")
@@ -1264,7 +1264,7 @@ Bar
 -Qux"""
 
 class TestTreeSelectFunc(EvenniaTest):
-    
+
     def test_tree_functions(self):
         # Dash counter
         self.assertTrue(tree_select.dashcount("--test") == 2)
@@ -1279,7 +1279,7 @@ class TestTreeSelectFunc(EvenniaTest):
         # Option list to menu options
         test_optlist = tree_select.parse_opts(TREE_MENU_TESTSTR, category_index=2)
         optlist_to_menu_expected_result = [{'goto': ['menunode_treeselect', {'newindex': 3}], 'key': 'Baz 1'},
-        {'goto': ['menunode_treeselect', {'newindex': 4}], 'key': 'Baz 2'}, 
+        {'goto': ['menunode_treeselect', {'newindex': 4}], 'key': 'Baz 2'},
         {'goto': ['menunode_treeselect', {'newindex': 1}], 'key': ['<< Go Back', 'go back', 'back'], 'desc': 'Return to the previous menu.'}]
         self.assertTrue(tree_select.optlist_to_menuoptions(TREE_MENU_TESTSTR, test_optlist, 2, True, True) == optlist_to_menu_expected_result)
 
diff --git a/evennia/utils/evmenu.py b/evennia/utils/evmenu.py
index a2a92f5e34..0e494ca3e0 100644
--- a/evennia/utils/evmenu.py
+++ b/evennia/utils/evmenu.py
@@ -976,7 +976,11 @@ class EvMenu(object):
             node (str): The formatted node to display.
 
         """
-        screen_width = self._session.protocol_flags.get("SCREENWIDTH", {0: 78})[0]
+        if self._session:
+            screen_width = self._session.protocol_flags.get(
+                    "SCREENWIDTH", {0: _MAX_TEXT_WIDTH})[0]
+        else:
+            screen_width = _MAX_TEXT_WIDTH
 
         nodetext_width_max = max(m_len(line) for line in nodetext.split("\n"))
         options_width_max = max(m_len(line) for line in optionstext.split("\n"))

From a71f112d8009b9b99e9fd55a2fab2aadb978dcb5 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 21 Apr 2018 15:31:30 +0200
Subject: [PATCH 209/217] Inject selection in list_node decorator if select
 kwarg is a string

---
 evennia/utils/evmenu.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/evennia/utils/evmenu.py b/evennia/utils/evmenu.py
index 0e494ca3e0..f6806c06b8 100644
--- a/evennia/utils/evmenu.py
+++ b/evennia/utils/evmenu.py
@@ -1005,10 +1005,12 @@ def list_node(option_generator, select=None, pagesize=10):
     Args:
         option_generator (callable or list): A list of strings indicating the options, or a callable
             that is called as option_generator(caller) to produce such a list.
-        select (callable, option): Will be called as select(caller, menuchoice)
-            where menuchoice is the chosen option as a string. Should return the target node to
-            goto after this selection (or None to repeat the list-node). Note that if this is not
-            given, the decorated node must itself provide a way to continue from the node!
+        select (callable or str, optional): Node to redirect a selection to. Its `**kwargs` will
+            contain the `available_choices` list and `selection` will hold one of the elements in
+            that list.  If a callable, it will be called as select(caller, menuchoice) where
+            menuchoice is the chosen option as a string. Should return the target node to goto after
+            this selection (or None to repeat the list-node). Note that if this is not given, the
+            decorated node must itself provide a way to continue from the node!
         pagesize (int): How many options to show per page.
 
     Example:
@@ -1038,11 +1040,16 @@ def list_node(option_generator, select=None, pagesize=10):
             except Exception:
                 caller.msg("|rInvalid choice.|n")
             else:
-                if select:
+                if callable(select):
                     try:
                         return select(caller, selection)
                     except Exception:
                         logger.log_trace()
+                else:
+                    # we assume a string was given, we inject the result into the kwargs
+                    # to pass on to the next node
+                    kwargs['selection'] = selection
+                    return str(select)
             return None
 
         def _list_node(caller, raw_string, **kwargs):

From b580123b19564c3b8c5da42513c95b6aed35a1a6 Mon Sep 17 00:00:00 2001
From: friarzen <friarzen@gmail.com>
Date: Sat, 21 Apr 2018 17:03:01 +0000
Subject: [PATCH 210/217] Attempt to make append/replace dialog text more clear

---
 .../webclient/static/webclient/js/webclient_gui.js   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/evennia/web/webclient/static/webclient/js/webclient_gui.js b/evennia/web/webclient/static/webclient/js/webclient_gui.js
index 8929a7529c..e1ed4d31fd 100644
--- a/evennia/web/webclient/static/webclient/js/webclient_gui.js
+++ b/evennia/web/webclient/static/webclient/js/webclient_gui.js
@@ -484,13 +484,13 @@ function onSplitDialog() {
     dialog.append('<input type="text" name="new_pane1" value="" />');
     dialog.append('<input type="text" name="new_pane2" value="" />');
 
-    dialog.append("<h3>New First Pane Flow</h3>");
-    dialog.append('<input type="radio" name="flow1" value="append" checked>append<br />');
-    dialog.append('<input type="radio" name="flow1" value="replace">replace<br />');
+    dialog.append("<h3>New First Pane</h3>");
+    dialog.append('<input type="radio" name="flow1" value="append" checked>append new incoming messages<br />');
+    dialog.append('<input type="radio" name="flow1" value="replace">replace old messages with new ones<br />');
 
-    dialog.append("<h3>New Second Pane Flow</h3>");
-    dialog.append('<input type="radio" name="flow2" value="append" checked>append<br />');
-    dialog.append('<input type="radio" name="flow2" value="replace">replace<br />');
+    dialog.append("<h3>New Second Pane</h3>");
+    dialog.append('<input type="radio" name="flow2" value="append" checked>append new incoming messages<br />');
+    dialog.append('<input type="radio" name="flow2" value="replace">replace old messages with new ones<br />');
 
     dialog.append('<div id="splitclose" class="button">Split It</div>');
 

From c97ba87e9bcd32c36fae3948ee8505ed85210b6e Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 22 Apr 2018 13:39:47 +0200
Subject: [PATCH 211/217] Fix error if sending string to list_node select
 callback

---
 evennia/utils/evmenu.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/evennia/utils/evmenu.py b/evennia/utils/evmenu.py
index f6806c06b8..0de33de348 100644
--- a/evennia/utils/evmenu.py
+++ b/evennia/utils/evmenu.py
@@ -1045,11 +1045,12 @@ def list_node(option_generator, select=None, pagesize=10):
                         return select(caller, selection)
                     except Exception:
                         logger.log_trace()
-                else:
+                elif select:
                     # we assume a string was given, we inject the result into the kwargs
                     # to pass on to the next node
                     kwargs['selection'] = selection
                     return str(select)
+            # this means the previous node will be re-run with these same kwargs
             return None
 
         def _list_node(caller, raw_string, **kwargs):

From 24fc553784492c2164d059a9dc1d0cfdb1ee20e5 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 22 Apr 2018 14:48:55 +0200
Subject: [PATCH 212/217] Make EvTable respect col-widths while retaining total
 table width. Resolves #1614.

---
 evennia/contrib/mail.py  |  2 +-
 evennia/contrib/tests.py |  2 +-
 evennia/utils/evtable.py | 96 ++++++++++++++++++++++++++++++++--------
 3 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/evennia/contrib/mail.py b/evennia/contrib/mail.py
index 6e8585136d..dbecb62fcd 100644
--- a/evennia/contrib/mail.py
+++ b/evennia/contrib/mail.py
@@ -253,7 +253,7 @@ class CmdMail(default_cmds.MuxCommand):
                     index += 1
 
                 table.reformat_column(0, width=6)
-                table.reformat_column(1, width=17)
+                table.reformat_column(1, width=18)
                 table.reformat_column(2, width=34)
                 table.reformat_column(3, width=13)
                 table.reformat_column(4, width=7)
diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py
index ff6b01d5cf..1e526bd9cb 100644
--- a/evennia/contrib/tests.py
+++ b/evennia/contrib/tests.py
@@ -688,7 +688,7 @@ class TestMail(CommandTest):
                   "You have received a new @mail from TestAccount2(account 2)|You sent your message.", caller=self.account2)
         self.call(mail.CmdMail(), "TestAccount=Message 1", "You sent your message.", caller=self.account2)
         self.call(mail.CmdMail(), "TestAccount=Message 2", "You sent your message.", caller=self.account2)
-        self.call(mail.CmdMail(), "", "| ID:   From:            Subject:", caller=self.account)
+        self.call(mail.CmdMail(), "", "| ID:   From:             Subject:", caller=self.account)
         self.call(mail.CmdMail(), "2", "From: TestAccount2", caller=self.account)
         self.call(mail.CmdMail(), "/forward TestAccount2 = 1/Forward message", "You sent your message.|Message forwarded.", caller=self.account)
         self.call(mail.CmdMail(), "/reply 2=Reply Message2", "You sent your message.", caller=self.account)
diff --git a/evennia/utils/evtable.py b/evennia/utils/evtable.py
index 31218189ab..ffb29873c4 100644
--- a/evennia/utils/evtable.py
+++ b/evennia/utils/evtable.py
@@ -893,6 +893,9 @@ class EvColumn(object):
 
         """
         col = self.column
+        # fixed options for the column will override those requested in the call!
+        # this is particularly relevant to things like width/height, to avoid
+        # fixed-widths columns from being auto-balanced
         kwargs.update(self.options)
         # use fixed width or adjust to the largest cell
         if "width" not in kwargs:
@@ -1283,25 +1286,59 @@ class EvTable(object):
                 cwidths_min = [max(cell.get_min_width() for cell in col) for col in self.worktable]
                 cwmin = sum(cwidths_min)
 
-                if cwmin > width:
-                    # we cannot shrink any more
-                    raise Exception("Cannot shrink table width to %s. Minimum size is %s." % (self.width, cwmin))
+                # get which cols have separately set widths - these should be locked
+                # note that we need to remove cwidths_min for each lock to avoid counting
+                # it twice (in cwmin and in locked_cols)
+                locked_cols = {icol: col.options['width'] - cwidths_min[icol]
+                               for icol, col in enumerate(self.worktable) if 'width' in col.options}
+                locked_width = sum(locked_cols.values())
+
+                excess = width - cwmin - locked_width
+
+                if len(locked_cols) >= ncols and excess:
+                    # we can't adjust the width at all - all columns are locked
+                    raise Exception("Cannot balance table to width %s - "
+                                    "all columns have a set, fixed width summing to %s!" % (
+                                        self.width, sum(cwidths)))
+
+                if excess < 0:
+                    # the locked cols makes it impossible
+                    raise Exception("Cannot shrink table width to %s. "
+                                    "Minimum size (and/or fixed-width columns) "
+                                    "sets minimum at %s." % (self.width, cwmin + locked_width))
 
-                excess = width - cwmin
                 if self.evenwidth:
                     # make each column of equal width
-                    for _ in range(excess):
+                    # use cwidths as a work-array to track weights
+                    cwidths = copy(cwidths_min)
+                    correction = 0
+                    while correction < excess:
                         # flood-fill the minimum table starting with the smallest columns
-                        ci = cwidths_min.index(min(cwidths_min))
-                        cwidths_min[ci] += 1
+                        ci = cwidths.index(min(cwidths))
+                        if ci in locked_cols:
+                            # locked column, make sure it's not picked again
+                            cwidths[ci] += 9999
+                            cwidths_min[ci] = locked_cols[ci]
+                        else:
+                            cwidths_min[ci] += 1
+                            correction += 1
                     cwidths = cwidths_min
                 else:
                     # make each column expand more proportional to their data size
-                    for _ in range(excess):
+                    # we use cwidth as a work-array to track weights
+                    correction = 0
+                    while correction < excess:
                         # fill wider columns first
                         ci = cwidths.index(max(cwidths))
-                        cwidths_min[ci] += 1
-                        cwidths[ci] -= 3
+                        if ci in locked_cols:
+                            # locked column, make sure it's not picked again
+                            cwidths[ci] -= 9999
+                            cwidths_min[ci] = locked_cols[ci]
+                        else:
+                            cwidths_min[ci] += 1
+                            correction += 1
+                            # give a just changed col less prio next run
+                            cwidths[ci] -= 3
                     cwidths = cwidths_min
 
         # reformat worktable (for width align)
@@ -1323,28 +1360,46 @@ class EvTable(object):
                                     for cell in (col[iy] for col in self.worktable)) for iy in range(nrowmax)]
                 chmin = sum(cheights_min)
 
+                # get which cols have separately set heights - these should be locked
+                # note that we need to remove cheights_min for each lock to avoid counting
+                # it twice (in chmin and in locked_cols)
+                locked_cols = {icol: col.options['height'] - cheights_min[icol]
+                               for icol, col in enumerate(self.worktable) if 'height' in col.options}
+                locked_height = sum(locked_cols.values())
+
+                excess = self.height - chmin - locked_height
+
                 if chmin > self.height:
                     # we cannot shrink any more
-                    raise Exception("Cannot shrink table height to %s. Minimum size is %s." % (self.height, chmin))
+                    raise Exception("Cannot shrink table height to %s. Minimum "
+                                    "size (and/or fixed-height rows) sets minimum at %s." % (
+                                        self.height, chmin + locked_height))
 
                 # now we add all the extra height up to the desired table-height.
                 # We do this so that the tallest cells gets expanded first (and
                 # thus avoid getting cropped)
 
-                excess = self.height - chmin
                 even = self.height % 2 == 0
-                for position in range(excess):
+                correction = 0
+                while correction < excess:
                     # expand the cells with the most rows first
-                    if 0 <= position < nrowmax and nrowmax > 1:
+                    if 0 <= correction < nrowmax and nrowmax > 1:
                         # avoid adding to header first round (looks bad on very small tables)
                         ci = cheights[1:].index(max(cheights[1:])) + 1
                     else:
                         ci = cheights.index(max(cheights))
-                    cheights_min[ci] += 1
-                    if ci == 0 and self.header:
-                        # it doesn't look very good if header expands too fast
-                        cheights[ci] -= 2 if even else 3
-                    cheights[ci] -= 2 if even else 1
+                    if ci in locked_cols:
+                        # locked row, make sure it's not picked again
+                        cheights[ci] -= 9999
+                        cheights_min[ci] = locked_cols[ci]
+                    else:
+                        cheights_min[ci] += 1
+                        # change balance
+                        if ci == 0 and self.header:
+                            # it doesn't look very good if header expands too fast
+                            cheights[ci] -= 2 if even else 3
+                        cheights[ci] -= 2 if even else 1
+                        correction += 1
                 cheights = cheights_min
 
                 # we must tell cells to crop instead of expanding
@@ -1554,6 +1609,8 @@ class EvTable(object):
         """
         if index > len(self.table):
             raise Exception("Not a valid column index")
+        # we update the columns' options which means eventual width/height
+        # will be 'locked in' and withstand auto-balancing width/height from the table later
         self.table[index].options.update(kwargs)
         self.table[index].reformat(**kwargs)
 
@@ -1569,6 +1626,7 @@ class EvTable(object):
 
     def __str__(self):
         """print table (this also balances it)"""
+        # h = "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
         return str(unicode(ANSIString("\n").join([line for line in self._generate_lines()])))
 
     def __unicode__(self):

From 895cc2de5214315e2888da399e1cffd4cfb3de4a Mon Sep 17 00:00:00 2001
From: Rachel Blackman <packetdancer@gmail.com>
Date: Sun, 8 Apr 2018 13:11:35 -0700
Subject: [PATCH 213/217] Add /contains switch to find.

---
 evennia/commands/default/building.py | 15 ++++++++++-----
 evennia/commands/default/tests.py    |  1 +
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index 702f2e241a..a111e2c878 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -2270,11 +2270,12 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
       @locate - this is a shorthand for using the /loc switch.
 
     Switches:
-      room - only look for rooms (location=None)
-      exit - only look for exits (destination!=None)
-      char - only look for characters (BASE_CHARACTER_TYPECLASS)
-      exact- only exact matches are returned.
-      loc  - display object location if exists and match has one result
+      room    - only look for rooms (location=None)
+      exit    - only look for exits (destination!=None)
+      char    - only look for characters (BASE_CHARACTER_TYPECLASS)
+      exact   - only exact matches are returned.
+      loc     - display object location if exists and match has one result
+      contains- search for names containing the string, rather than starting with.
 
     Searches the database for an object of a particular name or exact #dbref.
     Use *accountname to search for an account. The switches allows for
@@ -2359,6 +2360,10 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
                 keyquery = Q(db_key__iexact=searchstring, id__gte=low, id__lte=high)
                 aliasquery = Q(db_tags__db_key__iexact=searchstring,
                                db_tags__db_tagtype__iexact="alias", id__gte=low, id__lte=high)
+            elif "contains" in switches:
+                keyquery = Q(db_key__icontains=searchstring, id__gte=low, id__lte=high)
+                aliasquery = Q(db_tags__db_key__icontains=searchstring,
+                               db_tags__db_tagtype__iexact="alias", id__gte=low, id__lte=high)
             else:
                 keyquery = Q(db_key__istartswith=searchstring, id__gte=low, id__lte=high)
                 aliasquery = Q(db_tags__db_key__istartswith=searchstring,
diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 8e73a8bf5d..37e4b07b03 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -339,6 +339,7 @@ class TestBuilding(CommandTest):
         self.call(building.CmdFind(), "Char2", expect, cmdstring="@locate")
         self.call(building.CmdFind(), "/l Char2", expect, cmdstring="find")  # /l switch is abbreviated form of /loc
         self.call(building.CmdFind(), "Char2", "One Match", cmdstring="@find")
+        self.call(building.CmdFind(), "/contains om2", "One Match")
 
     def test_script(self):
         self.call(building.CmdScript(), "Obj = scripts.Script", "Script scripts.Script successfully added")

From 3b99e10a6a3fcbed903294b5501899e6b9e8ed12 Mon Sep 17 00:00:00 2001
From: Rachel Blackman <packetdancer@gmail.com>
Date: Sun, 8 Apr 2018 13:30:01 -0700
Subject: [PATCH 214/217] 0.8 has switches defined in the command, need to make
 the change from the 0.7 changeset this originated from.

---
 evennia/commands/default/building.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index a111e2c878..dee9cd737e 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -2286,7 +2286,7 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
 
     key = "@find"
     aliases = "@search, @locate"
-    switch_options = ("room", "exit", "char", "exact", "loc")
+    switch_options = ("room", "exit", "char", "exact", "loc", "contains")
     locks = "cmd:perm(find) or perm(Builder)"
     help_category = "Building"
 

From 84620256c682bbaf6254e1ddc8df22387945183a Mon Sep 17 00:00:00 2001
From: Rachel Blackman <packetdancer@gmail.com>
Date: Sat, 21 Apr 2018 17:00:38 -0700
Subject: [PATCH 215/217] Switch /contains to default, add /startswith switch
 instead.

---
 evennia/commands/default/building.py | 24 ++++++++++++------------
 evennia/commands/default/tests.py    |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index dee9cd737e..3cda726881 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -2270,12 +2270,12 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
       @locate - this is a shorthand for using the /loc switch.
 
     Switches:
-      room    - only look for rooms (location=None)
-      exit    - only look for exits (destination!=None)
-      char    - only look for characters (BASE_CHARACTER_TYPECLASS)
-      exact   - only exact matches are returned.
-      loc     - display object location if exists and match has one result
-      contains- search for names containing the string, rather than starting with.
+      room       - only look for rooms (location=None)
+      exit       - only look for exits (destination!=None)
+      char       - only look for characters (BASE_CHARACTER_TYPECLASS)
+      exact      - only exact matches are returned.
+      loc        - display object location if exists and match has one result
+      startswith - search for names starting with the string, rather than containing
 
     Searches the database for an object of a particular name or exact #dbref.
     Use *accountname to search for an account. The switches allows for
@@ -2286,7 +2286,7 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
 
     key = "@find"
     aliases = "@search, @locate"
-    switch_options = ("room", "exit", "char", "exact", "loc", "contains")
+    switch_options = ("room", "exit", "char", "exact", "loc", "startswith")
     locks = "cmd:perm(find) or perm(Builder)"
     help_category = "Building"
 
@@ -2360,14 +2360,14 @@ class CmdFind(COMMAND_DEFAULT_CLASS):
                 keyquery = Q(db_key__iexact=searchstring, id__gte=low, id__lte=high)
                 aliasquery = Q(db_tags__db_key__iexact=searchstring,
                                db_tags__db_tagtype__iexact="alias", id__gte=low, id__lte=high)
-            elif "contains" in switches:
-                keyquery = Q(db_key__icontains=searchstring, id__gte=low, id__lte=high)
-                aliasquery = Q(db_tags__db_key__icontains=searchstring,
-                               db_tags__db_tagtype__iexact="alias", id__gte=low, id__lte=high)
-            else:
+            elif "startswith" in switches:
                 keyquery = Q(db_key__istartswith=searchstring, id__gte=low, id__lte=high)
                 aliasquery = Q(db_tags__db_key__istartswith=searchstring,
                                db_tags__db_tagtype__iexact="alias", id__gte=low, id__lte=high)
+            else:
+                keyquery = Q(db_key__icontains=searchstring, id__gte=low, id__lte=high)
+                aliasquery = Q(db_tags__db_key__icontains=searchstring,
+                               db_tags__db_tagtype__iexact="alias", id__gte=low, id__lte=high)
 
             results = ObjectDB.objects.filter(keyquery | aliasquery).distinct()
             nresults = results.count()
diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index 37e4b07b03..f296ca61b6 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -329,7 +329,7 @@ class TestBuilding(CommandTest):
         self.call(building.CmdLock(), "Obj = test:perm(Developer)", "Added lock 'test:perm(Developer)' to Obj.")
 
     def test_find(self):
-        self.call(building.CmdFind(), "Room2", "One Match")
+        self.call(building.CmdFind(), "oom2", "One Match")
         expect = "One Match(#1#7, loc):\n   " +\
                  "Char2(#7)  evennia.objects.objects.DefaultCharacter (location: Room(#1))"
         self.call(building.CmdFind(), "Char2", expect, cmdstring="locate")
@@ -339,7 +339,7 @@ class TestBuilding(CommandTest):
         self.call(building.CmdFind(), "Char2", expect, cmdstring="@locate")
         self.call(building.CmdFind(), "/l Char2", expect, cmdstring="find")  # /l switch is abbreviated form of /loc
         self.call(building.CmdFind(), "Char2", "One Match", cmdstring="@find")
-        self.call(building.CmdFind(), "/contains om2", "One Match")
+        self.call(building.CmdFind(), "/startswith Room2", "One Match")
 
     def test_script(self):
         self.call(building.CmdScript(), "Obj = scripts.Script", "Script scripts.Script successfully added")

From b810ca8a1c6ba5e5e3d94772fe94a5ba54eff484 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 22 Apr 2018 22:28:43 +0200
Subject: [PATCH 216/217] Add check_lockstring as a function in
 locks/lockhandler.py

---
 evennia/locks/lockhandler.py | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/evennia/locks/lockhandler.py b/evennia/locks/lockhandler.py
index b8801f9655..14ac34a989 100644
--- a/evennia/locks/lockhandler.py
+++ b/evennia/locks/lockhandler.py
@@ -541,6 +541,42 @@ class LockHandler(object):
             return all(self._eval_access_type(accessing_obj, locks, access_type) for access_type in locks)
 
 
+# convenience access function
+
+# dummy to be able to call check_lockstring from the outside
+_LOCK_HANDLER = LockHandler()
+
+
+def check_lockstring(self, accessing_obj, lockstring, no_superuser_bypass=False,
+                     default=False, access_type=None):
+    """
+    Do a direct check against a lockstring ('atype:func()..'),
+    without any intermediary storage on the accessed object.
+
+    Args:
+        accessing_obj (object or None): The object seeking access.
+            Importantly, this can be left unset if the lock functions
+            don't access it, no updating or storage of locks are made
+            against this object in this method.
+        lockstring (str): Lock string to check, on the form
+            `"access_type:lock_definition"` where the `access_type`
+            part can potentially be set to a dummy value to just check
+            a lock condition.
+        no_superuser_bypass  (bool, optional): Force superusers to heed lock.
+        default (bool, optional): Fallback result to use if `access_type` is set
+            but no such `access_type` is found in the given `lockstring`.
+        access_type (str, bool): If set, only this access_type will be looked up
+            among the locks defined by `lockstring`.
+
+    Return:
+        access (bool): If check is passed or not.
+
+    """
+    return _LOCK_HANDLER.check_lockstring(
+        accessing_obj, lockstring, no_superuser_bypass=no_superuser_bypass,
+        default=default, access_type=access_type)
+
+
 def _test():
     # testing
 

From 5edea757c904f5b17ca00a52f492689371a6e9ab Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 25 Apr 2018 22:34:33 +0200
Subject: [PATCH 217/217] Fix lockhandler singleton implmentation with a
 dummyobj

---
 evennia/locks/lockhandler.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/evennia/locks/lockhandler.py b/evennia/locks/lockhandler.py
index 14ac34a989..14556579d7 100644
--- a/evennia/locks/lockhandler.py
+++ b/evennia/locks/lockhandler.py
@@ -544,7 +544,11 @@ class LockHandler(object):
 # convenience access function
 
 # dummy to be able to call check_lockstring from the outside
-_LOCK_HANDLER = LockHandler()
+
+class _ObjDummy:
+    lock_storage = ''
+
+_LOCK_HANDLER = LockHandler(_ObjDummy())
 
 
 def check_lockstring(self, accessing_obj, lockstring, no_superuser_bypass=False,