diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py index 76f2974..05b03c0 100644 --- a/komrade/cli/cli.py +++ b/komrade/cli/cli.py @@ -68,7 +68,9 @@ class CLI(Logger): self.status(None,) def register(self,name=None): - self._komrade = Komrade(name if name else self.name) + if not name: name=input('name: ') + if not name: return + self._komrade = Komrade(name) res=self._komrade.register() if res and type(res)==dict and 'success' in res and res['success']: self._name=self._komrade.name @@ -81,11 +83,12 @@ class CLI(Logger): print('@Operator: '+res.get('status','?')) def login(self,name): - name=self.name if not name else name if not name: name=input('name: ') if not name: return - self._komrade=Komrade(name if name else self.name) + self._komrade=Komrade(name) + res = self._komrade.login() + if res and type(res)==dict and 'success' in res and res['success']: self._name=self._komrade.name self._loggedin=True diff --git a/komrade/constants.py b/komrade/constants.py index 46fcdec..753a6d7 100644 --- a/komrade/constants.py +++ b/komrade/constants.py @@ -156,8 +156,8 @@ DEFAULT_USER_SETTINGS = { SHOW_LOG = 1 SHOW_STATUS = 0 -PAUSE_LOGGER = 1 - +PAUSE_LOGGER = 0 +CLEAR_LOGGER = 1 CLI_TITLE = 'KOMRADE' CLI_FONT = 'clr5x6'#'colossal' diff --git a/komrade/utils.py b/komrade/utils.py index 1e45005..200f9d1 100644 --- a/komrade/utils.py +++ b/komrade/utils.py @@ -64,7 +64,7 @@ def dict_format(d, tab=0): import inspect,time from komrade.constants import * class Logger(object): - def log(self,*x,pause=PAUSE_LOGGER,clear=PAUSE_LOGGER): + def log(self,*x,pause=PAUSE_LOGGER,clear=CLEAR_LOGGER): if not SHOW_LOG: return curframe = inspect.currentframe() calframe = inspect.getouterframes(curframe, 2)