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

[Aaron Toponce]

Author: atoponce-guest
Date: 2014-05-15 17:02:43 +0000 (Thu, 15 May 2014)
New Revision: 621

Modified:
   trunk/keyart/keyart
Log:
Move ASCII art image into an array element.

By moving the art into an array, this sets me up for getting ready to print
off a keyart page for keysigning party organizers, by treating each art as
a logical unit individually. See http://ae7.st/p/17o as the end goal of
what a keyart page should look like.



Modified: trunk/keyart/keyart
===================================================================
--- trunk/keyart/keyart	2014-05-14 22:02:28 UTC (rev 620)
+++ trunk/keyart/keyart	2014-05-15 17:02:43 UTC (rev 621)
@@ -55,6 +55,7 @@
         sys.exit(5)
 
     coin = ''
+    art = ''
     f_bytes = []
     pos = 104
     walk = [pos]
@@ -140,25 +141,25 @@
     else: key_algo = 'N/A'
 
     if len("["+key_algo+" "+key_size+"]") == 10:
-        print '+----[{0} {1}]-----+'.format(key_algo, key_size)
+        art += '+----[{0} {1}]-----+\n'.format(key_algo, key_size)
     elif len("["+key_algo+" "+key_size+"]") == 11:
-        print '+----[{0} {1}]----+'.format(key_algo, key_size)
+        art += '+----[{0} {1}]----+\n'.format(key_algo, key_size)
     elif len("["+key_algo+" "+key_size+"]") == 9:
-        print '+-----[{0} {1}]-----+'.format(key_algo, key_size)
+        art += '+-----[{0} {1}]-----+\n'.format(key_algo, key_size)
     elif len("["+key_algo+" "+key_size+"]") == 12:
-        print '+---[{0} {1}]----+'.format(key_algo, key_size)
+        art += '+---[{0} {1}]----+\n'.format(key_algo, key_size)
     elif len("["+key_algo+" "+key_size+"]") == 13:
-        print '+---[{0} {1}]---+'.format(key_algo, key_size)
+        art += '+---[{0} {1}]---+\n'.format(key_algo, key_size)
     elif len("["+key_algo+" "+key_size+"]") == 14:
-        print '+--[{0} {1}]---+'.format(key_algo, key_size)
+        art += '+--[{0} {1}]---+\n'.format(key_algo, key_size)
     elif len("["+key_algo+" "+key_size+"]") == 15:
-        print '+--[{0} {1}]--+'.format(key_algo, key_size)
+        art += '+--[{0} {1}]--+\n'.format(key_algo, key_size)
     elif len("["+key_algo+" "+key_size+"]") == 16:
-        print '+-[{0} {1}]--+'.format(key_algo, key_size)
+        art += '+-[{0} {1}]--+\n'.format(key_algo, key_size)
     elif len("["+key_algo+" "+key_size+"]") == 17:
-        print '+-[{0} {1}]-+'.format(key_algo, key_size)
+        art += '+-[{0} {1}]-+\n'.format(key_algo, key_size)
     else:
-        print '+-------------------+'
+        art += '+-------------------+\n'
 
     for i, v in enumerate(visits):
         coin += coins[v]
@@ -169,13 +170,16 @@
         if i == walk[len(walk)-1]:
             coin = "%sE" % coin[:len(coin)-1]
         if i % 19 == 18:
-            print "%s|" % coin
+            art += "%s|\n" % coin
             coin = ''
-    print '+----[{0}]-----+'.format(key_fpr[-8:])
 
-try:
-    for key in sys.argv[1:]:
-        draw_art(key)
-except IndexError:
-    print "Usage: keyart FILE [FILE [FILE ...]]"
-    sys.exit(1)
+    art += '+----[{0}]-----+'.format(key_fpr[-8:])
+    return art
+
+arts = []
+
+for key in sys.argv[1:]:
+    arts.append(draw_art(key))
+
+for art in arts:
+    print art