diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index c676748..bc2fa75 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -270,7 +270,8 @@ class Keymaker(Logger): pk=self._keychain['pubkey'] return KomradeAsymmetricPublicKey(b64dec(pk)) if type(pk)==bytes else pk res = self.crypt_keys.get(name, prefix='/pubkey/') - res = self.load_qr(self.name) + if not res: + res = self.load_qr(self.name) if not res: return return KomradeAsymmetricPublicKey(b64dec(res)) diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py index eadb83f..6424fb8 100644 --- a/komrade/backend/komrades.py +++ b/komrade/backend/komrades.py @@ -469,7 +469,7 @@ class KomradeX(Caller): def inbox(self,topn=100,only_unread=False,delete_malformed=False): # refreshing inbox res = self.refresh() - # print('got from refresh',res) + print('got from refresh',res) if not res['success']: return res boxname = 'inbox' if not only_unread else 'unread' @@ -492,7 +492,7 @@ class KomradeX(Caller): msg=res.get('msg') if not msg: continue - #print(msg,'?!?!??!') + # print(msg,'?!?!??!') # stop if not msg.from_name or not msg.from_pubkey: diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py index b3bc040..4973711 100644 --- a/komrade/cli/cli.py +++ b/komrade/cli/cli.py @@ -299,16 +299,21 @@ class CLI(Logger): # self.print(msg.data) do_pause() # clear_screen() + # print(dict_format(msg.data)) + # do_pause() meet_name = msg.data.get('meet_name') meet_uri = msg.data.get('meet') qrstr=self.komrade.qr_str(meet_uri) self.stat(f"Add @{meet_name}'s public key to your address book?",f'It will allow you and @{meet_name} to read and write encrypted messages to one another.') do_adduser = input(f'''\n{self.komrade} [y/N]: ''') if do_adduser.strip().lower()=='y': - fnfn = self.komrade.save_uri_as_qrcode( - meet_uri, - meet_name - ) + + import pyqrcode + print('meet_uri',meet_uri,'???') + qr = pyqrcode.create(meet_uri) + fnfn = os.path.join(PATH_QRCODES,meet_name+'.png') # self.get_path_qrcode(name=name) + qr.png(fnfn,scale=5) + clear_screen() self.stat(f'The public key of @{meet_name} has been saved as a QRcode to {fnfn}') print(qrstr)