diff options
Diffstat (limited to 'lib/pb/landscape/__init__.py')
| -rwxr-xr-x | lib/pb/landscape/__init__.py | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/lib/pb/landscape/__init__.py b/lib/pb/landscape/__init__.py index 54f9806..df8d143 100755 --- a/lib/pb/landscape/__init__.py +++ b/lib/pb/landscape/__init__.py @@ -5,46 +5,46 @@ import urlparse, re class PbLandscape(Pb): example_params = { - 'imgdata' : open('lib/pb/landscape/_base64img', 'rb').read(), - 'texture' : 'http://someurl.biz/someimg.jpg', - 'heightmap' : 'http://someurl.biz/someimg.jpg', - 'name' : 'donkey' + 'imgdata' : open('lib/pb/landscape/_base64img', 'rb').read(), + 'texture' : 'http://someurl.biz/someimg.jpg', + 'heightmap' : 'http://someurl.biz/someimg.jpg', + 'name' : 'donkey' } def __init__(self, **kwargs): - super(PbLandscape,self).__init__(**kwargs); - _definitions = { - 'heightmap': {'type': 'string'} , - 'imgdata': {'type': 'raw' } , - 'texture': {'type': 'string' } , - 'username': {'type': 'string'} , - } - self.params.definitions_import(_definitions, kwargs, classname=self.__class__.__name__); - _namepart = re.sub(r'https?:?/?/?', '', str(self.params.texture)) - self.filename, self.filepath = self._filename_filepath_create(url=_namepart, extension="png") - - self._db_url_param = str(self.params.texture) + super(PbLandscape, self).__init__(**kwargs) + _definitions = { + 'heightmap': {'type': 'string'}, + 'imgdata': {'type': 'raw'}, + 'texture': {'type': 'string'}, + 'username': {'type': 'string'}, + } + self.params.definitions_import(_definitions, kwargs, classname=self.__class__.__name__) + _namepart = re.sub(r'https?:?/?/?', '', str(self.params.texture)) + self.filename, self.filepath = self._filename_filepath_create(url=_namepart, extension="png") + + self._db_url_param = str(self.params.texture) def _saveImgData(self): - try: - up = urlparse.urlparse(str(self.params.imgdata)) - head, data = up.path.split(',', 1) - bits = head.split(';') - mime_type = bits[0] if bits[0] else 'text/plain' - charset, b64 = 'ASCII', False - for bit in bits[1]: - if bit.startswith('charset='): - charset = bit[8:] - elif bit == 'base64': - b64 = True + try: + up = urlparse.urlparse(str(self.params.imgdata)) + head, data = up.path.split(',', 1) + bits = head.split(';') + #mime_type = bits[0] if bits[0] else 'text/plain' + #charset, b64 = 'ASCII', False + #for bit in bits[1]: + # if bit.startswith('charset='): + # charset = bit[8:] + # elif bit == 'base64': + # b64 = True - # Do something smart with charset and b64 instead of assuming - plaindata = base64.b64decode(data) + # Do something smart with charset and b64 instead of assuming + plaindata = base64.b64decode(data) - with open(self.filepath, 'wb') as f: - f.write(plaindata) - except Exception as e: - self.err_warn(str(e)); + with open(self.filepath, 'wb') as f: + f.write(plaindata) + except Exception as e: + self.err_warn(str(e)) def create(self, breakmode=""): - self._saveImgData(); + self._saveImgData() super(PbLandscape, self).create() |
