Track whether loading is underway

[mudpy.git] / mudpy / misc.py

diff --git a/mudpy/misc.py b/mudpy/misc.py
index 1d2ffff..4e32ccc 100644 (file)
--- a/mudpy/misc.py
+++ b/mudpy/misc.py
@@ -1,6 +1,6 @@
 """Miscellaneous functions for the mudpy engine."""
 
 """Miscellaneous functions for the mudpy engine."""
 

-# Copyright (c) 2004-2016 Jeremy Stanley <fungi@yuggoth.org>. Permission
+# Copyright (c) 2004-2017 Jeremy Stanley <fungi@yuggoth.org>. Permission

 # to use, copy, modify, and distribute this software is granted under
 # terms provided in the LICENSE file distributed with this software.
 
 # to use, copy, modify, and distribute this software is granted under
 # terms provided in the LICENSE file distributed with this software.
 


@@ -347,6 +347,7 @@ class Universe:
         self.contents = {}
         self.default_origins = {}
         self.directions = set()
         self.contents = {}
         self.default_origins = {}
         self.directions = set()

+        self.loading = False

         self.loglines = []
         self.private_files = []
         self.reload_flag = False
         self.loglines = []
         self.private_files = []
         self.reload_flag = False


@@ -375,6 +376,9 @@ class Universe:
     def load(self):
         """Load universe data from persistent storage."""
 
     def load(self):
         """Load universe data from persistent storage."""
 

+        # while loading, it's safe to update elements from read-only files
+        self.loading = True
+

         # it's possible for this to enter before logging configuration is read
         pending_loglines = []
 
         # it's possible for this to enter before logging configuration is read
         pending_loglines = []
 


@@ -425,6 +429,10 @@ class Universe:
         for element in self.contents.values():
             element.update_location()
             element.clean_contents()
         for element in self.contents.values():
             element.update_location()
             element.clean_contents()

+
+        # done loading, so disallow updating elements from read-only files
+        self.loading = False
+

         return pending_loglines
 
     def new(self):
         return pending_loglines
 
     def new(self):