X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=lib%2Fmudpy%2Fmisc.py;h=b3f2e25d2454c44fcd3ce46905447dc6e2c00769;hp=ed205a2f038d2532848ea3a330b255aaf31fa536;hb=381d70d0d1d4b80e89acc46435031ed9c9547374;hpb=3b16769152e6f5bff553a37d0e69f35dee28dc29 diff --git a/lib/mudpy/misc.py b/lib/mudpy/misc.py index ed205a2..b3f2e25 100644 --- a/lib/mudpy/misc.py +++ b/lib/mudpy/misc.py @@ -23,9 +23,12 @@ class Element: """An element of the universe.""" - def __init__(self, key, universe, filename=None): + def __init__(self, key, universe, filename=None, old_style=False): """Set up a new element.""" + # TODO(fungi): This can be removed after the transition is complete + self.old_style = old_style + # keep track of our key name self.key = key @@ -33,7 +36,7 @@ class Element: self.universe = universe # clone attributes if this is replacing another element - if self.key in self.universe.contents: + if self.old_style and self.key in self.universe.contents: old_element = self.universe.contents[self.key] for attribute in vars(old_element).keys(): exec("self." + attribute + " = old_element." + attribute) @@ -43,6 +46,9 @@ class Element: # i guess this is a new element then else: + # set of facet keys from the universe + self.facethash = dict() + # not owned by a user by default (used for avatars) self.owner = None @@ -82,7 +88,8 @@ class Element: def reload(self): """Create a new element and replace this one.""" - Element(self.key, self.universe, self.origin.filename) + Element(self.key, self.universe, self.origin.filename, + old_style=self.old_style) del(self) def destroy(self): @@ -94,10 +101,13 @@ class Element: def facets(self): """Return a list of non-inherited facets for this element.""" - try: - return self.origin.data[self.key].keys() - except (AttributeError, KeyError): - return [] + if self.old_style: + try: + return self.origin.data[self.key].keys() + except (AttributeError, KeyError): + return [] + else: + return self.facethash def has_facet(self, facet): """Return whether the non-inherited facet exists.""" @@ -129,7 +139,10 @@ class Element: if default is None: default = "" try: - return self.origin.data[self.key][facet] + if self.old_style: + return self.origin.data[self.key][facet] + else: + return self.origin.data[".".join((self.key, facet))] except (KeyError, TypeError): pass if self.has_facet("inherit"): @@ -142,9 +155,14 @@ class Element: def set(self, facet, value): """Set values.""" if not self.has_facet(facet) or not self.get(facet) == value: - if self.key not in self.origin.data: - self.origin.data[self.key] = {} - self.origin.data[self.key][facet] = value + if self.old_style: + if self.key not in self.origin.data: + self.origin.data[self.key] = {} + self.origin.data[self.key][facet] = value + else: + node = ".".join((self.key, facet)) + self.origin.data[node] = value + self.facethash[node] = self.origin.data[node] self.origin.modified = True def append(self, facet, value): @@ -890,8 +908,7 @@ class User: # log non-printable characters remaining if mudpy.telnet.is_enabled(self, mudpy.telnet.TELOPT_BINARY, mudpy.telnet.HIM): - asciiline = b"".join( - filter(lambda x: b" " <= x <= b"~", line)) + asciiline = bytes([x for x in line if 32 <= x <= 126]) if line != asciiline: logline = "Non-ASCII characters from " if self.account and self.account.get("name"): @@ -930,7 +947,7 @@ class User: "actor:avatar:" + self.account.get("name") + ":" + str( counter ), - universe + universe, old_style=True ) self.avatar.append("inherit", "archetype:avatar") self.account.append("avatars", self.avatar.key) @@ -1380,7 +1397,7 @@ def on_pulse(): # add an element for counters if it doesn't exist if "counters" not in universe.categories["internal"]: universe.categories["internal"]["counters"] = Element( - "internal:counters", universe + "internal:counters", universe, old_style=True ) # update the log every now and then @@ -1718,7 +1735,7 @@ def handler_entering_account_name(user): # otherwise, this could be a brand new user else: - user.account = Element("account:" + name, universe) + user.account = Element("account:" + name, universe, old_style=True) user.account.set("name", name) log("New user: " + name, 2) user.state = "checking_new_account_name" @@ -2037,11 +2054,11 @@ def command_say(actor, parameters): if message: # match the punctuation used, if any, to an action - actions = universe.categories["internal"]["language"].get( + actions = universe.contents["mudpy.linguistic"].get( "actions" ) default_punctuation = ( - universe.categories["internal"]["language"].get( + universe.contents["mudpy.linguistic"].get( "default_punctuation")) action = "" @@ -2066,7 +2083,7 @@ def command_say(actor, parameters): message = message[0].lower() + message[1:] # iterate over all words in message, replacing typos - typos = universe.categories["internal"]["language"].get( + typos = universe.contents["mudpy.linguistic"].get( "typos" ) words = message.split() @@ -2172,10 +2189,13 @@ def command_show(actor, parameters): + "\" element (in \"" + element.origin.filename + "\"):$(eol)") facets = element.facets() - facets.sort() - for facet in facets: - message += ("$(eol) $(grn)" + facet + ": $(red)" - + escape_macros(element.get(facet)) + "$(nrm)") + for facet in sorted(facets): + if element.old_style: + message += ("$(eol) $(grn)%s: $(red)%s$(nrm)" % + (facet, escape_macros(element.get(facet)))) + else: + message += ("$(eol) $(grn)%s: $(red)%s$(nrm)" % + (facet, str(facets[facet]))) else: message = "Element \"" + arguments[1] + "\" does not exist." elif arguments[0] == "result": @@ -2249,7 +2269,7 @@ def command_create(actor, parameters): " Warning: \"" + filename + "\" is not yet " "included in any other file and will not be read " "on startup unless this is remedied.") - Element(element, universe, filename) + Element(element, universe, filename, old_style=True) log(logline, 6) elif len(arguments) > 2: message = "You can only specify an element and a filename."