magical
/
bbj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added environment variable support for logging in.

themes
desvox 2018-07-27 19:00:23 -05:00
parent 6d0d10b9a7
commit 92c4f4c1ae
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clients/urwid/main.py
View File

@ -1031,8 +1031,10 @@ class App(object):
self.loop.stop() self.loop.stop()
call("clear", shell=True) call("clear", shell=True)
print(welcome) print(welcome)
try: log_in() try:
except (KeyboardInterrupt, InterruptedError): pass log_in(relog=True)
except (KeyboardInterrupt, InterruptedError):
pass
self.loop.start() self.loop.start()
self.set_default_header() self.set_default_header()
self.options_menu() self.options_menu()
@ -2182,20 +2184,29 @@ def nameloop(prompt, positive):
return name return name
def log_in(): def log_in(relog=False):
""" """
Handles login or registration using an oldschool input() Handles login or registration using an oldschool input()
chain. The user is run through this before starting the chain. The user is run through this before starting the
curses app. curses app.
""" """
name = get_arg("user") or sane_value("user_name", "Username", return_empty=True) if relog:
name = sane_value("user_name", "Username", return_empty=True)
else:
name = get_arg("user") \
or os.getenv("BBJ_USER") \
or sane_value("user_name", "Username", return_empty=True)
if name == "": if name == "":
motherfucking_rainbows("~~W3 4R3 4n0nYm0u5~~") motherfucking_rainbows("~~W3 4R3 4n0nYm0u5~~")
else: else:
# ConnectionRefusedError means registered but needs a # ConnectionRefusedError means registered but needs a
# password, ValueError means we need to register the user. # password, ValueError means we need to register the user.
try: try:
network.set_credentials(name, "") network.set_credentials(
name,
os.getenv("BBJ_PASSWORD", default="")
if not relog else ""
)
# make it easy for people who use an empty password =) # make it easy for people who use an empty password =)
motherfucking_rainbows("~~welcome back {}~~".format(network.user_name)) motherfucking_rainbows("~~welcome back {}~~".format(network.user_name))
@ -2226,7 +2237,7 @@ def log_in():
password = password_loop("Enter a password. It can be empty if you want") password = password_loop("Enter a password. It can be empty if you want")
network.user_register(name, password) network.user_register(name, password)
motherfucking_rainbows("~~welcome to the party, %s!~~" % network.user_name) motherfucking_rainbows("~~welcome to the party, %s!~~" % network.user_name)
sleep(0.8) # let that confirmation message shine sleep(0.5) # let that confirmation message shine
def frame_theme(mode="default"): def frame_theme(mode="default"):