archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify struct use

Browse Source
This commit is contained in:
Campbell Barton
2014-10-15 10:12:43 +02:00
parent e23ed6a669
commit cff1d0d204
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
blendfile.py
View File

@@ -193,6 +193,8 @@ class BlendFileBlock:
) )
def __init__(self, handle, bfile): def __init__(self, handle, bfile):
OLDBLOCK = struct.Struct(b'4sI')
self.file = bfile self.file = bfile
data = handle.read(bfile.block_header_struct.size) data = handle.read(bfile.block_header_struct.size)
@@ -268,13 +270,6 @@ class BlendFileBlock:
# pointer_size = int # pointer_size = int
# is_little_endian = bool # is_little_endian = bool
# version = int # version = int
BLOCKHEADERSTRUCT = {}
BLOCKHEADERSTRUCT["<4"] = struct.Struct(b'<4sIIII')
BLOCKHEADERSTRUCT[">4"] = struct.Struct(b'>4sIIII')
BLOCKHEADERSTRUCT["<8"] = struct.Struct(b'<4sIQII')
BLOCKHEADERSTRUCT[">8"] = struct.Struct(b'>4sIQII')
FILEHEADER = struct.Struct(b'7s1s1s3s')
OLDBLOCK = struct.Struct(b'4sI')
class BlendFileHeader: class BlendFileHeader:
@@ -298,6 +293,8 @@ class BlendFileHeader:
) )
def __init__(self, handle): def __init__(self, handle):
FILEHEADER = struct.Struct(b'7s1s1s3s')
log.debug("reading blend-file-header") log.debug("reading blend-file-header")
values = FILEHEADER.unpack(handle.read(FILEHEADER.size)) values = FILEHEADER.unpack(handle.read(FILEHEADER.size))
self.magic = values[0] self.magic = values[0]
@@ -311,12 +308,12 @@ class BlendFileHeader:
endian_id = values[2] endian_id = values[2]
if endian_id == b'v': if endian_id == b'v':
self.is_little_endian = True self.is_little_endian = True
self.endian_str = "<" self.endian_str = b'<'
self.endian_index = 0 self.endian_index = 0
elif endian_id == b'V': elif endian_id == b'V':
self.is_little_endian = False self.is_little_endian = False
self.endian_index = 1 self.endian_index = 1
self.endian_str = ">" self.endian_str = b'>'
else: else:
assert(0) assert(0)
@@ -324,7 +321,12 @@ class BlendFileHeader:
self.version = int(version_id) self.version = int(version_id)
def create_block_header_struct(self): def create_block_header_struct(self):
return BLOCKHEADERSTRUCT[self.endian_str + str(self.pointer_size)] return struct.Struct(b''.join((
self.endian_str,
b'4sI',
b'I' if self.pointer_size == 4 else b'Q',
b'II',
)))
class DNACatalog: class DNACatalog:
@@ -342,7 +344,7 @@ class DNACatalog:
def __init__(self, header, block, handle): def __init__(self, header, block, handle):
log.debug("building DNA catalog") log.debug("building DNA catalog")
shortstruct = DNA_IO.USHORT[header.endian_index] shortstruct = DNA_IO.USHORT[header.endian_index]
shortstruct2 = struct.Struct(DNA_IO.USHORT[header.endian_index].format + b'H') shortstruct2 = struct.Struct(header.endian_str + b'HH')
intstruct = DNA_IO.UINT[header.endian_index] intstruct = DNA_IO.UINT[header.endian_index]
data = handle.read(block.size) data = handle.read(block.size)
self.names = [] self.names = []
@@ -645,7 +647,7 @@ class DNA_IO:
@staticmethod @staticmethod
def read_float(handle, fileheader): def read_float(handle, fileheader):
return struct.unpack(fileheader.endian_str + "f", handle.read(4))[0] return struct.unpack(fileheader.endian_str + b'f', handle.read(4))[0]
SSHORT = struct.Struct(b'<h'), struct.Struct(b'>h') SSHORT = struct.Struct(b'<h'), struct.Struct(b'>h')