From 6cdbe95fac23c007db822b93e8ebebc89d79d368 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Thu, 17 Sep 2020 17:23:49 +0100 Subject: [PATCH] komrade update! --- komrade/backend/keymaker.py | 6 +++--- komrade/backend/komrades.py | 8 +++++++- komrade/cli/cli.py | 12 +----------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/komrade/backend/keymaker.py b/komrade/backend/keymaker.py index 8f5b6a1..af923e4 100644 --- a/komrade/backend/keymaker.py +++ b/komrade/backend/keymaker.py @@ -394,9 +394,9 @@ class Keymaker(Logger): if not hasattr(self,'_crypt_data'): self._crypt_data = Crypt( fn=self.path_crypt_data, - encrypt_values=True, - encryptor_func=self.encrypt, - decryptor_func=self.decrypt, + encrypt_values=False, + # encryptor_func=self.encrypt, + # decryptor_func=self.decrypt, ) return self._crypt_data diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py index 084bf07..16b2abd 100644 --- a/komrade/backend/komrades.py +++ b/komrade/backend/komrades.py @@ -474,7 +474,7 @@ class KomradeX(Caller): return self.save_posts( id2post=id2msg, inbox_prefix='/inbox/', - post_prefix='/msg/' + post_prefix='/post/' ) ## Getting updates @@ -500,10 +500,12 @@ class KomradeX(Caller): # (2) save msgs id2msg=res.get('res_msgs').get('posts',{}) + self.log(f'downloaded {len(id2msg)} messages') self.save_msgs(id2msg) # (3) save posts id2post=res.get('res_posts').get('posts',{}) + self.log(f'downloaded {len(id2post)} posts') self.save_posts(id2post) return res @@ -543,8 +545,12 @@ class KomradeX(Caller): # decrypt msg_op2me_obj.decrypt() + # decode? + # msg_dat = pickle.loads(msg_op2me_obj.msg) + # self.log('decoded???',msg_dat) # dict to/from/msg + self.log(msg_op2me_obj,'!?!?') msg_op2me = msg_op2me_obj.msg.msg_d self.log('msg_op2me is now',msg_op2me) diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py index c11ae22..c642a1d 100644 --- a/komrade/cli/cli.py +++ b/komrade/cli/cli.py @@ -363,17 +363,7 @@ class CLI(Logger): def read(self,dat='',inbox_res=None): if self.with_required_login(): - if not inbox_res: - res = self.komrade.inbox() - else: - res = inbox_res - # print('got from read res:',res) - if not res.get('success'): - self.stat(res['status'],komrade_name='Operator') - return - - # self.print('ummmmm msgs?') - msgs=res.get('msgs') + msgs=self.komrade.messages() if not msgs: self.stat('No messages.') else: