From 57ea0f443e4534eaad99aa32cb191a5d17104616 Mon Sep 17 00:00:00 2001 From: dim Date: Mon, 5 Nov 2007 14:17:01 +0000 Subject: [PATCH] Improve summary output --- pgloader.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pgloader.py b/pgloader.py index 3895c73..af49192 100644 --- a/pgloader.py +++ b/pgloader.py @@ -290,7 +290,7 @@ def load_data(): pgloader = PGLoader(s, config, dbconn) pgloader.run() - summary[s] = (pgloader.name,) + pgloader.summary() + summary[s] = (pgloader.table,) + pgloader.summary() except PGLoader_Error, e: if e == '': print '[%s] Please correct previous errors' % s @@ -338,14 +338,18 @@ def load_data(): sql = "select pg_total_relation_size(%s), " + \ "pg_size_pretty(pg_total_relation_size(%s));" cursor.execute(sql, [t, t]) - octets, s = cursor.fetchone() + octets, sp = cursor.fetchone() ts += octets - if s[5:] == 'bytes': s = s[:-5] + ' B' + if sp[5:] == 'bytes': sp = sp[:-5] + ' B' else: - s = '-' + sp = '-' - print '%-18s| %ss | %7s | %10d | %10d' % (t, d, s, u, e) + tn = s + if len(tn) > 18: + tn = s[0:15] + "..." + + print '%-18s| %ss | %7s | %10d | %10d' % (tn, d, sp, u, e) tu += u te += e