a bit of cleanup in the manifold{api,result} area

[unfold.git] / manifoldapi / manifoldresult.py

diff --git a/manifoldapi/manifoldresult.py b/manifoldapi/manifoldresult.py
index 4ffe072..3680864 100644 (file)
--- a/manifoldapi/manifoldresult.py
+++ b/manifoldapi/manifoldresult.py
@@ -1,3 +1,4 @@
+# black magic to define enums
 def enum(*sequential, **named):
     enums = dict(zip(sequential, range(len(sequential))), **named)
     return type('Enum', (), enums)
@@ -10,47 +11,65 @@ ManifoldCode = enum (
     SERVER_UNREACHABLE=3,
 )
 
+def truncate(result, length=50):
+    plain = "{}".format(result)
+    if len(plain) <= length-3:
+        return plain
+    else:
+        return plain[:(length-3)]+'...'
+
 _messages_ = { -1 : "Unknown", 0: "OK", 1: "Session Expired", 2: "Not Implemented", 3: "Backend server unreachable"}
 
+def truncate_result(result, length=50):
+    self = result
+    code = self['code']
+    result = "[MFresult {} (code={})".format(_messages_.get(code, "???"), code)
+    if code == 0:
+        value = self['value']
+        if isinstance(value, list):
+            result += " [value=list with {} elts]".format(len(value))
+        elif isinstance(value, dict):
+            result += " [value=dict with keys {}]".format(value.keys())
+        else:
+            result += " [value={}: {}]".format(type(value).__name__, value)
+    elif 'output' in self:
+        result += " [output={}]".format(self['output'])
+    else:
+        result += "<no output>"
+    result += "]"
+    return truncate(result, 60)
+
 # being a dict this can be used with json.dumps
 class ManifoldResult (dict):
     def __init__ (self, code=ManifoldCode.SUCCESS, value=None, output=""):
-        self['code']=code
-        self['value']=value
-        self['output']=output
+        self['code'] = code
+        self['value'] = value
+        self['output'] = output
         self['description'] = '' # Jordan: needed by javascript code
 
     def from_json (self, json_string):
         d=json.dumps(json_string)
-        for k in ['code','value','output']:
-            self[k]=d[k]
+        for k in ['code', 'value', 'output']:
+            self[k] = d[k]
 
     # raw accessors
-    def code (self): return self['code']
-    def output (self): return self['output']
+    def code (self):
+        return self['code']
+    def output (self):
+        return self['output']
 
     # this returns None if there's a problem, the value otherwise
     def ok_value (self):
-        if self['code']==ManifoldCode.SUCCESS:
+        if self['code'] == ManifoldCode.SUCCESS:
             return self['value']
 
     # both data in a single string
     def error (self):
-        return "code=%s -- %s"%(self['code'],self['output'])
+        return "code={} -- {}".format(self['code'], self['output'])
     
 
     def __repr__ (self):
-        code=self['code']
-        result="[MFresult %s (code=%s)"%(_messages_.get(code,"???"),code)
-        if code==0:
-            value=self['value']
-            if isinstance(value,list): result += " [value=list with %d elts]"%len(value)
-            elif isinstance(value,dict): result += " [value=dict with keys %s]"%value.keys()
-            else: result += " [value=%s: %s]"%(type(value).__name__,value)
-        else:
-            result += " [output=%s]"%self['output']
-        result += "]"
-        return result
+        return truncate_result(self, 60)
 
 # probably simpler to use a single class and transport the whole result there
 # instead of a clumsy set of derived classes 
@@ -58,4 +77,4 @@ class ManifoldException (Exception):
     def __init__ (self, manifold_result):
         self.manifold_result=manifold_result
     def __repr__ (self):
-        return "Manifold Exception %s"%(self.manifold_result.error())
+        return "<Manifold Exception {}>".format(self.manifold_result.error())