LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Added error detection to overviewerConfig.js parsing.

Browse Source
This commit is contained in:
Andrew Brown
2012-02-08 21:31:45 -05:00
parent 9319fee138
commit fec8e28f5c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
overviewer_core/assetmanager.py
View File

@@ -18,6 +18,8 @@ import os
import codecs import codecs
import locale import locale
import time import time
import logging
from PIL import Image from PIL import Image
import util import util
@@ -45,11 +47,13 @@ directory.
self.POI = dict() self.POI = dict()
# look for overviewerConfig in self.outputdir # look for overviewerConfig in self.outputdir
if os.path.exists(os.path.join(self.outputdir, "overviewerConfig.js")): try:
with open(os.path.join(self.outputdir, "overviewerConfig.js")) as c: with open(os.path.join(self.outputdir, "overviewerConfig.js")) as c:
overviewerConfig_str = "{" + "\n".join(c.readlines()[1:-1]) + "}" overviewerConfig_str = "{" + "\n".join(c.readlines()[1:-1]) + "}"
self.overviewerConfig = json.loads(overviewerConfig_str) self.overviewerConfig = json.loads(overviewerConfig_str)
else: except Exception, e:
if os.path.exists(os.path.join(self.outputdir, "overviewerConfig.js")):
logging.warning("A previous overviewerConfig.js was found, but I couldn't read it for some reason. Continuing with a blank config")
self.overviewerConfig = dict(tilesets=dict()) self.overviewerConfig = dict(tilesets=dict())
def get_tileset_config(self, name): def get_tileset_config(self, name):