TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-19 05:06:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix save to other file, tag end of entity dicts to help with CVS merges

Browse Source
This commit is contained in:
Darren Ranalli 2003-11-01 02:55:22 +00:00
parent e7f567692f
commit 2410cbc67c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
direct/src/level/LevelSpec.py
View File

@ -15,7 +15,8 @@ class LevelSpec:
notify = DirectNotifyGlobal.directNotify.newCategory("LevelSpec") notify = DirectNotifyGlobal.directNotify.newCategory("LevelSpec")
def __init__(self, spec=None, scenario=0): def __init__(self, spec=None, scenario=0):
"""spec must be passed in as a python module or a dictionary""" """spec must be passed in as a python module or a dictionary.
If not passed in, will create a new spec."""
newSpec = 0 newSpec = 0
if type(spec) is types.ModuleType: if type(spec) is types.ModuleType:
self.specDict = spec.levelSpec self.specDict = spec.levelSpec
@ -144,7 +145,7 @@ class LevelSpec:
def setAttribChange(self, entId, attrib, value, username): def setAttribChange(self, entId, attrib, value, username):
""" we're being asked to change an attribute """ """ we're being asked to change an attribute """
LevelSpec.notify.info("setAttribChange(%s): %s, %s = '%s'" % LevelSpec.notify.info("setAttribChange(%s): %s, %s = %s" %
(username, entId, attrib, repr(value))) (username, entId, attrib, repr(value)))
self.doSetAttrib(entId, attrib, value) self.doSetAttrib(entId, attrib, value)
if self.hasLevel(): if self.hasLevel():
@ -198,20 +199,18 @@ class LevelSpec:
def getFilename(self): def getFilename(self):
return self.filename return self.filename
def privGetBackupFilename(self): def privGetBackupFilename(self, filename):
return '%s.bak' % self.getFilename() return '%s.bak' % filename
def saveToDisk(self, filename=None, makeBackup=1): def saveToDisk(self, filename=None, makeBackup=1):
"""returns zero on failure""" """returns zero on failure"""
print 'saveToDisk', filename
if filename is None: if filename is None:
filename = self.filename filename = self.filename
if makeBackup and self.privFileExists(filename): if makeBackup and self.privFileExists(filename):
print 'HERE'
# create a backup # create a backup
try: try:
backupFilename = self.privGetBackupFilename() backupFilename = self.privGetBackupFilename(filename)
self.privRemoveFile(backupFilename) self.privRemoveFile(backupFilename)
os.rename(filename, backupFilename) os.rename(filename, backupFilename)
except OSError, e: except OSError, e:
@ -303,7 +302,8 @@ class LevelSpec:
for attrib in attribs: for attrib in attribs:
str += t(2)+"'%s': %s,\n" % (attrib, str += t(2)+"'%s': %s,\n" % (attrib,
repr(spec[attrib])) repr(spec[attrib]))
str += t(2)+'},\n' # maybe this will help with CVS merges?
str += t(2)+'}, # end entity %s\n' % entId
str += t(1)+'}\n' str += t(1)+'}\n'
return str return str