posting
quadrismegistus 4 years ago
parent f8389dfef4
commit 947388793a

@ -11,7 +11,7 @@ import zlib
LOG_GET_SET = 1 LOG_GET_SET = 0

@ -47,11 +47,12 @@ class Komrade(Caller):
# if keys.get('pubkey') and keys.get('privkey') # if keys.get('pubkey') and keys.get('privkey')
def register(self, name = None, passphrase = None, is_group=None, show_intro=0,show_body=True): def register(self, name = None, passphrase = None, is_group=None, show_intro=0,show_body=True):
# print('got name:',name)
## Defaults ## Defaults
if name and not self.name: self.name=name if name and not self.name: self.name=name
if not name and self.name: name=self.name if not name and self.name: name=self.name
# if not name and not self.name: name='' # if not name and not self.name: name=''
# print('got name',name)
## 1) Have name? ## 1) Have name?
tolog='' tolog=''

@ -127,8 +127,8 @@ class TheOperator(Operator):
b64enc(pubkey), b64enc(pubkey),
prefix='/name/' prefix='/name/'
) )
self.log('pks:',pubkey,pk) # self.log('pks:',pubkey,pk)
self.log('nms:',name,nm) # self.log('nms:',name,nm)
return pk or nm return pk or nm
def login(self,name,pubkey,secret_login,**data): def login(self,name,pubkey,secret_login,**data):

@ -61,7 +61,7 @@ class TheTelephone(Operator):
from komrade.backend.messages import Message from komrade.backend.messages import Message
resp_msg_obj = Message(resp_msg_d,from_whom=self.op,to_whom=self) #self.unseal_msg(resp_msg_b) resp_msg_obj = Message(resp_msg_d,from_whom=self.op,to_whom=self) #self.unseal_msg(resp_msg_b)
# res = resp_msg_b_unsealed # res = resp_msg_b_unsealed
self.log('Decoding binary, message discovered:',resp_msg_obj) self.log('Decoding binary, message discovered:\n',resp_msg_obj)
# decrypt # decrypt
# resp_msg_obj.decrypt() # resp_msg_obj.decrypt()

@ -12,17 +12,17 @@ HELPSTR = """
class CLI(Logger): class CLI(Logger):
ROUTES = { ROUTES = {
'help':'seek help', 'help':'seek help',
'register [name]':'join the komrades', 'register':'join the komrades',
'login [name]':'log back in' 'login':'log back in'
} }
def __init__(self,name='',cmd='',persona=None): def __init__(self,name='',cmd='',persona=None):
self.name=name self._name=name
self.cmd=cmd self.cmd=cmd
self.persona=persona self._komrade=None
def run(self,inp='',name=''): def run(self,inp='',name=''):
self.name=name if name: self._name=name
clear_screen() clear_screen()
self.boot() self.boot()
self.help() self.help()
@ -32,7 +32,7 @@ class CLI(Logger):
while True: while True:
try: try:
inp=input(f'@{self.name if self.name else "?"}: ') inp=input(f'@{self.name if self.name else "?"}: ')
print(inpp,'??') # print(inp,'??')
except KeyboardInterrupt: except KeyboardInterrupt:
exit() exit()
self.route(inp) self.route(inp)
@ -40,11 +40,12 @@ class CLI(Logger):
def route(self,inp): def route(self,inp):
inp=inp.strip() inp=inp.strip()
# print('route got:',inp) # print('route got:',[inp])
if not inp.startswith('/'): return if not inp.startswith('/'): return
cmd=inp.split()[0] cmd=inp.split()[0]
dat=inp[len(cmd):].strip() dat=inp[len(cmd):].strip()
cmd=cmd[1:] cmd=cmd[1:]
# print([cmd,dat])
if cmd in self.ROUTES and hasattr(self,cmd): if cmd in self.ROUTES and hasattr(self,cmd):
f=getattr(self,cmd) f=getattr(self,cmd)
return f(dat) return f(dat)
@ -62,10 +63,33 @@ class CLI(Logger):
self.status(None,) self.status(None,)
def register(self,name=None): def register(self,name=None):
if not name: name=self.name if not self._komrade:
self.komrade = Komrade(name) self._komrade = Komrade(name if name else self.name)
self.komrade.register() print(self._komrade.register())
self.name=self.komrade.name self._name=self._komrade.name
def login(self,name):
if not self._komrade:
self._komrade = Komrade(name if name else self.name)
print(self._komrade.login())
self._name=self._komrade.name
@property
def komrade(self):
if not hasattr(self,'_komrade'):
self._komrade = Komrade(self._name)
return self._komrade
@property
def name(self):
if not hasattr(self,'_name'):
if hasattr(self,'_komrade'):
self._name=self._komrade.name
else:
return None
return self._name

Loading…
Cancel
Save