FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

popcon: fixes for readJSON() changes

pull/2821/head
Rob Pilling 2023-05-21 22:38:42 +01:00
parent a42e00dc20
commit 9c74797752
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/popconlaunch/boot.js
View File

@ -65,7 +65,7 @@
require("Storage").readJSON = (function (fname, skipExceptions) {
var _a;
var j = oldRead(fname, skipExceptions);
if (/\.info$/.test(fname)) {
if (j && /\.info$/.test(fname)) {
var cache_1 = ensureCache();
var so = void 0;
if (j.src && (so = (_a = cache_1[j.src]) === null || _a === void 0 ? void 0 : _a.sortorder) != null)

10
apps/popconlaunch/boot.ts
View File

@ -15,7 +15,7 @@ let cache: undefined | Cache;
const ensureCache = (): NonNull<typeof cache> => {
if(!cache){
cache = oldRead("popcon.cache.json", true);
cache = oldRead("popcon.cache.json", true) as Cache | undefined;
if(!cache)
cache = {};
}
@ -38,7 +38,7 @@ const saveCache = (cache: Cache, orderChanged: boolean) => {
require("Storage").writeJSON("popcon.cache.json", cache);
if(orderChanged){
// ensure launchers reload their caches:
const info: AppInfo & { cacheBuster?: boolean } = oldRead("popconlaunch.info", true);
const info = (oldRead("popconlaunch.info", true) as undefined | AppInfo & { cacheBuster?: boolean }) || {};
info.cacheBuster = !info.cacheBuster;
require("Storage").writeJSON("popconlaunch.info", info);
}
@ -80,10 +80,10 @@ const sortCache = () => {
};
require("Storage").readJSON = ((fname, skipExceptions) => {
const j: AppInfo = oldRead(fname, skipExceptions);
// ^ technically only AppInfo if we're "*.info"
const j = oldRead(fname, skipExceptions) as AppInfo | undefined;
// technically only AppInfo if we're "*.info" ^
if(/\.info$/.test(fname)){
if(j && /\.info$/.test(fname)){
const cache = ensureCache();
let so;