Cleanup and 'uninstall' attempt

annejan · annejan · commit 57e890e1942e · 2017-07-15T16:28:08.000+02:00
diff --git a/esp32/modules/dialogs.py b/esp32/modules/dialogs.py
@@ -3,7 +3,7 @@
 ### Description: Some basic UGFX powered dialogs
 ### License: MIT
 
-import ugfx, badge, utime as time
+import ugfx, utime as time
 
 wait_for_interrupt = True
 button_pushed = ''
diff --git a/esp32/modules/inisetup.py b/esp32/modules/inisetup.py
@@ -46,7 +46,7 @@ def setup():
     print("wake from sleep")
     load_me = esp.rtcmem_read_string()
     if load_me != "":
-        print("starting %s", load_me)
+        print("starting %s" % load_me)
         esp.rtcmem_write_string("")
         __import__(load_me)
     else:
diff --git a/esp32/modules/launcher.py b/esp32/modules/launcher.py
@@ -17,18 +17,23 @@
 ugfx.string(170,75,"Anyway","Roboto_BlackItalic24",ugfx.BLACK)
 ugfx.string(155,105,"MOTD: NVS","Roboto_Regular18",ugfx.BLACK)
 
-options = ugfx.List(0,0,int(ugfx.width()/2),ugfx.height())
+options = None
+install_path = None
 
-try:
-    apps = os.listdir('lib')
-except OSError:
-    apps = []
+def populate_it():
+    global options
+    options = ugfx.List(0,0,int(ugfx.width()/2),ugfx.height())
 
-options.add_item('installer')
-options.add_item('ota_update')
+    try:
+        apps = os.listdir('lib')
+    except OSError:
+        apps = []
 
-for app in apps:
-    options.add_item(app)
+    options.add_item('installer')
+    options.add_item('ota_update')
+
+    for app in apps:
+        options.add_item(app)
 
 def run_it(pushed):
     if (pushed):
@@ -43,8 +48,51 @@ def run_it(pushed):
         esp.rtcmem_write_string(selected)
         esp.start_sleeping(1)
 
+def expandhome(s):
+    if "~/" in s:
+        h = os.getenv("HOME")
+        s = s.replace("~/", h + "/")
+    return s
+
+def get_install_path():
+    global install_path
+    if install_path is None:
+        # sys.path[0] is current module's path
+        install_path = sys.path[1]
+    install_path = expandhome(install_path)
+    return install_path
+
+
+def uninstall_it(pushed):
+    if (pushed):
+        selected = options.selected_text()
+        if selected == 'installer':
+            return
+        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(40,25,"Uninstalling:","Roboto_BlackItalic24",ugfx.WHITE)
+            ugfx.string(100,75, selected,"PermanentMarker22",ugfx.WHITE)
+            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)
+
+
+populate_it()
+
 ugfx.input_attach(ugfx.BTN_A, run_it)
-ugfx.input_attach(ugfx.BTN_B, run_it)
+ugfx.input_attach(ugfx.BTN_B, uninstall_it)
 
 ugfx.input_attach(ugfx.JOY_UP, lambda pushed: ugfx.flush() if pushed else 0)
 ugfx.input_attach(ugfx.JOY_DOWN, lambda pushed: ugfx.flush() if pushed else 0)
