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

simplify DNAField.calc_name_only

Browse Source
This commit is contained in:
Campbell Barton
2014-10-17 10:06:29 +02:00
parent d95a9f1d70
commit bde34ddb35
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packer/blendfile.py
View File

@@ -286,7 +286,7 @@ class BlendFileBlock:
self.file.structs[self.sdna_index].dna_type_id.decode('ascii'), self.file.structs[self.sdna_index].dna_type_id.decode('ascii'),
self.code.decode(), self.code.decode(),
self.size, self.size,
b", ".join(f.dna_name.name_short for f in self.file.structs[self.sdna_index].fields).decode('ascii'), b", ".join(f.dna_name.name_only for f in self.file.structs[self.sdna_index].fields).decode('ascii'),
hex(self.addr_old), hex(self.addr_old),
)) ))
@@ -398,7 +398,7 @@ class BlendFileBlock:
def keys(self): def keys(self):
dna_struct = self.file.structs[self.sdna_index] dna_struct = self.file.structs[self.sdna_index]
return (f.dna_name.name_short for f in dna_struct.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())
@@ -480,7 +480,7 @@ class DNAName:
""" """
__slots__ = ( __slots__ = (
"name", "name",
"name_short", "name_only",
"is_pointer", "is_pointer",
"is_method_pointer", "is_method_pointer",
"array_size", "array_size",
@@ -488,7 +488,7 @@ class DNAName:
def __init__(self, name): def __init__(self, name):
self.name = name self.name = name
self.name_short = self.calc_name_short() self.name_only = self.calc_name_only()
self.is_pointer = self.calc_is_pointer() self.is_pointer = self.calc_is_pointer()
self.is_method_pointer = self.calc_is_method_pointer() self.is_method_pointer = self.calc_is_method_pointer()
self.array_size = self.calc_array_size() self.array_size = self.calc_array_size()
@@ -499,14 +499,11 @@ class DNAName:
else: else:
result = parent + b'.' result = parent + b'.'
result = result + self.name_short result = result + self.name_only
return result return result
def calc_name_short(self): def calc_name_only(self):
result = self.name result = self.name.strip(b'*()')
result = result.replace(b'*', b'')
result = result.replace(b'(', b'')
result = result.replace(b')', b'')
index = result.find(b'[') index = result.find(b'[')
if index != -1: if index != -1:
result = result[:index] result = result[:index]
@@ -574,7 +571,7 @@ class DNAStruct:
# TODO, use dict lookup? # 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_short == name: if dna_name.name_only == name:
return field return field
def field_from_path(self, handle, path): def field_from_path(self, handle, path):
@@ -595,7 +592,7 @@ class DNAStruct:
field = self.field_from_path(handle, path) field = self.field_from_path(handle, path)
if field is None: if field is None:
raise KeyError("%r not found in %r" % (path, [f.dna_name.name_short for f in self.fields])) raise KeyError("%r not found in %r" % (path, [f.dna_name.name_only for f in self.fields]))
dna_type = field.dna_type dna_type = field.dna_type
dna_name = field.dna_name dna_name = field.dna_name
@@ -625,7 +622,7 @@ class DNAStruct:
field = self.field_from_path(handle, path) field = self.field_from_path(handle, path)
if field is None: if field is None:
raise KeyError("%r not found in %r" % (path, [f.dna_name.name_short for f in self.fields])) raise KeyError("%r not found in %r" % (path, [f.dna_name.name_only for f in self.fields]))
dna_type = field.dna_type dna_type = field.dna_type
dna_name = field.dna_name dna_name = field.dna_name
@@ -762,5 +759,3 @@ class DNA_IO:
if header.pointer_size == 8: if header.pointer_size == 8:
st = DNA_IO.ULONG[header.endian_index] st = DNA_IO.ULONG[header.endian_index]
return st.unpack(handle.read(st.size))[0] return st.unpack(handle.read(st.size))[0]