updates

bin/komrade-app

@@ -4,7 +4,7 @@
 # Run the mobile app
 ##
 
-
+export KOMRADE_SHOW_LOG=0
 
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
@@ -15,7 +15,7 @@ source $pathvenv
 python "$path" $*
 
 
-if command -v deactivate &> /dev/null
-then
-    deactivate
-fi
+#if command -v deactivate &> /dev/null
+#then
+#    deactivate
+#fi

bin/komrade-cli

@@ -1,7 +1,7 @@
 ##
 # Run the command line app
 ##
-
+export KOMRADE_SHOW_LOG=0
 
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
@@ -12,7 +12,7 @@ source $pathvenv
 python "$path" $*
 
 
-if command -v deactivate &> /dev/null
-then
-    deactivate
-fi
+#if command -v deactivate &> /dev/null
+#then
+#    deactivate
+#fi

bin/komrade-op

@@ -1,7 +1,7 @@
 ##
 # Run THE OPERATOR
 ##
-
+export KOMRADE_SHOW_LOG=1
 
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 

komrade/backend/keymaker.py

@@ -474,6 +474,7 @@ class Keymaker(Logger):
                     encr_key = decr_key.encrypt(unencr_key.data)
                     keychain[encr_key_name] = get_key_obj(encr_key_name,encr_key)
             except ThemisError as e:
+                exit('Incorrect password.')
                 self.log('error!!',e,decrypt,decr_key,encr_key,decr_key_name,encr_key_name)
                 pass
 

komrade/backend/komrades.py

@@ -415,12 +415,13 @@ class KomradeX(Caller):
             to_whom=self,
             msg_d={
                 'from':msg_op2me.get('from'),
+                'from_name':msg_op2me.get('from_name'),
                 'msg': msg_op2me.get('msg')
             }
         )
         # self.log('msg2me is now v1',msg2me)
         msg2me.decrypt()
-        self.log('msg2me is now v2',msg2me.msg)
+        self.log('msg2me is now v2',dict_format(msg2me.msg_d))
 
 
         return msg2me

komrade/backend/operators.py

@@ -109,10 +109,10 @@ class Operator(Keymaker):
 
     def compose_msg_to(self,msg,another,incl_from_name=True,incl_to_name=True):
         if not self.privkey or not self.pubkey:
-            raise KomradeException('why do I have no pub/privkey pair!?',self,self.name,self.pubkey,self.privkey,self.keychain())
+            raise KomradeException('I appear not yet to have an encryption keypair.',self,self.name,self.pubkey,self.privkey,self.keychain())
         if not another.name or not another.pubkey:
             self.log(f'I {self} failed to compose a message to {another} ?')
-            raise KomradeException('why do I not know whom I\'m writing to?')
+            raise KomradeException('I do not know the Komrade I am writing to.')
 
         # otherwise create msg
         frompub = self.pubkey.data if hasattr(self.pubkey,'data') else self.pubkey 

komrade/cli/cli.py

@@ -15,7 +15,8 @@ class CLI(Logger):
         'meet':'meet a komrade',
         'who':'show contacts or info',
         'msg':'write people',
-        'check':'check mail'
+        'check':'check mail',
+        'verbose':'show/hide log output'
     }
 
     def __init__(self,name='',cmd='',persona=None):
@@ -24,11 +25,15 @@ class CLI(Logger):
         self.komrade=None
         self.loggedin=False
 
+    def verbose(self,*x):
+        self.toggle_log()
+
     def run(self,inp='',name=''):
         # if name: self.name=name
         # clear_screen()
         # self.boot()
-        self.help()
+        if not inp:
+            self.help()
 
         if inp: self.route(inp)
 
@@ -36,9 +41,11 @@ class CLI(Logger):
             try:
                 inp=input(f'@{self.name if self.name else "?"}: ')
                 # print(inp,'??')
+                self.route(inp)
             except (KeyboardInterrupt,EOFError) as e:
                 exit('\nGoodbye.')
-            self.route(inp)
+            except KomradeException as e:
+                print(f'@Operator: I could not handle your request. {e}\n')
             #await asyncio.sleep(0.5)
 
     def route(self,inp):

komrade/constants.py

@@ -160,6 +160,7 @@ DEFAULT_USER_SETTINGS = {
     'visibility':VISIBILITY_TYPE_SEMIPUBLIC
 }
 
+import os
 SHOW_LOG = 1
 SHOW_STATUS = 0
 PAUSE_LOGGER = 0

komrade/utils.py

@@ -64,8 +64,23 @@ def dict_format(d, tab=0):
 import inspect,time
 from komrade.constants import *
 class Logger(object):
+    @property
+    def off(self):
+        x=os.environ.get('KOMRADE_SHOW_LOG')
+        if x is not None:
+            x=x.strip().lower()
+            return x in {'n','0','false'}
+        return not SHOW_LOG
+
+    def hide_log(self):
+        os.environ['KOMRADE_SHOW_LOG']='0'
+    def show_log(self):
+        os.environ['KOMRADE_SHOW_LOG']='1'
+    def toggle_log(self):
+        self.show_log() if self.off else self.hide_log()
+
     def log(self,*x,pause=PAUSE_LOGGER,clear=CLEAR_LOGGER):
-        if not SHOW_LOG: return
+        if self.off: return
         curframe = inspect.currentframe()
         calframe = inspect.getouterframes(curframe, 2)
         mytype = type(self).__name__