From bd05ffbc44195c80fba5a211cef7d7c0efc5f59e Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Tue, 22 Sep 2020 16:09:25 +0100 Subject: [PATCH] ? --- komrade/app/main.py | 1 + komrade/app/screens/login/login.py | 8 ++++---- komrade/cli/cli.py | 4 ++-- komrade/constants.py | 7 ++++++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/komrade/app/main.py b/komrade/app/main.py index c04588e..39b69b7 100644 --- a/komrade/app/main.py +++ b/komrade/app/main.py @@ -388,6 +388,7 @@ class MainApp(MDApp, Logger): self.msg_dialog.add_widget(postcard) self.msg_dialog.open() + time.sleep(5) def open_msg_dialog(self,msg): # from screens.post.post import MessagePopup,ProgressPopup diff --git a/komrade/app/screens/login/login.py b/komrade/app/screens/login/login.py index 3b66112..e96443c 100644 --- a/komrade/app/screens/login/login.py +++ b/komrade/app/screens/login/login.py @@ -161,12 +161,12 @@ class LoginScreen(BaseScreen): def boot(self,un): - self.app.stat( - 'You chose the username '+un - ) + # self.app.stat( + # 'You chose the username '+un + # ) - return + # return kommie = Komrade(un,getpass_func=self.getpass_func) # self.show_pass_opt() logger.info(f'booted kommie: {kommie}') diff --git a/komrade/cli/cli.py b/komrade/cli/cli.py index 4dc8bc5..3fd9f4c 100644 --- a/komrade/cli/cli.py +++ b/komrade/cli/cli.py @@ -169,10 +169,10 @@ class CLI(Logger): tot=self.komrade.num_msgs ) - def clearnet(self): + def clearnet(self,_=''): os.environ['KOMRADE_USE_CLEARNET'] = '1' os.environ['KOMRADE_USE_TOR'] = '0' - def tor(self): + def tor(self,_=''): os.environ['KOMRADE_USE_CLEARNET'] = '0' os.environ['KOMRADE_USE_TOR'] = '1' diff --git a/komrade/constants.py b/komrade/constants.py index 9df1760..b3debcd 100644 --- a/komrade/constants.py +++ b/komrade/constants.py @@ -181,4 +181,9 @@ MAX_MSG_LEN = 1000 import os,logging if not 'KOMRADE_SHOW_LOG' in os.environ or not os.environ['KOMRADE_SHOW_LOG'] or os.environ['KOMRADE_SHOW_LOG']=='0': logger = logging.getLogger() - logger.propagate = False \ No newline at end of file + logger.propagate = False + +if not 'KOMRADE_USE_TOR' in os.environ or not os.environ['KOMRADE_USE_TOR']: + KOMRADE_USE_TOR = os.environ['KOMRADE_USE_TOR'] = '1' +if not 'KOMRADE_USE_CLEARNET' in os.environ or not os.environ['KOMRADE_USE_CLEARNET']: + KOMRADE_USE_CLEARNET = os.environ['KOMRADE_USE_CLEARNET'] = '0'