Skip to content

Don't assume element has 'id' on import #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nopey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't assume element has 'id' on import #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions io_scene_valvesource/datamodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,12 @@ def type(self,value): self._type = str(value)

@property
def id(self): return self._id

@id.setter
def id(self,value):
if isinstance(value,uuid.UUID): self._id = value
elif isinstance(value,str): self._id = uuid.uuid3(uuid.UUID('20ba94f8-59f0-4579-9e01-50aac4567d3b'),value)
else: raise ValueError("id must be uuid.UUID or str")

def __init__(self,datamodel,name,elemtype="DmElement",id=None,_is_placeholder=False):
self.name = name
self.type = elemtype
Expand All @@ -307,12 +312,10 @@ def __init__(self,datamodel,name,elemtype="DmElement",id=None,_is_placeholder=Fa
self._datamodels.add(datamodel)

if id:
if isinstance(id,uuid.UUID): self._id = id
elif isinstance(id,str): self._id = uuid.uuid3(uuid.UUID('20ba94f8-59f0-4579-9e01-50aac4567d3b'),id)
else: raise ValueError("id must be uuid.UUID or str")
self.id = id
else:
self._id = uuid.uuid4()

super().__init__()

def __eq__(self,other):
Expand Down Expand Up @@ -842,7 +845,6 @@ def parse_line(line):
return re.findall("\"(.*?)\"",line.strip("\n\t ") )

def read_element(elem_type, line_tracker):
name = None
prefix = elem_type == "$prefix_element$"
if prefix: element_chain.append(dm.prefix_attributes)

Expand All @@ -865,6 +867,9 @@ def read_value(name,type_str,kv2_value, index=-1):
elif type_str == 'binary': return Binary(binascii.unhexlify(kv2_value))

new_elem = None
if not prefix:
new_elem = dm.add_element(None, elemtype=elem_type)
element_chain.append(new_elem)
for line_raw in in_file:
next(line_tracker)
if line_raw.strip("\n\t, ").endswith("}"):
Expand All @@ -876,20 +881,18 @@ def read_value(name,type_str,kv2_value, index=-1):
continue

if line[0] == 'id':
if not prefix:
new_elem = dm.add_element(name,elem_type,uuid.UUID(hex=line[2]))
element_chain.append(new_elem)
assert(not prefix)
new_elem.id = uuid.UUID(hex=line[2])
continue
elif line[0] == 'name':
if len(line) > 2: # unnamed element?
if new_elem: new_elem.name = line[2]
else: name = line[2]
new_elem.name = line[2]
continue

# don't read elements outside the element path
if max_elem_path and name and len(dm.elements):
if max_elem_path and new_elem.name and len(dm.elements):
if len(element_path):
skip = name.lower() != element_path[0].lower()
skip = new_elem.name.lower() != element_path[0].lower()
else:
skip = len(element_chain) < max_elem_path
if skip:
Expand All @@ -904,9 +907,6 @@ def read_value(name,type_str,kv2_value, index=-1):
elif len(element_path):
del element_path[0]

if new_elem == None and not prefix:
continue

if len(line) >= 2:
if line[1] == "element_array":
arr_name = line[0]
Expand Down