"""Data interface functions for the mudpy engine."""
-# Copyright (c) 2004-2015 Jeremy Stanley <fungi@yuggoth.org>. Permission
+# Copyright (c) 2004-2016 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.
class DataFile:
- """A file containing universe elements."""
+ """A file containing universe elements and their facets."""
def __init__(self, filename, universe):
self.filename = filename
self.load()
def load(self):
- """Read a file and create elements accordingly."""
+ """Read a file, create elements and poplulate facets accordingly."""
self.modified = False
try:
- self.data = yaml.load(open(self.filename))
+ self.data = yaml.safe_load(open(self.filename))
except FileNotFoundError:
# it's normal if the file is one which doesn't exist yet
+ log_entry = ("File %s is unavailable." % self.filename, 6)
try:
- mudpy.misc.log("Couldn't read %s file." % self.filename, 6)
+ mudpy.misc.log(*log_entry)
except NameError:
# happens when we're not far enough along in the init process
- pass
+ self.universe.setup_loglines.append(log_entry)
if not hasattr(self.universe, "files"):
self.universe.files = {}
self.universe.files[self.filename] = self
includes.append(item)
if item not in self.universe.private_files:
self.universe.private_files.append(item)
- for element in self.data:
- if element != "__control__":
- mudpy.misc.Element(element, self.universe, self.filename)
+ for node in self.data:
+ if node != "__control__":
+ mudpy.misc.Element(node, self.universe, self.filename)
for include_file in includes:
if not os.path.isabs(include_file):
include_file = find_file(
def save(self):
"""Write the data, if necessary."""
+ normal_umask = 0o0022
+ private_umask = 0o0077
+ private_file_mode = 0o0600
# when modified, writeable and has content or the file exists
if self.modified and self.is_writeable() and (
# make parent directories if necessary
if not os.path.exists(os.path.dirname(self.filename)):
+ old_umask = os.umask(normal_umask)
os.makedirs(os.path.dirname(self.filename))
+ os.umask(old_umask)
# backup the file
if "__control__" in self.data and "backup_count" in self.data[
os.rename(self.filename, self.filename + ".0")
# our data file
- file_descriptor = open(self.filename, "w")
-
- # if it's marked private, chmod it appropriately
- if self.filename in self.universe.private_files and oct(
- stat.S_IMODE(os.stat(self.filename)[stat.ST_MODE])
- ) != 0o0600:
- os.chmod(self.filename, 0o0600)
+ if self.filename in self.universe.private_files:
+ old_umask = os.umask(private_umask)
+ file_descriptor = open(self.filename, "w")
+ if oct(stat.S_IMODE(os.stat(
+ self.filename)[stat.ST_MODE])) != private_file_mode:
+ # if it's marked private, chmod it appropriately
+ os.chmod(self.filename, private_file_mode)
+ else:
+ old_umask = os.umask(normal_umask)
+ file_descriptor = open(self.filename, "w")
+ os.umask(old_umask)
# write and close the file
- yaml.dump(self.data, allow_unicode=True, default_flow_style=False,
- stream=file_descriptor)
+ yaml.safe_dump(self.data, allow_unicode=True,
+ default_flow_style=False, stream=file_descriptor)
file_descriptor.close()
# unset the modified flag
else:
search_path = search_path[:]
- # if there's no default path, use the last element of the search path
+ # if there's no default path, use the last component of the search path
if not default_dir:
default_dir = search_path[-1]