LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Allow global defaults to be specified

Browse Source
This commit is contained in:
Andrew Chin
2011-12-31 20:59:02 -05:00
parent 06dd78dc89
commit fed7ae0157
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
overviewer_core/configParser.py
View File

@@ -224,7 +224,10 @@ class MultiWorldParser(object):
glob = dict(render=dict(), custom_rendermodes=dict()) glob = dict(render=dict(), custom_rendermodes=dict())
try: try:
execfile(self.settings_file, glob, glob) execfile(self.settings_file, glob, glob)
# delete the builtins, we don't need it
del glob['__builtins__']
except NameError, ex: except NameError, ex:
import traceback import traceback
traceback.print_exc() traceback.print_exc()
@@ -240,18 +243,25 @@ class MultiWorldParser(object):
self.render = glob['render'] self.render = glob['render']
self.custom_rendermodes = glob['custom_rendermodes'] self.custom_rendermodes = glob['custom_rendermodes']
#import pprint
#pprint.pprint(glob, indent=2) # anything that's not 'render' or 'custom_rendermode' is a default
del glob['render']
del glob['custom_rendermodes']
self.defaults = glob
import pprint
pprint.pprint(glob, indent=2)
def validate(self): def validate(self):
for worldname in self.render: for worldname in self.render:
world = self.render[worldname] world = self.render[worldname]
world.update(self.defaults)
for key in world: for key in world:
if key not in settingsDefinition.render: if key not in settingsDefinition.render:
print "Warning: %r is not a known setting" print "Warning: %r is not a known setting" % key
next next
definition = settingsDefinition.render[key] definition = settingsDefinition.render[key]

4
overviewer_core/settingsDefinition.py
View File

@@ -15,8 +15,8 @@ from settingsValidators import *
render = { render = {
"path": dict(required=True, validator=validatePath), "world_path": dict(required=True, validator=validatePath),
"rendermodes": dict(required=False, validator=validateRenderMode), "rendermode": dict(required=False, validator=validateRenderMode),
"north-direction": dict(required=False, validator=validateNorthDirection), "north-direction": dict(required=False, validator=validateNorthDirection),
"render-range": dict(required=False, validator=validateRenderRange), "render-range": dict(required=False, validator=validateRenderRange),
"force-render": dict(required=False, validator=bool), "force-render": dict(required=False, validator=bool),

10
test/data/settings/settings_test_1.py
View File

@@ -1,5 +1,11 @@
world_path="test/data/settings/test_world"
rendermode = "normal"
render["world"] = { render["world"] = {
"path": "test/data/settings/test_world", "rendermode": "normal",
"rendermodes": ["normal"],
"north-direction": ["upper-left"], "north-direction": ["upper-left"],
} }
render["otherworld"] = {
"rendermode": "foo"
}

4
test/data/settings/settings_test_rendermode.py
View File

@@ -1,5 +1,5 @@
render["world"] = { render["world"] = {
"path": "test/data/settings/test_world", "world_path": "test/data/settings/test_world",
"rendermodes": ["bad_rendermode"], "rendermode": "bad_rendermode",
"north-direction": ["upper-left"], "north-direction": ["upper-left"],
} }