Deserialize (load)

osuRepy/helpers/typeSerializer.py

@@ -96,14 +96,13 @@ class Serializable:
 		self.prefix = prefix
 		self.filter = filter
 
-	def get_struct_fmt(self, length = 1):
+	def get_struct_fmt(self, length = 1, uleb_length_override = -1):
 		struct_fmt = self.type[0]
 		if length > 1:
 			struct_fmt = b"%d%b" % (length, self.type[0])
 		if self.length is not None:
 			if self.length == TYPE_ULEB:
-				val = self.get_value()
-				struct_fmt = b"%d%b%b" % (len(val[0]), self.length[0], struct_fmt)
+				struct_fmt = b"%d%b%b" % (len(self.get_value()[0]) if uleb_length_override == -1 else uleb_length_override, self.length[0], struct_fmt)
 			else:
 				struct_fmt = b"%b%b" % (self.length[0], struct_fmt)
 		return struct_fmt
@@ -111,7 +110,7 @@ class Serializable:
 	def get_value(self):
 		val = [self.value]
 		if self.filter is not None:
-			val[-1] = self.filter(val[-1])
+			val[-1] = self.filter(val[-1], 0)
 		if self.length is not None:
 			if self.length == TYPE_ULEB:
 				val.insert(0, encode_uleb(len(val[-1])))
@@ -129,10 +128,40 @@ class Serializable:
 			packed = self.prefix + packed
 		return packed
 
-	def unpack(self, length = -1, byte_order = BYTEORDER_LITTLE):
+	def unpack(self, stream, byte_order = BYTEORDER_LITTLE):
+		length = 1
+		read_pos = 0
+		extra_read = 0
+		remove_struct_fmt = []
 		if self.type == TYPE_STRING:
-			length = len(self.value)
-		struct_fmt = byte_order + self.get_struct_fmt(length)
+			if self.length == TYPE_ULEB:
+				extra_read = 1
+				read_pos += 1 # Skip 0x0b
+				length, _read_pos = decode_uleb(stream[read_pos:])
+				read_pos += _read_pos - 1
+			else:
+				l = Serializable(0, self.length)
+				read_pos = l.unpack(stream)
+				length = l.get_value()[-1]
+				remove_struct_fmt.append(0)
+
+
+		struct_fmt = byte_order + self.get_struct_fmt(length, read_pos)
+		length += extra_read
+
+		if len(remove_struct_fmt):
+			for rem in remove_struct_fmt:
+				struct_fmt = struct_fmt[:rem + 1] + struct_fmt[rem + 2:]
+
+		data = struct.unpack(struct_fmt, stream[read_pos:read_pos + self.type[1] * length])
+
+		if self.filter is not None:
+			data = list(data)
+			data[-1] = self.filter(data[-1], 1)
+
+		self.value = data[-1]
+
+		return read_pos + self.type[1] * length
 
 class Serializer:
 	def __init__(self, byte_order = BYTEORDER_LITTLE):
@@ -145,26 +174,15 @@ class Serializer:
 		else:
 			self.stack.append(serializable)
 
+	def serialize(self):
+		return b"".join(s.pack() for s in self.stack)
+
+	def deserialize(self, stream):
+		for s in self.stack:
+			stream = stream[s.unpack(stream):]
+
 	def flush(self):
 		return b"".join(s.pack() for s in self.stack)
 
 	def __bytes__(self):
 		return self.flush()
-
-class Deserializer:
-	def __init__(self, byte_order = BYTEORDER_LITTLE):
-		self.stack = []
-		self.byte_order = byte_order
-
-	def add(self, serializable):
-		if type(serializable) is list:
-			self.stack += serializable
-		else:
-			self.stack.append(serializable)
-	"""
-	def deserialize_data(self, stream):
-		pos = 0
-		for s in self.stack:
-			struct.
-			s.value 
-	"""