merged roomedge into portal, moved tcommunicate and utils to common folder and fixed package when starting main directory

3 files changed, 36 insertions, 1 deletions

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/common/tcommunicate.py
index b1fc1b0..b1fc1b0 100644
--- a/asciifarm/client/tcommunicate.py
+++ b/asciifarm/common/tcommunicate.py
diff --git a/asciifarm/common/utils.py b/asciifarm/common/utils.py
new file mode 100644
index 0000000..3df020c
--- /dev/null
+++ b/asciifarm/common/utils.py
@@ -0,0 +1,35 @@
+
+import os
+
+def clamp(val, lower, upper):
+    """ val if it's between lower and upper, else the closest of the two"""
+    return min(max(val, lower), upper)
+
+
+def concat(arr):
+    """Takes a list of sequences, returns the concatenation of the sequences """
+    if isinstance(arr[0], str):
+        return "".join(arr)
+    if isinstance(arr[0], bytes):
+        return b"".join(arr)
+    if isinstance(arr[0], list):
+        l = []
+        for s in arr:
+            l += s
+        return l
+    if isinstance(arr[0], tuple):
+        l = []
+        for s in arr:
+            l += s
+        return tuple(l)
+    else:
+        raise ValueError("type {} can't be concatenated".format(type(arr[0])))
+
+
+def writeFileSafe(filename, data, tempname=None):
+    if tempname == None:
+        tempname = filename + ".tempfile"
+    with open(tempname, 'w') as f:
+        f.write(data)
+    os.rename(tempname, filename)
+