posting
quadrismegistus 4 years ago
parent 0e5ee783e6
commit 0d8da8338b

@ -11,7 +11,7 @@ import zlib
LOG_GET_SET = 1
LOG_GET_SET = 0
@ -120,14 +120,14 @@ class Crypt(Logger):
def set(self,k,v,prefix='',override=False):
if self.has(k,prefix=prefix) and not override:
self.log(f"I'm afraid I can't let you do that, overwrite someone's data!\n\nat {prefix}{k} = {v}")
#self.log(f"I'm afraid I can't let you do that, overwrite someone's data!\n\nat {prefix}{k} = {v}")
return False #(False,None,None)
k_b=self.package_key(k,prefix=prefix)
k_b_hash = self.hash(k_b)
v_b=self.package_val(v)
#if not override:
self.log(f'''Crypt.set(\n\t{k_b}\n\n\t{k_b_hash}\n\n\t{v_b}\n)''')
if not override:
self.log(f'''Crypt.set(\n\t{k_b}\n\n\t{k_b_hash}\n\n\t{v_b}\n)''')
# store
# stop
self.store.put(k_b_hash,v_b)

@ -17,8 +17,6 @@ def is_valid_msg_d(msg_d):
class Message(Logger):
def __init__(self,msg_d={},from_whom=None,to_whom=None,msg=None):
# check input
if not is_valid_msg_d(msg_d):
raise KomradeException('This is not a valid msg_d:',msg_d)
self.msg_d=msg_d
self.to_name=msg_d.get('to_name') if not to_whom else to_whom.name
self.to_pubkey=msg_d.get('to') if not to_whom else to_whom.uri
@ -28,6 +26,14 @@ class Message(Logger):
self._route=msg_d.get(ROUTE_KEYNAME)
self._is_encrypted=None
# reset msg_d
self.msg_d = {
'msg':self.msg,
'to':self.to_pubkey,
'to_name':self.to_name,
'from':self.from_pubkey,
'from_name':self.from_name
}
def __repr__(self):
# self.log('my type??',type(self.msg),self.msg)

Loading…
Cancel
Save