Incorporate pending logs from load during reloads

[mudpy.git] / mudpy / misc.py

diff --git a/mudpy/misc.py b/mudpy/misc.py
index e9845d5..86e4b9d 100644 (file)
--- a/mudpy/misc.py
+++ b/mudpy/misc.py
@@ -186,34 +186,33 @@ class Element:
 
     def is_restricted(self):
         """Boolean check whether command is administrative or debugging."""
-        return(
-            self.get("administrative", False) or self.get("debugging", False))
+        return bool(self.get("administrative") or self.get("debugging"))
 
     def is_admin(self):
         """Boolean check whether an actor is controlled by an admin owner."""
-        return(self.owner and self.owner.is_admin())
+        return self.owner and self.owner.is_admin()
 
     def can_run(self, command):
         """Check if the user can run this command object."""
 
         # has to be in the commands group
         if command not in self.universe.groups["command"].values():
-            return(False)
+            return False
 
         # debugging commands are not allowed outside debug mode
         if command.get("debugging") and not self.universe.debug_mode():
-            return(False)
+            return False
 
         # avatars of administrators can run any command
         if self.is_admin():
-            return(True)
+            return True
 
         # everyone can run non-administrative commands
         if not command.is_restricted():
-            return(True)
+            return True
 
         # otherwise the command cannot be run by this actor
-        return(False)
+        return False
 
     def update_location(self):
         """Make sure the location's contents contain this element."""
@@ -578,7 +577,7 @@ class User:
         self.remove()
 
         # get rid of the old user object
-        del(self)
+        del self
 
         # create a new user object
         new_user = User()
@@ -642,7 +641,7 @@ class User:
 
                 # take this one out of the list and delete
                 self.remove()
-                del(self)
+                del self
                 return_value = True
                 break
 
@@ -1014,7 +1013,7 @@ class User:
 
     def is_admin(self):
         """Boolean check whether user's account is an admin."""
-        return(self.account.get("administrator", False))
+        return self.account.get("administrator", False)
 
 
 def broadcast(message, add_prompt=True):
@@ -1086,14 +1085,14 @@ def log(message, level=0):
     for line in lines:
         while 0 < len(universe.loglines) >= max_log_lines:
             del universe.loglines[0]
-        universe.loglines.append((level, timestamp + " " + line))
+        universe.loglines.append((timestamp + " " + line, level))
 
 
 def get_loglines(level, start, stop):
     """Return a specific range of loglines filtered by level."""
 
     # filter the log lines
-    loglines = [x for x in universe.loglines if x[0] >= level]
+    loglines = [x for x in universe.loglines if x[1] >= level]
 
     # we need these in several places
     total_count = str(len(universe.loglines))
@@ -1115,11 +1114,10 @@ def get_loglines(level, start, stop):
             stop = 1
 
         # some preamble
-        message = "There are " + str(total_count)
-        message += " log lines in memory and " + str(filtered_count)
-        message += " at or above level " + str(level) + "."
-        message += " The matching lines from " + str(stop) + " to "
-        message += str(start) + " are:$(eol)$(eol)"
+        message = (
+            "There are %s log lines in memory and %s at or above level %s. "
+            "The matching lines from %s to %s are:$(eol)$(eol)" %
+            (total_count, filtered_count, level, stop, start))
 
         # add the text from the selected lines
         if stop > 1:
@@ -1127,14 +1125,13 @@ def get_loglines(level, start, stop):
         else:
             range_lines = loglines[-start:]
         for line in range_lines:
-            message += "   (" + str(line[0]) + ") " + line[1].replace(
-                "$(", "$_("
-            ) + "$(eol)"
+            message += "   (%s) %s$(eol)" % (
+                line[1], line[0].replace("$(", "$_("))
 
     # there were no lines
     else:
-        message = "None of the " + str(total_count)
-        message += " lines in memory matches your request."
+        message = "None of the %s lines in memory matches your request." % (
+            total_count)
 
     # pass it back
     return message
@@ -1466,9 +1463,9 @@ def reload_data():
     old_loglines = universe.loglines[:]
     for element in list(universe.contents.values()):
         element.destroy()
-    universe.load()
+    pending_loglines = universe.load()
     new_loglines = universe.loglines[:]
-    universe.loglines = old_loglines + new_loglines
+    universe.loglines = old_loglines + new_loglines + pending_loglines
     for user in old_userlist:
         user.reload()