Merge pull request SHA2017-badge#68 from SHA2017-badge/asyncTextPrompt

annejan · web-flow · commit 3610bd3b1a23 · 2017-07-18T00:24:24.000+02:00
Dialogs: async API for text prompt
diff --git a/esp32/modules/dialogs.py b/esp32/modules/dialogs.py
@@ -15,12 +15,14 @@ def notice(text, title="SHA2017", close_text="Close", width = 296, height = 128,
 	"""
 	prompt_boolean(text, title = title, true_text = close_text, false_text = None, width = width, height = height, font=font)
 
-def prompt_boolean(text, title="SHA2017", true_text="Yes", false_text="No", width = 296, height = 128, font="Roboto_Regular12"):
+def prompt_boolean(text, title="SHA2017", true_text="Yes", false_text="No", width = 296, height = 128, font="Roboto_Regular12", cb=None):
 	"""A simple one and two-options dialog
 
 	if 'false_text' is set to None only one button is displayed.
 	If both 'false_text' and 'true_text' are given a boolean is returned, press B for false, A for true.
 
+	Pass along a 'cb' callback to make the dialog async, which is needed to make input work when used from a callback
+
 	The caller is responsible for flushing the display after processing the response.
 	"""
 	global wait_for_interrupt, button_pushed
@@ -35,6 +37,32 @@ def prompt_boolean(text, title="SHA2017", true_text="Yes", false_text="No", widt
 		false_text = "B: " + false_text
 		true_text = "A: " + true_text
 
+	def done(result):
+		window.destroy()
+		if cb:
+			cb(result)
+		return result
+
+	def syncSuccess(evt):
+		if evt:
+			# We'd like promises here, but for now this should do
+			global wait_for_interrupt, button_pushed
+			button_pushed = "A"
+			wait_for_interrupt = False
+	def syncCancel(evt):
+		if evt:
+			# We'd like promises here, but for now this should do
+			global wait_for_interrupt, button_pushed
+			button_pushed = "B"
+			wait_for_interrupt = False
+
+	def asyncSuccess(evt):
+		if evt:
+			done(True)
+	def asyncCancel(evt):
+		if evt:
+			done(False)
+
 	label = ugfx.Label(5, 30, width - 10, height - 80, text = text, parent=window)
 	button_no = ugfx.Button(5, height - 40, width // 2 - 15, 30, false_text, parent=window) if false_text else None
 	button_yes = ugfx.Button(width // 2 + 5 if true_text else 5, height - 40, width // 2 - 15 if false_text else width - 10, 30, true_text, parent=window)
@@ -46,28 +74,24 @@ def prompt_boolean(text, title="SHA2017", true_text="Yes", false_text="No", widt
 	ugfx.set_lut(ugfx.LUT_NORMAL)
 	ugfx.flush()
 
-	def done(value):
-		window.hide()
-		window.destroy()
-		button_yes.destroy()
-		if button_no: button_no.destroy()
-		label.destroy()
-		return value
+	if button_no: ugfx.input_attach(ugfx.BTN_B, asyncCancel if cb else syncCancel)
+	ugfx.input_attach(ugfx.BTN_A, asyncSuccess if cb else syncSuccess)
 
-	if button_no: ugfx.input_attach(ugfx.BTN_B, pressed_b)
-	ugfx.input_attach(ugfx.BTN_A, pressed_a)
-
-	wait_for_interrupt = True
-	while wait_for_interrupt:
-		time.sleep(0.2)
+	if cb:
+		return
+	else:
+		wait_for_interrupt = True
+		while wait_for_interrupt:
+			time.sleep(0.2)
 
-	if button_pushed == "B": return done(False)
-	if button_pushed == "A": return done(True)
+		if button_pushed == "B": return done(False)
+		return done(True)
 
-def prompt_text(description, init_text = "", true_text="OK", false_text="Back", width = 300, height = 200, font="Roboto_BlackItalic24"):
+def prompt_text(description, init_text = "", true_text="OK", false_text="Back", width = 300, height = 200, font="Roboto_BlackItalic24", cb=None):
 	"""Shows a dialog and keyboard that allows the user to input/change a string
 
-	Returns None if user aborts with button B
+	Calls the 'cb' callback or return None if user aborts with button B. Using a callback is highly recommended as it's not
+	possible to process events inside an event callback.
 
 	The caller is responsible for flushing the display after processing the response.
 	"""
@@ -86,13 +110,33 @@ def prompt_text(description, init_text = "", true_text="OK", false_text="Back",
 	ugfx.set_default_font("Roboto_Regular12")
 	button_height = 25
 
-	def okay(evt):
-		# We'd like promises here, but for now this should do
-		global wait_for_interrupt
-		button_pushed = "A"
-		wait_for_interrupt = False
-
-	button_yes = ugfx.Button(int(width*4/5), height-kb_height-button_height, int(width*1/5)-3, button_height, true_text, parent=window, cb=okay)
+	def done(result):
+		window.destroy()
+		if cb:
+			cb(result)
+		return result
+
+	def syncSuccess(evt):
+		if evt:
+			# We'd like promises here, but for now this should do
+			global wait_for_interrupt, button_pushed
+			button_pushed = "A"
+			wait_for_interrupt = False
+	def syncCancel(evt):
+		if evt:
+			# We'd like promises here, but for now this should do
+			global wait_for_interrupt, button_pushed
+			button_pushed = "B"
+			wait_for_interrupt = False
+
+	def asyncSuccess(evt):
+		if evt:
+			done(edit.text())
+	def asyncCancel(evt):
+		if evt:
+			done(None)
+
+	button_yes = ugfx.Button(int(width*4/5), height-kb_height-button_height, int(width*1/5)-3, button_height, true_text, parent=window, cb=asyncSuccess if cb else syncSuccess)
 	button_no = ugfx.Button(int(width*4/5), height-kb_height-button_height-button_height, int(width/5)-3, button_height, false_text, parent=window) if false_text else None
 	ugfx.set_default_font(font)
 	label = ugfx.Label(5, 1, int(width*4/5), height-kb_height-5-edit_height-5, description, parent=window)
@@ -114,14 +158,14 @@ def toggle_focus(pressed):
 			elif focus == 1 or not button_no:
 				button_yes.set_focus()
 				kb.enabled(0)
-				ugfx.input_attach(ugfx.BTN_A, pressed_a)
-				ugfx.input_attach(ugfx.BTN_B, pressed_b)
+				ugfx.input_attach(ugfx.BTN_A, asyncSuccess if cb else syncSuccess)
+				ugfx.input_attach(ugfx.BTN_B, asyncCancel if cb else syncCancel)
 				focus = (2 if button_no else 0)
 			else:
 				button_no.set_focus()
 				kb.enabled(0)
-				ugfx.input_attach(ugfx.BTN_A, pressed_a)
-				ugfx.input_attach(ugfx.BTN_B, pressed_b)
+				ugfx.input_attach(ugfx.BTN_A, asyncCancel if cb else syncCancel)
+				ugfx.input_attach(ugfx.BTN_B, asyncCancel if cb else syncCancel)
 				focus = 0
 			ugfx.flush()
 
@@ -138,21 +182,14 @@ def toggle_focus(pressed):
 	ugfx.flush()
 
 	wait_for_interrupt = True
-	while wait_for_interrupt:
-		time.sleep(0.2)
+	if cb:
+		return
+	else:
+		while wait_for_interrupt:
+			time.sleep(0.2)
 
-	def done(value):
-		window.hide()
-		window.destroy()
-		button_yes.destroy()
-		if button_no: button_no.destroy()
-		label.destroy()
-		kb.destroy()
-		edit.destroy()
-		return value
-
-	if (focus == 0 and no_button) or button_pushed == "B": return done(False)
-	return done(edit.text())
+		if (focus == 0 and no_button) or button_pushed == "B": return done(False)
+		return done(edit.text())
 
 def prompt_option(options, index=0, text = "Please select one of the following:", title=None, select_text="OK", none_text=None):
 	"""Shows a dialog prompting for one of multiple options
diff --git a/esp32/modules/launcher.py b/esp32/modules/launcher.py
@@ -73,7 +73,6 @@ def get_install_path():
     install_path = expandhome(install_path)
     return install_path
 
-
 def uninstall_it(pushed):
     if (pushed):
         selected = options.selected_text()
@@ -82,23 +81,23 @@ def uninstall_it(pushed):
         if selected == 'ota_update':
             return
         options.destroy()
-        import dialogs
-        print(selected)
-        uninstall = dialogs.prompt_boolean('Are you sure you want to remove %s?' % selected)
-        print(uninstall)
-        if uninstall:
-            ugfx.clear(ugfx.BLACK)
-            ugfx.string_box(0, 25, 296, 25,"Uninstalling:","Roboto_BlackItalic24",ugfx.WHITE, ugfx.justifyCenter)
-            ugfx.string_box(0, 51, 296, 23, selected, "PermanentMarker22", ugfx.WHITE, ugfx.justifyCenter)
-            ugfx.flush()
-            install_path = get_install_path()
-            for rm_file in os.listdir("%s/%s" % (install_path, selected)):
-                os.remove("%s/%s/%s" % (install_path, selected, rm_file))
-            os.rmdir("%s/%s" % (install_path, selected))
-        badge.eink_busy_wait()
-        esp.rtcmem_write_string('launcher')
-        esp.start_sleeping(1)
 
+        def perform_uninstall(ok):
+            if ok:
+                ugfx.clear(ugfx.BLACK)
+                ugfx.string_box(0, 25, 296, 25,"Uninstalling:","Roboto_BlackItalic24",ugfx.WHITE, ugfx.justifyCenter)
+                ugfx.string_box(0, 51, 296, 23, selected, "PermanentMarker22", ugfx.WHITE, ugfx.justifyCenter)
+                ugfx.flush()
+                install_path = get_install_path()
+                for rm_file in os.listdir("%s/%s" % (install_path, selected)):
+                    os.remove("%s/%s/%s" % (install_path, selected, rm_file))
+                os.rmdir("%s/%s" % (install_path, selected))
+            badge.eink_busy_wait()
+            esp.rtcmem_write_string('launcher')
+            esp.start_sleeping(1)
+
+        import dialogs
+        uninstall = dialogs.prompt_boolean('Are you sure you want to remove %s?' % selected, cb=perform_uninstall)
 
 populate_it()
 
