From 3daf25405fd3bd0bcaa71289f9c91f2253cd076e Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Wed, 9 Sep 2020 21:07:50 +0100 Subject: [PATCH] updates --- komrade/backend/messages.py | 9 +++++---- komrade/backend/the_operator.py | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/komrade/backend/messages.py b/komrade/backend/messages.py index 801e263..af2ee77 100644 --- a/komrade/backend/messages.py +++ b/komrade/backend/messages.py @@ -39,10 +39,11 @@ class Message(Logger): @property def meta_msg(self): md={} - for i,msg in enumerate(reversed(list(self.messages))): - self.log(f'msg #{i+1}: {msg}') - dict_merge(md,msg.msg_d) - # self.log('returning meta') + msg_d=self.msg_d + while msg_d: + dict_merge(md,msg_d) + msg_d = msg_d.get('_msg',{}) + return md def __repr__(self): diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py index 26e5b93..8060e21 100644 --- a/komrade/backend/the_operator.py +++ b/komrade/backend/the_operator.py @@ -65,10 +65,10 @@ class TheOperator(Operator): # decrypt all of it! msg_obj.decrypt() self.log('I am now decrypted!',msg_obj) - self.log('my messages:',msg_obj.messages) + # self.log('my messages:',msg_obj.messages) #self.log(f'Operator understood message route: {msg_obj.route}') - self.log('meta msg!',msg_obj.meta_msg) + self.log('meta msg!',dict_format(msg_obj.meta_msg,tab=6)) # carry out message instructions route_result = self.route(msg_obj)