From 3575cd9bd7095c09253492f314acff8f699d3a45 Mon Sep 17 00:00:00 2001
From: Adrien Waksberg <git@yae.im>
Date: Mon, 12 Dec 2016 23:09:52 +0100
Subject: [PATCH] feat change add key

---
 lib/mpw/cli.rb |  7 +++----
 lib/mpw/mpw.rb | 12 ++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/mpw/cli.rb b/lib/mpw/cli.rb
index 8cd700a..43256d1 100644
--- a/lib/mpw/cli.rb
+++ b/lib/mpw/cli.rb
@@ -334,10 +334,9 @@ class Cli
 	end
 
 	# Add a new public key
-	# args: key -> the key name to add
-	#       file -> gpg public file to import
-	def add_key(key, file=nil)
-		@mpw.add_key(key, file)
+	# args: key -> the key name or key file to add
+	def add_key(key)
+		@mpw.add_key(key)
 		@mpw.write_data
 		@mpw.sync(true) if @sync
 
diff --git a/lib/mpw/mpw.rb b/lib/mpw/mpw.rb
index 91bd04a..7e50547 100644
--- a/lib/mpw/mpw.rb
+++ b/lib/mpw/mpw.rb
@@ -185,12 +185,12 @@ class MPW
 	end
 
 	# Add a public key
-	# args: key ->  new public key
-	#       file -> public gpg file to import
-	def add_key(key, file=nil)
-		if not file.nil? and File.exists?(file)
-			data = File.open(file).read
-			GPGME::Key.import(data, armor: true)
+	# args: key ->  new public key file or name
+	def add_key(key)
+		if File.exists?(key)
+			data       = File.open(key).read
+			key_import = GPGME::Key.import(data, armor: true)
+			key        = GPGME::Key.get(key_import.imports[0].fpr).uids[0].email
 		else
 			data = GPGME::Key.export(key, armor: true).read
 		end