[Pgp-tools-commit] r179 - trunk/keylookup

[Peter Palfrader]

Author: weasel
Date: 2005-08-16 14:25:08 +0000 (Tue, 16 Aug 2005)
New Revision: 179

Modified:
   trunk/keylookup/NEWS
   trunk/keylookup/keylookup
Log:
Sort keys by creation date.

Modified: trunk/keylookup/NEWS
===================================================================
--- trunk/keylookup/NEWS	2005-08-16 14:19:39 UTC (rev 178)
+++ trunk/keylookup/NEWS	2005-08-16 14:25:08 UTC (rev 179)
@@ -3,6 +3,7 @@
 Release notes for keylookup 3.0 (2005-08-16)
  * Make keylookup use gpg --search instead of querying the
    keyserver directly.
+ * Sort keys by creation date.
 
 Release notes for keylookup 2.2 (2002-09-24)
  * Some keyservers have started putting the key type (DSA or RSA)

Modified: trunk/keylookup/keylookup
===================================================================
--- trunk/keylookup/keylookup	2005-08-16 14:19:39 UTC (rev 178)
+++ trunk/keylookup/keylookup	2005-08-16 14:25:08 UTC (rev 179)
@@ -105,13 +105,10 @@
 		my ($type, undef) = split /:/;
 		if ($type eq 'pub') {
 			my ($type, $keyid, $algo, $bits, $created, undef, $revoked) = split /:/;
-			my (undef,undef,undef,$mday,$mon,$year,undef,undef,undef) = localtime ($created);
 			$currentKey = { 'bits' => $bits,
 					'type' => (defined $ALGOS{$algo} ? $ALGOS{$algo} : '#'.$algo),
 					'keyid' => $keyid,
-					'year' => $year+1900,
-					'month' => $mon+1,
-					'day' => $mday,
+					'created' => $created,
 					'revoked' => $revoked,
 					'uid' => []
 				      };
@@ -169,13 +166,15 @@
 	my $keys = shift;
 	my @keyargs = ();
 
-	for my $keyid (keys %$keys) {
+	for my $keyid (sort {- ($keys->{$a}->{'created'} <=> $keys->{$b}->{'created'})} keys %$keys) {
 		for (@{ $keys->{$keyid}->{'uid'} }) {
 			push @keyargs,
 				$keys->{$keyid}->{'keyid'},
 				length() <= $MAX_UID_FIELD_LEN ? $_ : substr($_, 0, $MAX_UID_FIELD_LEN-2) . '..',
 				'off';
 		};
+		my (undef,undef,undef,$mday,$mon,$year,undef,undef,undef) = localtime ($keys->{$keyid}->{'created'});
+		push @keyargs, $keys->{$keyid}->{'keyid'}, sprintf( "[created: %s-%s-%s]", $year+1900, $mon+1, $mday ), 'off';
 		push @keyargs, '-'x8, '-'x40, 'off';
 	};
 	pop @keyargs;
@@ -189,14 +188,13 @@
 	my $keys = shift;
 	my @lines = ();
 
-	for my $keyid (keys %$keys) {
+	for my $keyid (sort {- ($keys->{$a}->{'created'} <=> $keys->{$b}->{'created'})} keys %$keys) {
+		my (undef,undef,undef,$mday,$mon,$year,undef,undef,undef) = localtime ($keys->{$keyid}->{'created'});
 		push @lines, sprintf( "%s%s/%s %s-%s-%s\n",
 		                      $keys->{$keyid}->{'bits'},
 		                      $keys->{$keyid}->{'type'},
 		                      $keys->{$keyid}->{'keyid'},
-		                      $keys->{$keyid}->{'year'},
-		                      $keys->{$keyid}->{'month'},
-		                      $keys->{$keyid}->{'day'} );
+		                      $year+1900, $mon+1, $mday );
 		push @lines, map { ' 'x26 . $_ . "\n" } @{ $keys->{$keyid}->{'uid'} };
 		push @lines, "\n";
 	};