From 5b8189a0152c47f8ac6529f7511431428245e8d5 Mon Sep 17 00:00:00 2001
From: Marek Ventur <marekventur@gmail.com>
Date: Thu, 23 Aug 2018 23:07:25 +0100
Subject: [PATCH] Bootstrap 'app'

---
 badge_store/icon.gif    | Bin 2104 -> 0 bytes
 badge_store/main.py     |   7 +++++--
 bootstrap/main.py       |  26 ++++++++++++++++++++++++++
 lib/badge_store.py      |  36 +++++++++++++++---------------------
 lib/test_badge_store.py |   8 +++++++-
 5 files changed, 53 insertions(+), 24 deletions(-)
 delete mode 100644 badge_store/icon.gif
 create mode 100644 bootstrap/main.py

diff --git a/badge_store/icon.gif b/badge_store/icon.gif
deleted file mode 100644
index 459f81c6a5df0c967a1f593fe0bb5f4d586720b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2104
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
U+lM3Gk9{v?Z^PW30RV^p0ctk{wg3PC

diff --git a/badge_store/main.py b/badge_store/main.py
index 35e75ed..0632a26 100644
--- a/badge_store/main.py
+++ b/badge_store/main.py
@@ -6,7 +6,7 @@ To publish apps use https://badge.emfcamp.org"""
 
 ___license___      = "MIT"
 ___title___        = "Badge Store"
-___dependencies___ = ["app", "badge_store", "dialogs", "ugfx_helper"]
+___dependencies___ = ["app", "badge_store", "dialogs", "ugfx_helper", "app"]
 ___categories___   = ["System"]
 ___bootstrapped___ = True
 
@@ -56,7 +56,7 @@ def show_app(a):
 
     if install:
         with WaitingMessage(title="Installing %s" % a, text="Please wait...") as message:
-            installers = store.install(a)
+            installers = store.install(_get_current_apps + [a])
             n = len(installers)
             for i, installer in enumerate(installers):
                 message.text = "%s (%s/%s)" % (installer.path, i + 1, n)
@@ -89,6 +89,9 @@ def main_menu():
         else:
             app.restart_to_default()
 
+def _get_current_apps():
+    return [a.name for a in app.get_apps()]
+
 wifi.connect(show_wait_message=True)
 main_menu()
 #show_app("launcher")
diff --git a/bootstrap/main.py b/bootstrap/main.py
new file mode 100644
index 0000000..7a0fff2
--- /dev/null
+++ b/bootstrap/main.py
@@ -0,0 +1,26 @@
+"""App that gets backed into the firmware.
+
+It's only purpose is to download the base operating system on first boot.
+
+It's not meant to be executed from the launcher"""
+
+___license___      = "MIT"
+___title___        = "Bootstrap"
+___categories___   = ["System"]
+___dependencies___ = ["badge_store", "dialogs"]
+___launchable___   = False
+___builtin___      = True
+
+import ugfx, wifi, badge_store, machine, dialogs
+
+ugfx.init()
+machine.Pin(machine.Pin.PWM_LCD_BLIGHT).on()
+wifi.connect(show_wait_message=True)
+with dialogs.WaitingMessage(title="Setting up TiLDA Mk4", text="Please wait...") as message:
+    installers = badge_store.BadgeStore().bootstrap()
+    n = len(installers)
+    for i, installer in enumerate(installers):
+        message.text = "%s (%s/%s)" % (installer.path, i + 1, n)
+        installer.download()
+machine.reset()
+
diff --git a/lib/badge_store.py b/lib/badge_store.py
index ef97c10..54b7b09 100644
--- a/lib/badge_store.py
+++ b/lib/badge_store.py
@@ -1,11 +1,11 @@
 """Library to interact with the badge store"""
 
 ___license___      = "MIT"
-___dependencies___ = ["http", "ospath", "app"]
+___dependencies___ = ["http", "ospath"]
 
 from ospath import *
 from http import *
-import hashlib, binascii, app
+import hashlib, binascii
 
 class BadgeStore:
     def __init__(self, url = "http://badge.marekventur.com", repo="emfcamp/Mk4-Apps", ref="master"):
@@ -28,8 +28,19 @@ class BadgeStore:
     def get_app(self, app):
         return self._call("app", {"app": app})
 
-    def call_install(self, apps):
-        files = self._call("install", {"apps": ",".join(apps)})
+    def install(self, apps):
+        return self._create_installers(self._call("install", {"apps": ",".join(apps)}))
+
+    def bootstrap(self):
+        return self._create_installers(self._call("bootstrap"))
+
+    def _call(self, command, params = {}):
+        params["repo"] = self.repo
+        params["ref"] = self.ref
+        with get("%s/%s" % (self.url, command), params=params).raise_for_status() as response:
+            return response.json() # todo: error handling
+
+    def _create_installers(self, files):
         installers = []
         url = "%s/download" % (self.url)
         for path, hash in files.items():
@@ -39,24 +50,9 @@ class BadgeStore:
             installers.append(Installer(path, url, params, hash))
         return installers
 
-    def install(self, app):
-        return self.call_install(self._get_current_apps() + [app])
-
-    def update(self):
-        return self.call_install(self._get_current_apps())
-
-    def _call(self, command, params = {}):
-        params["repo"] = self.repo
-        params["ref"] = self.ref
-        with get("%s/%s" % (self.url, command), params=params).raise_for_status() as response:
-            return response.json() # todo: error handling
-
     def _is_file_up_to_date(self, path, hash):
         return hash == _get_hash(path)
 
-    def _get_current_apps(self):
-        return [a.name for a in app.get_apps()]
-
 TEMP_FILE = ".tmp.download"
 
 class Installer:
@@ -70,7 +66,6 @@ class Installer:
         count = 0
         while get_hash(TEMP_FILE) != self.hash:
             count += 1
-            print(count)
             if count > 5:
                 try:
                     os.remove(TEMP_FILE)
@@ -78,7 +73,6 @@ class Installer:
                     pass
                 raise OSError("Aborting download of %s after 5 unsuccessful attempts" % self.path)
             try:
-                print("download ", self.url, self.params)
                 get(self.url, params=self.params).raise_for_status().download_to(TEMP_FILE)
             except OSError as e:
                 if "404" in str(e):
diff --git a/lib/test_badge_store.py b/lib/test_badge_store.py
index cdfb6b6..e1e7e67 100644
--- a/lib/test_badge_store.py
+++ b/lib/test_badge_store.py
@@ -39,13 +39,19 @@ class TestBadgeStore(unittest.TestCase):
     def test_install_integration(self):
         self._remove_download_file()
         store = BadgeStore(url="http://badge.marekventur.com", repo="emfcamp/Mk4-Apps", ref="dont-delete-test-download-branch")
-        for installer in store.call_install(["launcher"]):
+        for installer in store.install(["launcher"]):
             if installer.path == "shared/test/download.txt":
                 installer.download()
 
         with open(self.download_file, "rt") as response:
             self.assertIn("I'm a download test", response.read())
 
+    def test_bootstrap_integration(self):
+        self._remove_download_file()
+        store = BadgeStore(url="http://badge.marekventur.com")
+        installers = store.bootstrap()
+        self.assertTrue(len(installers) > 0)
+
     def _remove_download_file(self):
         if isdir(self.download_file) or isfile(self.download_file):
             os.remove(self.download_file)