From f5e113d50f9c8d904fee2179ffb13b01997cb563 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Wed, 19 Oct 2022 16:32:13 +0100
Subject: [PATCH] launcher 0.16: Use a cache of app.info files to speed up
 loading the launcher

---
 apps/launch/ChangeLog     |  1 +
 apps/launch/app.js        | 87 +++++++++++++++++++--------------------
 apps/launch/metadata.json |  4 +-
 3 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/apps/launch/ChangeLog b/apps/launch/ChangeLog
index 36852e0b7..bbd4372ab 100644
--- a/apps/launch/ChangeLog
+++ b/apps/launch/ChangeLog
@@ -15,3 +15,4 @@
 0.13: Add fullscreen mode
 0.14: Use default Bangle formatter for booleans
 0.15: Support for unload and quick return to the clock on 2v16
+0.16: Use a cache of app.info files to speed up loading the launcher
diff --git a/apps/launch/app.js b/apps/launch/app.js
index d53f0dcdf..b51662b00 100644
--- a/apps/launch/app.js
+++ b/apps/launch/app.js
@@ -1,5 +1,6 @@
 { // must be inside our own scope here so that when we are unloaded everything disappears
 let s = require("Storage");
+// handle customised launcher
 let scaleval = 1;
 let vectorval = 20;
 let font = g.getFonts().includes("12x20") ? "12x20" : "6x8:2";
@@ -7,56 +8,51 @@ let settings = Object.assign({
   showClocks: true,
   fullscreen: false
 }, s.readJSON("launch.json", true) || {});
-
-if ("vectorsize" in settings) {
-    vectorval = parseInt(settings.vectorsize);
-}
+if ("vectorsize" in settings)
+  vectorval = parseInt(settings.vectorsize);
 if ("font" in settings){
-    if(settings.font == "Vector"){
-        scaleval = vectorval/20;
-        font = "Vector"+(vectorval).toString();
-    }
-    else{
-        font = settings.font;
-        scaleval = (font.split("x")[1])/20;
-    }
+  if(settings.font == "Vector"){
+    scaleval = vectorval/20;
+    font = "Vector"+(vectorval).toString();
+  } else{
+    font = settings.font;
+    scaleval = (font.split("x")[1])/20;
+  }
 }
-let apps = s.list(/\.info$/).map(app=>{var a=s.readJSON(app,1);return a&&{name:a.name,type:a.type,icon:a.icon,sortorder:a.sortorder,src:a.src};}).filter(app=>app && (app.type=="app" || (app.type=="clock" && settings.showClocks) || !app.type));
-apps.sort((a,b)=>{
-  var n=(0|a.sortorder)-(0|b.sortorder);
-  if (n) return n; // do sortorder first
-  if (a.name<b.name) return -1;
-  if (a.name>b.name) return 1;
-  return 0;
-});
-apps.forEach(app=>{
-  if (app.icon)
-    app.icon = s.read(app.icon); // should just be a link to a memory area
-});
-// FIXME: check not needed after 2v11
-if (g.wrapString) {
-  g.setFont(font);
-  apps.forEach(app=>app.name = g.wrapString(app.name, g.getWidth()-64).join("\n"));
+// cache app list so launcher loads more quickly
+let launchCache = s.readJSON("launch.cache.json", true)||{};
+let launchHash = require("Storage").hash(/\.info/);
+if (launchCache.hash!=launchHash) {
+  launchCache = {
+    hash : launchHash,
+    apps : s.list(/\.info$/)
+            .map(app=>{var a=s.readJSON(app,1);return a&&{name:a.name,type:a.type,icon:a.icon,sortorder:a.sortorder,src:a.src};})
+            .filter(app=>app && (app.type=="app" || (app.type=="clock" && settings.showClocks) || !app.type))
+            .sort((a,b)=>{
+              var n=(0|a.sortorder)-(0|b.sortorder);
+              if (n) return n; // do sortorder first
+              if (a.name<b.name) return -1;
+              if (a.name>b.name) return 1;
+              return 0;
+            }) };
+  s.writeJSON("launch.cache.json", launchCache);
 }
-
-function drawApp(i, r) {
-  var app = apps[i];
-  if (!app) return;
-  g.clearRect((r.x),(r.y),(r.x+r.w-1), (r.y+r.h-1));
-  g.setFont(font).setFontAlign(-1,0).drawString(app.name,64*scaleval,r.y+(32*scaleval));
-  if (app.icon) try {g.drawImage(app.icon,8*scaleval, r.y+(8*scaleval), {scale: scaleval});} catch(e){}
-}
-
-g.clear();
-
-if (!settings.fullscreen) {
+let apps = launchCache.apps;
+// Now apps list is loaded - render
+if (!settings.fullscreen)
   Bangle.loadWidgets();
-  Bangle.drawWidgets();
-}
-
 E.showScroller({
   h : 64*scaleval, c : apps.length,
-  draw : drawApp,
+  draw : (i, r) => {
+    var app = apps[i];
+    if (!app) return;
+    g.clearRect((r.x),(r.y),(r.x+r.w-1), (r.y+r.h-1));
+    g.setFont(font).setFontAlign(-1,0).drawString(app.name,64*scaleval,r.y+(32*scaleval));
+    if (app.icon) {
+      if (!app.img) app.img = s.read(app.icon); // load icon if it wasn't loaded
+      try {g.drawImage(app.img,8*scaleval, r.y+(8*scaleval), {scale: scaleval});} catch(e){}
+    }
+  },
   select : i => {
     var app = apps[i];
     if (!app) return;
@@ -69,6 +65,7 @@ E.showScroller({
     }
   }
 });
+g.flip(); // force a render before widgets have finished drawing
 
 function returnToClock() {
   // unload everything manually
@@ -96,4 +93,6 @@ function lockHandler(locked) {
     lockTimeout = setTimeout(returnToClock, 10000);
 }
 Bangle.on("lock", lockHandler);
+if (!settings.fullscreen) // finally draw widgets
+  Bangle.drawWidgets();
 }
diff --git a/apps/launch/metadata.json b/apps/launch/metadata.json
index ec070e44e..6dd8b44d3 100644
--- a/apps/launch/metadata.json
+++ b/apps/launch/metadata.json
@@ -2,7 +2,7 @@
   "id": "launch",
   "name": "Launcher",
   "shortName": "Launcher",
-  "version": "0.15",
+  "version": "0.16",
   "description": "This is needed to display a menu allowing you to choose your own applications. You can replace this with a customised launcher.",
   "readme": "README.md",
   "icon": "app.png",
@@ -13,6 +13,6 @@
     {"name":"launch.app.js","url":"app.js"},
     {"name":"launch.settings.js","url":"settings.js"}
   ],
-  "data": [{"name":"launch.json"}],
+  "data": [{"name":"launch.json"},{"name":"launch.cache.json"}],
   "sortorder": -10
 }