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

Cleaning up GlobalScriptContainer from some junk logic.

Browse source
This commit is contained in:
Andrew Bastien 2023-09-09 14:13:02 -04:00
parent 376d1d1ec3
commit c91822606f
5 changed files with 1 additions and 708 deletions
Download patch file Download diff file Expand all files Collapse all files

56
evennia/server/serversession.py
View file

@ -16,8 +16,6 @@ from evennia.scripts.monitorhandler import MONITOR_HANDLER
from evennia.typeclasses.attributes import AttributeHandler, DbHolder, InMemoryAttributeBackend
from evennia.utils import logger
from evennia.utils.utils import class_from_module, lazy_property, make_iter
from evennia.utils.evrich import MudConsole, MudConsoleOptions
from rich.color import ColorSystem
_GA = object.__getattribute__
_SA = object.__setattr__
@ -53,57 +51,6 @@ class ServerSession(_BASE_SESSION_CLASS):
self.cmdset_storage_string = ""
self.cmdset = CmdSetHandler(self, True)
@lazy_property
def console(self):
from mudrich import MudConsole
if "SCREENWIDTH" in self.protocol_flags:
width = self.protocol_flags["SCREENWIDTH"][0]
else:
width = 78
return MudConsole(color_system=self.rich_color_system(), width=width,
file=self, record=True)
def rich_color_system(self):
if self.protocol_flags.get("NOCOLOR", False):
return None
if self.protocol_flags.get("XTERM256", False):
return "256"
if self.protocol_flags.get("ANSI", False):
return "standard"
return None
def update_rich(self):
check = self.console
if "SCREENWIDTH" in self.protocol_flags:
self.console._width = self.protocol_flags["SCREENWIDTH"][0]
else:
self.console._width = 80
if self.protocol_flags.get("NOCOLOR", False):
self.console._color_system = None
elif self.protocol_flags.get("XTERM256", False):
self.console._color_system = ColorSystem.EIGHT_BIT
elif self.protocol_flags.get("ANSI", False):
self.console._color_system = ColorSystem.STANDARD
def write(self, b: str):
"""
When self.console.print() is called, it writes output to here.
Not necessarily useful, but it ensures console print doesn't end up sent out stdout or etc.
"""
def flush(self):
"""
Do not remove this method. It's needed to trick Console into treating this object
as a file.
"""
def print(self, *args, **kwargs) -> str:
"""
A thin wrapper around Rich.Console's print. Returns the exported data.
"""
self.console.print(*args, highlight=False, **kwargs)
return self.console.export_text(clear=True, styles=True)
def __cmdset_storage_get(self):
return [path.strip() for path in self.cmdset_storage_string.split(",")]
@ -503,6 +450,3 @@ class ServerSession(_BASE_SESSION_CLASS):
else:
return f"{self.protocol_key}({self.address})"
def load_sync_data(self, sessdata):
super().load_sync_data(sessdata)
self.update_rich()