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

more app.json fixes, remove warning about settings as it seems nobody cares

pull/1047/head
Gordon Williams 2021-12-09 17:16:55 +00:00
parent cc79881719
commit a45f7506ff
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps.json
View File

@ -4095,7 +4095,7 @@
{"name":"carcrazy.img","url":"app-icon.js","evaluate":true}, {"name":"carcrazy.img","url":"app-icon.js","evaluate":true},
{"name":"carcrazy.settings.js","url":"settings.js"} {"name":"carcrazy.settings.js","url":"settings.js"}
], ],
"data": [{"name":"app.json"}] "data": [{"name":"CarCrazy.csv"}]
}, },
{ {
"id": "shortcuts", "id": "shortcuts",
@ -4537,7 +4537,7 @@
{"name":"schoolCalendar.img","url":"app-icon.js","evaluate":true} {"name":"schoolCalendar.img","url":"app-icon.js","evaluate":true}
], ],
"data": [ "data": [
{"name":"app.json"} {"name":"calendarItems.csv"}
] ]
}, },
{ "id": "timecal", { "id": "timecal",

4
bin/sanitycheck.js
View File

@ -207,10 +207,10 @@ apps.forEach((app,appIdx) => {
} }
}); });
// prefer "appid.json" over "appid.settings.json" (TODO: change to ERROR once all apps comply?) // prefer "appid.json" over "appid.settings.json" (TODO: change to ERROR once all apps comply?)
if (dataNames.includes(app.id+".settings.json") && !dataNames.includes(app.id+".json")) /* if (dataNames.includes(app.id+".settings.json") && !dataNames.includes(app.id+".json"))
WARN(`App ${app.id} uses data file ${app.id+'.settings.json'} instead of ${app.id+'.json'}`) WARN(`App ${app.id} uses data file ${app.id+'.settings.json'} instead of ${app.id+'.json'}`)
else if (dataNames.includes(app.id+".settings.json")) else if (dataNames.includes(app.id+".settings.json"))
WARN(`App ${app.id} uses data file ${app.id+'.settings.json'}`) WARN(`App ${app.id} uses data file ${app.id+'.settings.json'}`)*/
// settings files should be listed under data, not storage (TODO: change to ERROR once all apps comply?) // settings files should be listed under data, not storage (TODO: change to ERROR once all apps comply?)
if (fileNames.includes(app.id+".settings.json")) if (fileNames.includes(app.id+".settings.json"))
WARN(`App ${app.id} uses storage file ${app.id+'.settings.json'} instead of data file`) WARN(`App ${app.id} uses storage file ${app.id+'.settings.json'} instead of data file`)