[Pgp-tools-commit] r655 - trunk/keyart

[Guilhem Moulin]

Author: guilhem-guest
Date: 2014-06-18 14:34:11 +0000 (Wed, 18 Jun 2014)
New Revision: 655

Modified:
   trunk/keyart/keyart
Log:
Use Python's 'format' method to center strings.

Modified: trunk/keyart/keyart
===================================================================
--- trunk/keyart/keyart	2014-06-18 14:06:04 UTC (rev 654)
+++ trunk/keyart/keyart	2014-06-18 14:34:11 UTC (rev 655)
@@ -151,26 +151,9 @@
     else:
         key_algo = 'N/A'
 
-    if len("["+key_algo+" "+key_size+"]") == 10:
-        art += '+----[{0} {1}]-----+\n'.format(key_algo, key_size)
-    elif len("["+key_algo+" "+key_size+"]") == 11:
-        art += '+----[{0} {1}]----+\n'.format(key_algo, key_size)
-    elif len("["+key_algo+" "+key_size+"]") == 9:
-        art += '+-----[{0} {1}]-----+\n'.format(key_algo, key_size)
-    elif len("["+key_algo+" "+key_size+"]") == 12:
-        art += '+---[{0} {1}]----+\n'.format(key_algo, key_size)
-    elif len("["+key_algo+" "+key_size+"]") == 13:
-        art += '+---[{0} {1}]---+\n'.format(key_algo, key_size)
-    elif len("["+key_algo+" "+key_size+"]") == 14:
-        art += '+--[{0} {1}]---+\n'.format(key_algo, key_size)
-    elif len("["+key_algo+" "+key_size+"]") == 15:
-        art += '+--[{0} {1}]--+\n'.format(key_algo, key_size)
-    elif len("["+key_algo+" "+key_size+"]") == 16:
-        art += '+-[{0} {1}]--+\n'.format(key_algo, key_size)
-    elif len("["+key_algo+" "+key_size+"]") == 17:
-        art += '+-[{0} {1}]-+\n'.format(key_algo, key_size)
-    else:
-        art += '+-------------------+\n'
+    header = "["+key_algo+" "+key_size+"]"
+    if len(header) > 19: x = ''
+    art += '+{:-^19}+\n'.format(header)
 
     for i, visit in enumerate(visits):
         # Build up the art with the boundaries and newlines
@@ -189,7 +172,7 @@
         else:
             art = art.format(_get_coin(visit, ARGS.ansi))
 
-    art += '+----[{0}]-----+'.format(key_fpr[-8:])
+    art += '+{:-^19}+'.format("["+key_fpr[-8:]+"]")
     return art
 
 def _get_coin(num_of_hits, ansi_art=False, coin=None):