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

Fixed bin/firmwaremaker and bin/apploader CLI to handle binary file uploads correctly

master
Gordon Williams 2020-08-25 11:46:33 +01:00
parent badc82f4fc
commit f417f8b1c9
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -25,3 +25,4 @@ Changed for individual apps are listed in `apps/appname/ChangeLog`
* Fixed animated progress bar on app removal * Fixed animated progress bar on app removal
* Added ability to specify dependencies (used for `notify` at the moment) * Added ability to specify dependencies (used for `notify` at the moment)
* Fixed Promise-based bug in removeApp * Fixed Promise-based bug in removeApp
* Fixed bin/firmwaremaker and bin/apploader CLI to handle binary file uploads correctly

8
bin/apploader.js
View File

@ -13,8 +13,8 @@ for Noble.
var SETTINGS = { var SETTINGS = {
pretokenise : true pretokenise : true
}; };
var Utils = require("../js/utils.js"); var Utils = require("../core/js/utils.js");
var AppInfo = require("../js/appinfo.js"); var AppInfo = require("../core/js/appinfo.js");
var noble; var noble;
try { try {
noble = require('@abandonware/noble'); noble = require('@abandonware/noble');
@ -93,7 +93,7 @@ function cmdInstallApp(appId, deviceAddress) {
return AppInfo.getFiles(app, { return AppInfo.getFiles(app, {
fileGetter:function(url) { fileGetter:function(url) {
console.log(__dirname+"/"+url); console.log(__dirname+"/"+url);
return Promise.resolve(require("fs").readFileSync(__dirname+"/../"+url).toString()); return Promise.resolve(require("fs").readFileSync(__dirname+"/../"+url).toString("binary"));
}, settings : SETTINGS}).then(files => { }, settings : SETTINGS}).then(files => {
//console.log(files); //console.log(files);
var command = files.map(f=>f.cmd).join("\n")+"\n"; var command = files.map(f=>f.cmd).join("\n")+"\n";
@ -223,7 +223,7 @@ function bangleSend(command, deviceAddress) {
if (!data.length) return callback(); if (!data.length) return callback();
var d = data.substr(0,20); var d = data.substr(0,20);
data = data.substr(20); data = data.substr(20);
var buf = new Buffer(d.length); var buf = new Buffer.alloc(d.length);
progress++; progress++;
if (progress>=10) { if (progress>=10) {
log("Writing "+amt+"/"+total); log("Writing "+amt+"/"+total);

6
bin/firmwaremaker.js
View File

@ -19,7 +19,7 @@ var APPS = [ // IDs of apps to install
var MINIFY = true; var MINIFY = true;
var fs = require("fs"); var fs = require("fs");
var AppInfo = require(ROOTDIR+"/js/appinfo.js"); var AppInfo = require(ROOTDIR+"/core/js/appinfo.js");
var appjson = JSON.parse(fs.readFileSync(APPJSON).toString()); var appjson = JSON.parse(fs.readFileSync(APPJSON).toString());
var appfiles = []; var appfiles = [];
@ -39,14 +39,14 @@ function fileGetter(url) {
if (url.endsWith(".json")) { if (url.endsWith(".json")) {
var f = url.slice(0,-5); var f = url.slice(0,-5);
console.log("MINIFYING JSON "+f); console.log("MINIFYING JSON "+f);
var j = eval("("+fs.readFileSync(url).toString()+")"); var j = eval("("+fs.readFileSync(url).toString("binary")+")");
var code = JSON.stringify(j); var code = JSON.stringify(j);
//console.log(code); //console.log(code);
url = f+".min.json"; url = f+".min.json";
fs.writeFileSync(url, code); fs.writeFileSync(url, code);
} }
} }
return Promise.resolve(fs.readFileSync(url).toString()); return Promise.resolve(fs.readFileSync(url).toString("binary"));
} }
Promise.all(APPS.map(appid => { Promise.all(APPS.map(appid => {