kvs.git

@@ -135,19 +135,33 @@ if __name__ == '__main__':

             # just the home page, then

             print "Content-type: text/plain; charset=UTF-8\n"

             wrote_response = True

-            headers = ['key', 'value', 'created', 'updated', 'origin', 'notes']

-            print "\t".join([i.ljust(12) for i in headers])

-            print "\t".join([('-' * len(i)).ljust(12) for i in headers])

+

+            rows = [('key', 'value', 'created', 'updated', 'origin', 'notes'),]

             for key in sorted(store, key=lambda k: store[k]['time'], reverse=True):

-                device = map_key_to_prefix(key)

                 d = store[key]

                 td = texttime.stringify(datetime.timedelta(seconds=time.time()-d['time']))

                 created = time.strftime('%Y-%m-%d', time.localtime(d['created']))

                 origin = map_ip_to_location(d['origin'])

-                print '\t'.join((key.ljust(12), d['value'].ljust(13), created, str(d['time']), origin, "%supdated %s ago" % (device, td)))

+                rows.append((key, d['value'], created, str(d['time']), origin,

+                            "%supdated %s ago" % (map_key_to_prefix(key), td)))

+

+            cols = zip(*rows)

+

+            # Compute column widths by taking maximum length of values per column

+            col_widths = [max(len(value) for value in col) for col in cols]

+

+            # Create a suitable format string for nice table output

+            fmt = "\t".join(["{%d:<%d}" % (i, v) for i, v in enumerate(col_widths)])

+

+            # Print each row using the computed format

+            print fmt.format(*rows.pop(0))

+            print "\t".join([('-' * i) for i in col_widths])  # column header separator

+            for row in rows:

+                print fmt.format(*row)

+

             print

             print 'Tip:'

-            print 'sync_ip () { export ENV_VAR=$(curl -s "%s?k=2FN50L002036,2FN44N010911"); }' % os.environ['SCRIPT_URI']

+            print 'sync_ip () { export ENV_VAR=$(curl -s "%s?k=YP008G581095,2N00FG504225"); }' % os.environ['SCRIPT_URI']

             print 'curl --data "`hostname -s`=`hostname -i`&auth=$AUTH" "%s"' % os.environ['SCRIPT_URI']

             print 'Source code at http://git.dlma.com/kvs.git/'