LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge remote branch 'source/master' into remote-tiles

Browse Source 
Conflicts:
	overviewer.py
This commit is contained in:
Fabian Norman
2012-05-02 01:04:13 -07:00
parent 4fe87de247 6331200763
commit 8ffcec347a
19 changed files with 550 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
overviewer_core/settingsDefinition.py
View File

@@ -79,6 +79,7 @@ renders = Setting(required=True, default=util.OrderedDict(),
"crop": Setting(required=False, validator=validateCrop, default=None),
"changelist": Setting(required=False, validator=validateStr, default=None),
"markers": Setting(required=False, validator=validateMarkers, default=[]),
"overlay": Setting(required=False, validator=validateOverlays, default=[]),
"showspawn": Setting(required=False, validator=validateBool, default=True),
"base": Setting(required=False, validator=validateStr, default=None),
@@ -99,9 +100,10 @@ processes = Setting(required=True, validator=int, default=-1)
# ends up adding overhead and isn't worth it.
memcached_host = Setting(required=False, validator=str, default=None)
if platform.system() == 'Windows' or not sys.stderr.isatty():
# TODO clean up this ugly in sys.argv hack
if platform.system() == 'Windows' or not sys.stdout.isatty() or "--simple" in sys.argv:
obs = LoggingObserver()
else:
obs = ProgressBarObserver()
obs = ProgressBarObserver(fd=sys.stdout)
observer = Setting(required=True, validator=validateObserver, default=obs)