nick
/
EMF_Camp_Badge
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tidy up with .format()

master
Matthew Stratford 2018-09-14 23:26:48 +01:00
parent 900c711ede
commit 6683e2bc8d
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
badge_store/main.py
View File

@ -56,24 +56,15 @@ def show_app(a,c):
with WaitingMessage(title=title, text="Loading app description..."): with WaitingMessage(title=title, text="Loading app description..."):
app_info = store.get_app(a) app_info = store.get_app(a)
app_text = "App:\n"
try: # Try to get the 'title' key from app_info, falling back to the value of a if not present
app_text += app_info["title"] + '\n' name = app_info.get("title", a)
except: desc = app_info["description"].strip()
pass app_text = """App:\n{}\n\nDescription:\n{}""".format(name, desc)
finally:
app_text += a + '\n\nDescription:\n' + app_info["description"].strip()
install = prompt_boolean(app_text , title="Install App", true_text="Install", false_text="Back") install = prompt_boolean(app_text , title="Install App", true_text="Install", false_text="Back")
if install: if install:
app_text = "App:\n" app_text = "App:\n{}\n\n".format(name)
try:
app_text += app_info["title"] + '\n'
except:
pass
finally:
app_text += a + '\n\n'
with WaitingMessage(title="Installing App...", text="%sGetting ready..." % app_text) as message: with WaitingMessage(title="Installing App...", text="%sGetting ready..." % app_text) as message:
installers = store.install(_get_current_apps() + [a]) installers = store.install(_get_current_apps() + [a])
n = len(installers) n = len(installers)
@ -113,12 +104,9 @@ def show_remove():
if app_to_remove: if app_to_remove:
ospath.recursive_rmdir(app_to_remove) ospath.recursive_rmdir(app_to_remove)
app.uncache_apps() app.uncache_apps()
app_text = "App \"" + app_to_remove + "\""
try: app_text = """App:\n{}""".format(app_to_remove)
app_text += " (" + app_info["title"] + ')' notice("\"%s\"\n\nThe app has now been removed." % app_text, title="Remove Success!", close_text="Back")
except:
pass
notice("%s has been removed." % app_text, title="Remove Success!", close_text="Back")
def main_menu(): def main_menu():
while True: while True: