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

Add index support to path resolving

Browse Source
This commit is contained in:
Campbell Barton
2014-10-17 12:04:09 +02:00
parent bde34ddb35
commit 1e66a2c2f2
1 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
packer/blendfile.py
View File

@@ -281,12 +281,13 @@ class BlendFileBlock:
) )
def __str__(self): def __str__(self):
return ("<%s.%s (%s), size=%d, fields=[%s] at %s>" % return ("<%s.%s (%s), size=%d at %s>" %
# fields=[%s]
(self.__class__.__name__, (self.__class__.__name__,
self.file.structs[self.sdna_index].dna_type_id.decode('ascii'), self.dna_type.dna_type_id.decode('ascii'),
self.code.decode(), self.code.decode(),
self.size, self.size,
b", ".join(f.dna_name.name_only for f in self.file.structs[self.sdna_index].fields).decode('ascii'), # b", ".join(f.dna_name.name_only for f in self.dna_type.fields).decode('ascii'),
hex(self.addr_old), hex(self.addr_old),
)) ))
@@ -326,6 +327,9 @@ class BlendFileBlock:
self.count = 0 self.count = 0
self.file_offset = 0 self.file_offset = 0
@property
def dna_type(self):
return self.file.structs[self.sdna_index]
def refine_type_from_index(self, sdna_index_next): def refine_type_from_index(self, sdna_index_next):
assert(type(sdna_index_next) is int) assert(type(sdna_index_next) is int)
@@ -376,7 +380,7 @@ class BlendFileBlock:
if sdna_index_refine is None: if sdna_index_refine is None:
sdna_index_refine = self.sdna_index sdna_index_refine = self.sdna_index
result = self.get(path, sdna_index_refine=sdna_index_refine) result = self.get(path, sdna_index_refine=sdna_index_refine)
assert(self.file.structs[sdna_index_refine].field_from_path(self.file.handle, path).dna_name.is_pointer) assert(self.file.structs[sdna_index_refine].field_from_path(self.file.header, self.file.handle, path).dna_name.is_pointer)
if result != 0: if result != 0:
# possible (but unlikely) # possible (but unlikely)
# that this fails and returns None # that this fails and returns None
@@ -397,8 +401,7 @@ class BlendFileBlock:
self.set(item, value) self.set(item, value)
def keys(self): def keys(self):
dna_struct = self.file.structs[self.sdna_index] return (f.dna_name.name_only for f in self.dna_type.fields)
return (f.dna_name.name_only for f in dna_struct.fields)
def values(self): def values(self):
return (self[k] for k in self.keys()) return (self[k] for k in self.keys())
@@ -568,29 +571,46 @@ class DNAStruct:
self.fields = [] self.fields = []
def field_from_name(self, name): def field_from_name(self, name):
# TODO, use dict lookup?
for field in self.fields: for field in self.fields:
dna_name = field.dna_name dna_name = field.dna_name
if dna_name.name_only == name: if dna_name.name_only == name:
return field return field
def field_from_path(self, handle, path): def field_from_path(self, header, handle, path):
assert(type(path) == bytes) assert(type(path) == bytes)
# support 'id.name'
name, _, name_tail = path.partition(b'.') name, _, name_tail = path.partition(b'.')
# support 'mtex[1].tex'
# note, multi-dimensional arrays not supported
# FIXME: 'mtex[1]' works, but not 'mtex[1].tex', why is this???
if name.endswith(b']'):
name, _, index = name[:-1].partition(b'[')
index = int(index)
else:
index = 0
field = self.field_from_name(name) field = self.field_from_name(name)
if field is not None: if field is not None:
handle.seek(field.dna_offset, os.SEEK_CUR) handle.seek(field.dna_offset, os.SEEK_CUR)
if index != 0:
if field.dna_name.is_pointer:
index_offset = header.pointer_size * index
else:
index_offset = field.dna_type.size * index
assert(index_offset < field.dna_size)
handle.seek(index_offset, os.SEEK_CUR)
if name_tail == b'': if name_tail == b'':
return field return field
else: else:
return field.dna_type.field_from_path(handle, name_tail) return field.dna_type.field_from_path(header, handle, name_tail)
def field_get(self, header, handle, path, def field_get(self, header, handle, path,
use_nil=True, use_str=True): use_nil=True, use_str=True):
assert(type(path) == bytes) assert(type(path) == bytes)
field = self.field_from_path(handle, path) field = self.field_from_path(header, handle, path)
if field is None: if field is None:
raise KeyError("%r not found in %r" % (path, [f.dna_name.name_only for f in self.fields])) raise KeyError("%r not found in %r" % (path, [f.dna_name.name_only for f in self.fields]))
@@ -620,7 +640,7 @@ class DNAStruct:
def field_set(self, header, handle, path, value): def field_set(self, header, handle, path, value):
assert(type(path) == bytes) assert(type(path) == bytes)
field = self.field_from_path(handle, path) field = self.field_from_path(header, handle, path)
if field is None: if field is None:
raise KeyError("%r not found in %r" % (path, [f.dna_name.name_only for f in self.fields])) raise KeyError("%r not found in %r" % (path, [f.dna_name.name_only for f in self.fields]))