@@ -81,6 +81,12 @@ def __init__(self, reader: EndianBinaryReader):
8181 "double" : self .reader .read_double ,
8282 "bool" : self .reader .read_boolean ,
8383 }
84+
85+ self .READ2 = {
86+ "string" : self .read_string ,
87+ "map" : self .read_map ,
88+ "TypelessData" : self .read_typeless_data ,
89+ }
8490
8591 def read_u_type (self , members : list ) -> dict :
8692 i = RefInt (0 )
@@ -91,6 +97,33 @@ def read_u_type(self, members: list) -> dict:
9197 i .v += 1
9298 return obj
9399
100+ def read_string (self , i , align , * args ):
101+ value = self .reader .read_aligned_string ()
102+ i .v += 3
103+ return value , align
104+
105+ def read_map (self , i , align , members , level ):
106+ if (members [i + 1 ].meta_flag & 0x4000 ) != 0 :
107+ align = True
108+ size = self .reader .read_int ()
109+ map_ = get_members (members , level , i )[4 :]
110+ i .v += len (map_ ) + 3
111+ first = get_members (map_ , map_ [0 ].level , 0 )
112+ second = map_ [len (first ):]
113+ value = {}
114+ for j in range (size ):
115+ tmp1 = RefInt (0 )
116+ tmp2 = RefInt (0 )
117+ v1 = self .read_value (first , tmp1 ) # python reads the value first and then the key, so it has to be this way
118+ value [v1 ] = self .read_value (second , tmp2 )
119+ return value , align
120+
121+ def read_typeless_data (self , i , align , * args ):
122+ size = self .reader .read_int ()
123+ value = self .reader .read_bytes (size )
124+ i .v += 2
125+ return value , align
126+
94127 def read_value (self , members : list , i ) -> object :
95128 if type (i ) != RefInt :
96129 i = RefInt (i )
@@ -102,48 +135,29 @@ def read_value(self, members: list, i) -> object:
102135 value = self .READ .get (var_type_str )
103136 if value :
104137 value = value ()
105- elif var_type_str == "string" :
106- value = self .reader .read_aligned_string ()
107- i .v += 3
108- elif var_type_str == "map" :
109- if (members [i + 1 ].meta_flag & 0x4000 ) != 0 :
110- align = True
111- size = self .reader .read_int ()
112- map_ = get_members (members , level , i )[4 :]
113- i .v += len (map_ ) + 3
114- first = get_members (map_ , map_ [0 ].level , 0 )
115- second = map_ [len (first ):]
116-
117- value = {}
118- for j in range (size ):
119- tmp1 = RefInt (0 )
120- tmp2 = RefInt (0 )
121- v1 = self .read_value (first , tmp1 ) # python reads the value first and then the key, so it has to be this way
122- value [v1 ] = self .read_value (second , tmp2 )
123-
124- elif var_type_str == "TypelessData" :
125- size = self .reader .read_int ()
126- value = self .reader .read_bytes (size )
127- i .v += 2
128138 else :
129- if i != len (members ) and members [i .v + 1 ].type == "Array" :
130- if (members [i .v + 1 ].meta_flag & 0x4000 ) != 0 :
131- align = True
132- size = self .reader .read_int ()
133- vector = get_members (members , level , i )[3 :]
134- i .v += len (vector ) + 2
135- value = [self .read_value (vector , 0 ) for j in range (size )]
139+ value = self .READ2 .get (var_type_str )
140+ if value :
141+ value , align = value (i , align , members , level )
136142 else :
137- eclass = get_members (members , level , i )
138- eclass .pop (0 )
139- i .v += len (eclass )
140- j = RefInt (0 )
141- value = {}
142- while j < len (eclass ):
143- classmember = eclass [j .v ]
144- name = classmember .name
145- value [name ] = self .read_value (eclass , j )
146- j .v += 1
143+ if i != len (members ) and members [i .v + 1 ].type == "Array" :
144+ if (members [i .v + 1 ].meta_flag & 0x4000 ) != 0 :
145+ align = True
146+ size = self .reader .read_int ()
147+ vector = get_members (members , level , i )[3 :]
148+ i .v += len (vector ) + 2
149+ value = [self .read_value (vector , 0 ) for j in range (size )]
150+ else :
151+ eclass = get_members (members , level , i )
152+ eclass .pop (0 )
153+ i .v += len (eclass )
154+ j = RefInt (0 )
155+ value = {}
156+ while j < len (eclass ):
157+ classmember = eclass [j .v ]
158+ name = classmember .name
159+ value [name ] = self .read_value (eclass , j )
160+ j .v += 1
147161 if align :
148162 self .reader .align_stream ()
149163 return value
0 commit comments