From 2887b7acf03211762b1b4babc1cf709e20d8791d Mon Sep 17 00:00:00 2001
From: Sunpy <sunpy@osufx.com>
Date: Wed, 26 Sep 2018 08:41:50 +0200
Subject: [PATCH] Flatten array

---
 handlers/serverPingHandler.py | 13 +++++++------
 helpers/dataHelper.py         |  2 ++
 objects/server.py             |  4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 helpers/dataHelper.py

diff --git a/handlers/serverPingHandler.py b/handlers/serverPingHandler.py
index dfa94b7..0fd2426 100644
--- a/handlers/serverPingHandler.py
+++ b/handlers/serverPingHandler.py
@@ -1,5 +1,6 @@
 import struct
 from objects import glob
+from helpers import dataHelper
 
 def handle(client, data):
 	ping_ip = ".".join((str(x) for x in struct.unpack(b"<BBBB", data[4:8])))
@@ -37,14 +38,14 @@ def query_r():
 	packet_data.append(len(rules)) # len_rules
 
 	for name, value in rules.items():
-		packet_data.append(len(name)) # len_name
-		packet_data.append(name)
-		packet_data.append(len(value)) # len_value
-		packet_data.append(value)
+		packet_data.append([
+			len(name), name,
+			len(value), value
+		])
 
-	flat_packet_data = [y for x in packet_data for y in x] # flattens the packet data arrays to one stream
+	flat_packet_data = dataHelper.flatten(packet_data)
 
-	packet = struct.pack(b"<H" + b"c%dsc%ds" * packet_data[0] # using len_rules
+	packet = struct.pack(b"<H" + b"c%dsc%ds" * flat_packet_data[0] # using len_rules
 			% [y for x in rules.items() for y in x], # array of only rules entries
 		*flat_packet_data)
 
diff --git a/helpers/dataHelper.py b/helpers/dataHelper.py
new file mode 100644
index 0000000..8633bb9
--- /dev/null
+++ b/helpers/dataHelper.py
@@ -0,0 +1,2 @@
+def flatten(l):
+    return flatten(l[0]) + (flatten(l[1:]) if len(l) > 1 else []) if type(l) is list else [l]
diff --git a/objects/server.py b/objects/server.py
index d9d0dda..26486be 100644
--- a/objects/server.py
+++ b/objects/server.py
@@ -52,5 +52,5 @@ class Server(Thread):
 			for client in clients:
 				client.write_socket()
 
-			for c in self.clients.values():
-				print(c.__writebuffer)
\ No newline at end of file
+			"""for c in self.clients.values():
+				print(c.__writebuffer)"""
\ No newline at end of file