Merge pull request #4104 from bobrippling/feat/clkinfo-filtering

clkinfo: add filtering

Author: bobrippling

apps/boot/ChangeLog

@@ -76,4 +76,5 @@
       Bangle.loadWidgets overwritten with fast version on success
       Refuse to work on firmware  <2v16 and remove old polyfills
 0.65: Only display interpreter errors if log is nonzero
-0.66: Ensure __FILE__ is set even after a fresh boot (fix #3857)
+0.66: Ensure __FILE__ is set even after a fresh boot (fix #3857)
+0.67: When generating .clkinfocache, apply configured exclusions

apps/boot/bootupdate.js

@@ -116,7 +116,7 @@ let bootFiles = require('Storage').list(/\.boot\.js$/).sort((a,b)=>{
 // precalculate file size
 bootPost += "}";
 let fileOffset,fileSize;
-/* code to output a file, plus preable and postable
+/* code to output a file, plus preamble and postamble
 when called with dst==undefined it just increments
 fileOffset so we can see ho wbig the file has to be */
 let outputFile = (dst,src,pre,post) => {"ram";
@@ -192,8 +192,10 @@ delete widget,widgetPost,widgetFiles;
 // ================================================== .clkinfocache for clockinfos
 let ciFiles = require("Storage").list(/\.clkinfo\.js$/);
 let ci = `// Made by bootupdate.js\n`;
+let ci_exclude = (require("Storage").readJSON("clock_info.json", 1) || {}).exclude;
 if (DEBUG) ci+="var _tm=Date.now();";
 outputFileComplete = (dst,fn) => {
+  if (ci_exclude && ci_exclude[fn]) return;
   outputFile(dst,fn,"try{let fn=",`;let a=fn(),b=menu.find(x=>x.name===a.name);if(b)b.items=b.items.concat(a.items)else menu=menu.concat(a);}catch(e){print(${E.toJS(fn)},e,e.stack)}\n`);
 };
 fileOffset = ci.length;

apps/boot/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "boot",
   "name": "Bootloader",
-  "version": "0.66",
+  "version": "0.67",
   "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings",
   "icon": "bootloader.png",
   "type": "bootloader",

apps/clock_info/ChangeLog

@@ -24,4 +24,5 @@
 0.22: Tapping on step counter now disable step counting on 2v29+ firmwares
 0.23: Use filter function for better image borders if it exists (2v22)
 0.24: Only save settings once (not once per clockinfo)
-      Add .setFocus function to allow a clockinfo to be focused without faking a click on it
+      Add .setFocus function to allow a clockinfo to be focused without faking a click on it
+0.25: Add ability to filter-out installed clockinfos

apps/clock_info/metadata.json

@@ -1,7 +1,7 @@
 { "id": "clock_info",
   "name": "Clock Info Module",
   "shortName": "Clock Info",
-  "version":"0.24",
+  "version":"0.25",
   "description": "A library used by clocks to provide extra information on the clock face (Altitude, BPM, etc)",
   "icon": "app.png",
   "type": "module",

apps/clock_info/settings.js

@@ -2,11 +2,23 @@
   let settings = require("clock_info").loadSettings();
 
   function save(key, value) {
-    settings[key] = value;
+    if (key)
+      settings[key] = value;
     require('Storage').write("clock_info.json", settings);
   }
 
-  let menu ={
+  let forced = false;
+  function forceBootUpdate() {
+    if(forced) return;
+
+    const fname = "setting.json";
+    const j = require("Storage").readJSON(fname);
+    j.toggle = !j.toggle;
+    require("Storage").writeJSON(fname);
+    forced = true;
+  }
+
+  let menu = {
     '': { 'title': 'Clock Info' },
     /*LANG*/'< Back': back,
     /*LANG*/'Defocus on Lock': {
@@ -28,7 +40,52 @@
     /*LANG*/'Haptics': {
       value:  !!settings.haptics,
       onchange: x => save('haptics', x),
-    }
+    },
+    /*LANG*/'Filtering': () => {
+      let filterMenu = {
+        '': { 'title': 'Exclude clkinfos' },
+        '< Back': () => E.showMenu(menu)
+      };
+
+      const re = /\.clkinfo\.js$/;
+      require("Storage")
+        .list(re)
+        .forEach(file => {
+          const name = file.replace(re, "");
+
+          filterMenu[name] = {
+            value: !!(settings.exclude && settings.exclude[file]),
+            format: v => v ? "hide" : "show",
+            onchange: v => {
+              if (v) {
+                if (!settings.exclude)
+                  settings.exclude = {};
+                settings.exclude[file] = true;
+              } else {
+                if (settings.exclude)
+                  delete settings.exclude[file];
+              }
+              save();
+              forceBootUpdate();
+            },
+          };
+        });
+
+      let changed = false;
+      // clean up stale entries
+      Object
+        .keys(settings.exclude)
+        .filter(k => !(k.replace(re, "") in filterMenu))
+        .forEach(k => {
+          delete settings.exclude[k];
+          changed = true;
+        });
+
+      if(changed) save();
+
+      E.showMenu(filterMenu);
+    },
   };
+
   E.showMenu(menu);
 })