From 38f3a3807373a19cacc0171dd7d5fd11f44dbd35 Mon Sep 17 00:00:00 2001
From: troido <troido@hotmail.com>
Date: Sun, 31 Dec 2017 00:10:14 +0100
Subject: merged roomedge into portal, moved tcommunicate and utils to common
 folder and fixed package when starting main directory

---
 asciifarm/client/connection.py   |  2 +-
 asciifarm/client/tcommunicate.py | 32 --------------------------------
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 asciifarm/client/tcommunicate.py

(limited to 'asciifarm/client')

diff --git a/asciifarm/client/connection.py b/asciifarm/client/connection.py
index 9ca2ccc..4eb0ffe 100644
--- a/asciifarm/client/connection.py
+++ b/asciifarm/client/connection.py
@@ -1,7 +1,7 @@
 
 import socket
 
-from .tcommunicate import send, receive
+from asciifarm.common.tcommunicate import send, receive
 
 class Connection:
     
diff --git a/asciifarm/client/tcommunicate.py b/asciifarm/client/tcommunicate.py
deleted file mode 100644
index b1fc1b0..0000000
--- a/asciifarm/client/tcommunicate.py
+++ /dev/null
@@ -1,32 +0,0 @@
-
-HEADER_SIZE = 4
-
-
-# this module is for sending discree messages over TCP
-# this is achieved by prefixing all messages with their length
-# calls to send and recv will also keep attempting to send all data unless this proves impossible
-
-
-def send(sock, msg):
-    length = len(msg)
-    header = length.to_bytes(4, byteorder="big")
-    totalmsg = header + msg
-    sock.sendall(totalmsg)
-
-def receive(sock):
-    header = recvall(sock, 4) #sock.recv(4)
-    length = int.from_bytes(header, byteorder="big")
-    return recvall(sock, length)
-
-def recvall(sock, length):
-    chunks = []
-    bytes_recd = 0
-    while bytes_recd < length:
-        chunk = sock.recv(min(length - bytes_recd, 4096))
-        if chunk == b'':
-            break
-            #raise RuntimeError("socket connection broken")
-        chunks.append(chunk)
-        bytes_recd = bytes_recd + len(chunk)
-    return b''.join(chunks)
-    
-- 
cgit