Changeset 255

Timestamp:

10/09/13 22:22:47 (11 years ago)

Author:

atzm

Message:

refactoring

File:

• etherws/trunk/etherws.py (modified) (2 diffs)

etherws/trunk/etherws.py

@@ -982 +982 @@
         return json.loads(urllib2.urlopen(req, json.dumps(data)).read())
 
-    def maxlen(dict_, key, min_):
-        if not dict_:
-            return min_
-        max_ = max(len(str(r[key])) for r in dict_)
-        return min_ if max_ < min_ else max_
+    def print_table(rows):
+        cols = zip(*rows)
+        maxlen = [0] * len(cols)
+
+        for i in xrange(len(cols)):
+            maxlen[i] = max(len(str(c)) for c in cols[i])
+
+        fmt = '  '.join(['%%-%ds' % maxlen[i] for i in xrange(len(cols))])
+        fmt = '  ' + fmt
+
+        for row in rows:
+            print(fmt % tuple(row))
 
     def print_portlist(result):
-        pmax = maxlen(result, 'port', 4)
-        ymax = maxlen(result, 'type', 4)
-        smax = maxlen(result, 'shut', 5)
-        rmax = maxlen(result, 'rx', 2)
-        tmax = maxlen(result, 'tx', 2)
-        fmt = '  %%%ds  %%%ds  %%%ds  %%%ds  %%%ds  %%s' % \
-              (pmax, ymax, smax, rmax, tmax)
-        print(fmt % ('Port', 'Type', 'State', 'RX', 'TX', 'Target'))
+        rows = [['Port', 'Type', 'State', 'RX', 'TX', 'Target']]
         for r in result:
-            shut = 'shut' if r['shut'] else 'up'
-            print(fmt %
-                  (r['port'], r['type'], shut, r['rx'], r['tx'], r['target']))
+            rows.append([r['port'], r['type'], 'shut' if r['shut'] else 'up',
+                         r['rx'], r['tx'], r['target']])
+        print_table(rows)
 
     def print_iflist(result):
-        pmax = maxlen(result, 'port', 4)
-        tmax = maxlen(result, 'type', 4)
-        amax = maxlen(result, 'address', 7)
-        nmax = maxlen(result, 'netmask', 7)
-        mmax = maxlen(result, 'mtu', 3)
-        fmt = '  %%%ds  %%%ds  %%%ds  %%%ds  %%%ds  %%s' % \
-              (pmax, tmax, amax, nmax, mmax)
-        print(fmt % ('Port', 'Type', 'Address', 'Netmask', 'MTU', 'Target'))
+        rows = [['Port', 'Type', 'Address', 'Netmask', 'MTU', 'Target']]
         for r in result:
-            print(fmt % (r['port'], r['type'],
-                         r['address'], r['netmask'], r['mtu'], r['target']))
+            rows.append([r['port'], r['type'], r['address'],
+                         r['netmask'], r['mtu'], r['target']])
+        print_table(rows)
 
     def handle_ctl_addport(args):
@@ -1105 +1099 @@
         if 'error' in result:
             return _print_error(result['error'])
-        result = result['result']['entries']
-        pmax = maxlen(result, 'port', 4)
-        vmax = maxlen(result, 'vid', 4)
-        mmax = maxlen(result, 'mac', 3)
-        amax = maxlen(result, 'age', 3)
-        fmt = '  %%%ds  %%%ds  %%-%ds  %%%ds' % (pmax, vmax, mmax, amax)
-        print(fmt % ('Port', 'VLAN', 'MAC', 'Age'))
-        for r in result:
-            print(fmt % (r['port'], r['vid'], r['mac'], r['age']))
+
+        rows = [['Port', 'VLAN', 'MAC', 'Age']]
+        for r in result['result']['entries']:
+            rows.append([r['port'], r['vid'], r['mac'], r['age']])
+        print_table(rows)
 
     locals()['handle_ctl_' + args.control_method](args)