From 947388793a298385c31ea159f337309ab8799326 Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Sun, 13 Sep 2020 15:15:06 +0100
Subject: [PATCH] updates

---
 komrade/backend/crypt.py         |  2 +-
 komrade/backend/komrades.py      |  3 ++-
 komrade/backend/the_operator.py  |  4 +--
 komrade/backend/the_telephone.py |  2 +-
 komrade/cli/cli.py               | 46 ++++++++++++++++++++++++--------
 5 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/komrade/backend/crypt.py b/komrade/backend/crypt.py
index fa56cf4..183ff52 100644
--- a/komrade/backend/crypt.py
+++ b/komrade/backend/crypt.py
@@ -11,7 +11,7 @@ import zlib
 
 
 
-LOG_GET_SET = 1
+LOG_GET_SET = 0
 
 
 
diff --git a/komrade/backend/komrades.py b/komrade/backend/komrades.py
index 92e19a8..28c422b 100644
--- a/komrade/backend/komrades.py
+++ b/komrade/backend/komrades.py
@@ -47,11 +47,12 @@ class Komrade(Caller):
         # if keys.get('pubkey') and keys.get('privkey')
 
     def register(self, name = None, passphrase = None, is_group=None, show_intro=0,show_body=True):
+        # print('got name:',name)
         ## Defaults
         if name and not self.name: self.name=name
         if not name and self.name: name=self.name
         # if not name and not self.name: name=''
-
+        # print('got name',name)
         
         ## 1) Have name?
         tolog=''
diff --git a/komrade/backend/the_operator.py b/komrade/backend/the_operator.py
index faab55a..9d080f6 100644
--- a/komrade/backend/the_operator.py
+++ b/komrade/backend/the_operator.py
@@ -127,8 +127,8 @@ class TheOperator(Operator):
             b64enc(pubkey),
             prefix='/name/'
         )
-        self.log('pks:',pubkey,pk)
-        self.log('nms:',name,nm)
+        # self.log('pks:',pubkey,pk)
+        # self.log('nms:',name,nm)
         return pk or nm
 
     def login(self,name,pubkey,secret_login,**data):
diff --git a/komrade/backend/the_telephone.py b/komrade/backend/the_telephone.py
index 973899d..d1081a3 100644
--- a/komrade/backend/the_telephone.py
+++ b/komrade/backend/the_telephone.py
@@ -61,7 +61,7 @@ class TheTelephone(Operator):
         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)
         # 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
         # resp_msg_obj.decrypt()
diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py
index 6f53340..6c13850 100644
--- a/komrade/cli/cli.py
+++ b/komrade/cli/cli.py
@@ -12,17 +12,17 @@ HELPSTR = """
 class CLI(Logger):
     ROUTES = {
         'help':'seek help',
-        'register [name]':'join the komrades',
-        'login [name]':'log back in'
+        'register':'join the komrades',
+        'login':'log back in'
     }
 
     def __init__(self,name='',cmd='',persona=None):
-        self.name=name
+        self._name=name
         self.cmd=cmd
-        self.persona=persona
+        self._komrade=None
 
     def run(self,inp='',name=''):
-        self.name=name
+        if name: self._name=name
         clear_screen()
         self.boot()
         self.help()
@@ -32,7 +32,7 @@ class CLI(Logger):
         while True:
             try:
                 inp=input(f'@{self.name if self.name else "?"}: ')
-                print(inpp,'??')
+                # print(inp,'??')
             except KeyboardInterrupt:
                 exit()
             self.route(inp)
@@ -40,11 +40,12 @@ class CLI(Logger):
 
     def route(self,inp):
         inp=inp.strip()
-        # print('route got:',inp)
+        # print('route got:',[inp])
         if not inp.startswith('/'): return
         cmd=inp.split()[0]
         dat=inp[len(cmd):].strip()
         cmd=cmd[1:]
+        # print([cmd,dat])
         if cmd in self.ROUTES and hasattr(self,cmd):
             f=getattr(self,cmd)
             return f(dat)
@@ -62,10 +63,33 @@ class CLI(Logger):
         self.status(None,)
     
     def register(self,name=None):
-        if not name: name=self.name
-        self.komrade = Komrade(name)
-        self.komrade.register()
-        self.name=self.komrade.name
+        if not self._komrade:
+            self._komrade = Komrade(name if name else self.name)
+        print(self._komrade.register())
+        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
+
+    
+