bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split settings file and data file into two

master
Marco H 2022-07-07 09:51:57 +02:00 committed by Marco Heiming
parent 5ef4d8be70
commit bdf67c0360
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/agpsdata/boot.js
View File

@ -1,6 +1,6 @@
(function() { (function() {
let waiting = false; let waiting = false;
let settings = require("Storage").readJSON("agpsdata.json", 1) || { let settings = require("Storage").readJSON("agpsdata.settings.json", 1) || {
enabled: true, enabled: true,
refresh: 1440 refresh: 1440
}; };

7
apps/agpsdata/lib.js
View File

@ -36,9 +36,10 @@ function CASIC_CHECKSUM(cmd) {
} }
function updateLastUpdate() { function updateLastUpdate() {
let settings = require("Storage").readJSON("agpsdata.json", 1) || {}; const file = "agpsdata.json";
settings.lastUpdate = Math.round(Date.now()); let data = require("Storage").readJSON(file, 1) || {};
require("Storage").writeJSON("agpsdata.json", settings) data.lastUpdate = Math.round(Date.now());
require("Storage").writeJSON(file, data);
} }
exports.pull = function(successCallback, failureCallback) { exports.pull = function(successCallback, failureCallback) {

3
apps/agpsdata/metadata.json
View File

@ -18,6 +18,7 @@
{"name":"agpsdata.settings.js","url":"settings.js"} {"name":"agpsdata.settings.js","url":"settings.js"}
], ],
"data": [ "data": [
{"name": "agpsdata.json"} {"name": "agpsdata.json"},
{"name": "agpsdata.settings.json"}
] ]
} }

7
apps/agpsdata/settings.js
View File

@ -1,6 +1,9 @@
(function(back) { (function(back) {
function writeSettings(key, value) { function writeSettings(key, value) {
var s = require('Storage').readJSON(FILE, true) || {}; var s = Object.assign(
require('Storage').readJSON("agpsdata.default.json", true) || {},
require('Storage').readJSON(FILE, true) || {}
);
s[key] = value; s[key] = value;
require('Storage').writeJSON(FILE, s); require('Storage').writeJSON(FILE, s);
readSettings(); readSettings();
@ -13,7 +16,7 @@
); );
} }
var FILE="agpsdata.json"; var FILE="agpsdata.settings.json";
var settings; var settings;
readSettings(); readSettings();