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

remove star expansion statements (3.4 compat)

themes
Blake DeMarcy 2017-09-06 16:54:29 -05:00
parent ab2f6ebc5b
commit ab8d530677
1 changed files with 86 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
clients/urwid/main.py
View File

@ -25,7 +25,7 @@ from string import punctuation
from datetime import datetime from datetime import datetime
from time import time, sleep from time import time, sleep
from getpass import getpass from getpass import getpass
from subprocess import run from subprocess import call
from random import choice from random import choice
from sys import argv from sys import argv
import tempfile import tempfile
@ -413,10 +413,7 @@ class App(object):
Callback function to view a quote from the message object menu. Callback function to view a quote from the message object menu.
""" """
widget = OptionsMenu( widget = OptionsMenu(
ActionBox( ActionBox(urwid.SimpleFocusListWalker(self.make_message_body(message))),
urwid.SimpleFocusListWalker([
*self.make_message_body(message)
])),
title=">>%d" % message["post_id"], title=">>%d" % message["post_id"],
**frame_theme() **frame_theme()
) )
@ -896,7 +893,7 @@ class App(object):
""" """
self.loop.widget = self.loop.widget[0] self.loop.widget = self.loop.widget[0]
self.loop.stop() self.loop.stop()
run("clear", shell=True) call("clear", shell=True)
print(welcome) print(welcome)
try: log_in() try: log_in()
except (KeyboardInterrupt, InterruptedError): pass except (KeyboardInterrupt, InterruptedError): pass
@ -957,10 +954,7 @@ class App(object):
"\n\n".join(format_help), format="sequential") "\n\n".join(format_help), format="sequential")
widget = OptionsMenu( widget = OptionsMenu(
urwid.ListBox( urwid.ListBox(urwid.SimpleFocusListWalker(app.make_message_body(message, True))),
urwid.SimpleFocusListWalker([
*app.make_message_body(message, True)
])),
title="Formatting Help", title="Formatting Help",
**frame_theme() **frame_theme()
) )
@ -1001,7 +995,7 @@ class App(object):
def change_username(self, *_): def change_username(self, *_):
self.loop.stop() self.loop.stop()
run("clear", shell=True) call("clear", shell=True)
try: try:
name = nameloop("Choose a new username", True) name = nameloop("Choose a new username", True)
network.user_update(user_name=name) network.user_update(user_name=name)
@ -1017,7 +1011,7 @@ class App(object):
def change_password(self, *_): def change_password(self, *_):
self.loop.stop() self.loop.stop()
run("clear", shell=True) call("clear", shell=True)
try: try:
password = password_loop("Choose a new password. Can be empty", True) password = password_loop("Choose a new password. Can be empty", True)
network.user_update(auth_hash=network._hash(password)) network.user_update(auth_hash=network._hash(password))
@ -1091,13 +1085,6 @@ class App(object):
if network.user_auth: if network.user_auth:
account_message = "Logged in as %s." % network.user_name account_message = "Logged in as %s." % network.user_name
user_colors = []
for index, color in enumerate(colornames):
urwid.RadioButton(
user_colors, color.title(),
network.user["color"] == index,
self.set_color, index)
account_stuff = [ account_stuff = [
urwid.Button("Relog", on_press=self.relog), urwid.Button("Relog", on_press=self.relog),
urwid.Button("Go anonymous", on_press=self.unlog), urwid.Button("Go anonymous", on_press=self.unlog),
@ -1107,10 +1094,19 @@ class App(object):
urwid.Text(("button", "Your color:")), urwid.Text(("button", "Your color:")),
urwid.Text(("default", "This color will show on your " urwid.Text(("default", "This color will show on your "
"post headers and when people quote you.")), "post headers and when people quote you.")),
urwid.Divider(), urwid.Divider()
*user_colors
] ]
user_colors = []
for index, color in enumerate(colornames):
urwid.RadioButton(
user_colors, color.title(),
network.user["color"] == index,
self.set_color, index)
for item in user_colors:
account_stuff.append(item)
else: else:
account_message = "You're browsing anonymously, and cannot set account preferences." account_message = "You're browsing anonymously, and cannot set account preferences."
account_stuff = [urwid.Button("Login/Register", on_press=self.relog)] account_stuff = [urwid.Button("Login/Register", on_press=self.relog)]
@ -1155,14 +1151,17 @@ class App(object):
edit_mode, "Overthrow", edit_mode, "Overthrow",
state=not self.prefs["integrate_external_editor"]) state=not self.prefs["integrate_external_editor"])
widget = OptionsMenu( content = []
urwid.ListBox(
urwid.SimpleFocusListWalker([ for item in [urwid.Text(("opt_header", "Account"), 'center'),
urwid.Text(("opt_header", "Account"), 'center'),
urwid.Text(account_message), urwid.Text(account_message),
urwid.Divider(), urwid.Divider()]:
*account_stuff, content.append(item)
urwid.Divider("-"),
for item in account_stuff:
content.append(item)
for item in [urwid.Divider("-"),
urwid.Text(("opt_header", "App"), 'center'), urwid.Text(("opt_header", "App"), 'center'),
urwid.Divider(), urwid.Divider(),
urwid.CheckBox( urwid.CheckBox(
@ -1180,9 +1179,13 @@ class App(object):
state=self.prefs["mouse_integration"], state=self.prefs["mouse_integration"],
on_state_change=self.toggle_mouse on_state_change=self.toggle_mouse
), ),
urwid.Divider(), urwid.Divider()]:
*time_stuff, content.append(item)
urwid.Divider(),
for item in time_stuff:
content.append(item)
for item in [urwid.Divider(),
urwid.Text(("button", "Max message width:")), urwid.Text(("button", "Max message width:")),
urwid.AttrMap(width_edit, "opt_prompt"), urwid.AttrMap(width_edit, "opt_prompt"),
urwid.Divider(), urwid.Divider(),
@ -1192,17 +1195,26 @@ class App(object):
urwid.Text(("button", "Text editor:")), urwid.Text(("button", "Text editor:")),
urwid.Text("You can type in your own command or use one of these presets."), urwid.Text("You can type in your own command or use one of these presets."),
urwid.Divider(), urwid.Divider(),
urwid.AttrMap(editor_display, "opt_prompt"), urwid.AttrMap(editor_display, "opt_prompt")]:
*editor_buttons, content.append(item)
urwid.Divider(),
for item in editor_buttons:
content.append(item)
for item in [urwid.Divider(),
urwid.Text(("button", "External text editor mode:")), urwid.Text(("button", "External text editor mode:")),
urwid.Text("If you have problems using an external text editor, " urwid.Text("If you have problems using an external text editor, "
"set this to Overthrow."), "set this to Overthrow."),
urwid.Divider(), urwid.Divider()]:
*edit_mode, content.append(item)
urwid.Divider("-"),
]) for item in edit_mode:
), content.append(edit_mode)
content.append(urwid.Divider("-"))
widget = OptionsMenu(
urwid.ListBox(urwid.SimpleFocusListWalker(content)),
title="Options", title="Options",
**frame_theme()) **frame_theme())
@ -1258,7 +1270,7 @@ class App(object):
descriptor, path = tempfile.mkstemp() descriptor, path = tempfile.mkstemp()
with open(path, "w") as _: with open(path, "w") as _:
_.write(init_body) _.write(init_body)
run("export LANG=en_US.UTF-8; %s %s" % (self.prefs["editor"], path), shell=True) call("export LANG=en_US.UTF-8; %s %s" % (self.prefs["editor"], path), shell=True)
with open(path) as _: with open(path) as _:
body = _.read() body = _.read()
os.remove(path) os.remove(path)
@ -1781,7 +1793,7 @@ class ActionBox(urwid.ListBox):
elif key == "~": elif key == "~":
# sssssshhhhhhhh # sssssshhhhhhhh
app.loop.stop() app.loop.stop()
try: run("sl", shell=True) try: call("sl", shell=True)
except: pass except: pass
app.loop.start() app.loop.start()
@ -1827,7 +1839,7 @@ def frilly_exit():
out = " ~~CoMeE BaCkK SooOn~~ 0000000" out = " ~~CoMeE BaCkK SooOn~~ 0000000"
motherfucking_rainbows(out.zfill(width)) motherfucking_rainbows(out.zfill(width))
else: else:
run("clear", shell=True) call("clear", shell=True)
motherfucking_rainbows("Come back soon! <3") motherfucking_rainbows("Come back soon! <3")
exit() exit()
@ -1891,7 +1903,7 @@ def paren_prompt(text, positive=True, choices=[], function=input):
try: try:
response = function("{0}({1}{2}{0}){3}> \033[0m".format( response = function("{0}({1}{2}{0}){3}> \033[0m".format(
*mood, text, formatted_choices)) mood[0], mood[1], text, formatted_choices))
if not choices: if not choices:
return response return response
elif response == "": elif response == "":
@ -2063,14 +2075,14 @@ def wipe_screen(*_):
will do, I suppose. will do, I suppose.
""" """
app.loop.stop() app.loop.stop()
run("clear", shell=True) call("clear", shell=True)
app.loop.start() app.loop.start()
def main(): def main():
global app global app
app = App() app = App()
run("clear", shell=True) call("clear", shell=True)
motherfucking_rainbows(obnoxious_logo) motherfucking_rainbows(obnoxious_logo)
print(welcome) print(welcome)
try: try: