use eslint to fix indentation of app loader js
parent
765be3ef40
commit
2fd2caaacc
|
|
@ -0,0 +1 @@
|
||||||
|
espruinotools.js
|
||||||
|
|
@ -4,7 +4,13 @@
|
||||||
"sourceType": "script"
|
"sourceType": "script"
|
||||||
},
|
},
|
||||||
"rules": {
|
"rules": {
|
||||||
|
"indent": [
|
||||||
|
"warn",
|
||||||
|
2,
|
||||||
|
{
|
||||||
|
"SwitchCase": 1
|
||||||
|
}
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"env": {
|
"env": {
|
||||||
"browser": true,
|
"browser": true,
|
||||||
|
|
|
||||||
44
js/comms.js
44
js/comms.js
|
|
@ -2,13 +2,13 @@ Puck.debug=3;
|
||||||
|
|
||||||
// FIXME: use UART lib so that we handle errors properly
|
// FIXME: use UART lib so that we handle errors properly
|
||||||
var Comms = {
|
var Comms = {
|
||||||
reset : (opt) => new Promise((resolve,reject) => {
|
reset : (opt) => new Promise((resolve,reject) => {
|
||||||
Puck.write(`\x03\x10reset(${opt=="wipe"?"1":""});\n`, (result) => {
|
Puck.write(`\x03\x10reset(${opt=="wipe"?"1":""});\n`, (result) => {
|
||||||
if (result===null) return reject("Connection failed");
|
if (result===null) return reject("Connection failed");
|
||||||
setTimeout(resolve,500);
|
setTimeout(resolve,500);
|
||||||
});
|
});
|
||||||
}),
|
}),
|
||||||
uploadApp : (app,skipReset) => { // expects an apps.json structure (i.e. with `storage`)
|
uploadApp : (app,skipReset) => { // expects an apps.json structure (i.e. with `storage`)
|
||||||
Progress.show({title:`Uploading ${app.name}`,sticky:true});
|
Progress.show({title:`Uploading ${app.name}`,sticky:true});
|
||||||
return AppInfo.getFiles(app, {
|
return AppInfo.getFiles(app, {
|
||||||
fileGetter : httpGet,
|
fileGetter : httpGet,
|
||||||
|
|
@ -75,8 +75,8 @@ uploadApp : (app,skipReset) => { // expects an apps.json structure (i.e. with `s
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
getInstalledApps : () => {
|
getInstalledApps : () => {
|
||||||
Progress.show({title:`Getting app list...`,sticky:true});
|
Progress.show({title:`Getting app list...`,sticky:true});
|
||||||
return new Promise((resolve,reject) => {
|
return new Promise((resolve,reject) => {
|
||||||
Puck.write("\x03",(result) => {
|
Puck.write("\x03",(result) => {
|
||||||
|
|
@ -101,8 +101,8 @@ getInstalledApps : () => {
|
||||||
}, true /* callback on newline */);
|
}, true /* callback on newline */);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
removeApp : app => { // expects an appid.info structure (i.e. with `files`)
|
removeApp : app => { // expects an appid.info structure (i.e. with `files`)
|
||||||
if (!app.files && !app.data) return Promise.resolve(); // nothing to erase
|
if (!app.files && !app.data) return Promise.resolve(); // nothing to erase
|
||||||
Progress.show({title:`Removing ${app.name}`,sticky:true});
|
Progress.show({title:`Removing ${app.name}`,sticky:true});
|
||||||
let cmds = '\x10const s=require("Storage");\n';
|
let cmds = '\x10const s=require("Storage");\n';
|
||||||
|
|
@ -138,8 +138,8 @@ removeApp : app => { // expects an appid.info structure (i.e. with `files`)
|
||||||
Progress.hide({sticky:true});
|
Progress.hide({sticky:true});
|
||||||
return Promise.reject(reason);
|
return Promise.reject(reason);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
removeAllApps : () => {
|
removeAllApps : () => {
|
||||||
Progress.show({title:"Removing all apps",progess:"animate",sticky:true});
|
Progress.show({title:"Removing all apps",progess:"animate",sticky:true});
|
||||||
return new Promise((resolve,reject) => {
|
return new Promise((resolve,reject) => {
|
||||||
// Use write with newline here so we wait for it to finish
|
// Use write with newline here so we wait for it to finish
|
||||||
|
|
@ -149,8 +149,8 @@ removeAllApps : () => {
|
||||||
resolve();
|
resolve();
|
||||||
}, true /* wait for newline */);
|
}, true /* wait for newline */);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
setTime : () => {
|
setTime : () => {
|
||||||
return new Promise((resolve,reject) => {
|
return new Promise((resolve,reject) => {
|
||||||
var d = new Date();
|
var d = new Date();
|
||||||
var tz = d.getTimezoneOffset()/-60
|
var tz = d.getTimezoneOffset()/-60
|
||||||
|
|
@ -163,15 +163,15 @@ setTime : () => {
|
||||||
resolve();
|
resolve();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
disconnectDevice: () => {
|
disconnectDevice: () => {
|
||||||
var connection = Puck.getConnection();
|
var connection = Puck.getConnection();
|
||||||
|
|
||||||
if (!connection) return;
|
if (!connection) return;
|
||||||
|
|
||||||
connection.close();
|
connection.close();
|
||||||
},
|
},
|
||||||
watchConnectionChange : cb => {
|
watchConnectionChange : cb => {
|
||||||
var connected = Puck.isConnected();
|
var connected = Puck.isConnected();
|
||||||
|
|
||||||
//TODO Switch to an event listener when Puck will support it
|
//TODO Switch to an event listener when Puck will support it
|
||||||
|
|
@ -186,8 +186,8 @@ watchConnectionChange : cb => {
|
||||||
return () => {
|
return () => {
|
||||||
clearInterval(interval);
|
clearInterval(interval);
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
listFiles : () => {
|
listFiles : () => {
|
||||||
return new Promise((resolve,reject) => {
|
return new Promise((resolve,reject) => {
|
||||||
Puck.write("\x03",(result) => {
|
Puck.write("\x03",(result) => {
|
||||||
if (result===null) return reject("");
|
if (result===null) return reject("");
|
||||||
|
|
@ -200,8 +200,8 @@ listFiles : () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
readFile : (file) => {
|
readFile : (file) => {
|
||||||
return new Promise((resolve,reject) => {
|
return new Promise((resolve,reject) => {
|
||||||
//encode name to avoid serialization issue due to octal sequence
|
//encode name to avoid serialization issue due to octal sequence
|
||||||
const name = encodeURIComponent(file);
|
const name = encodeURIComponent(file);
|
||||||
|
|
@ -216,8 +216,8 @@ readFile : (file) => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
readStorageFile : (filename) => { // StorageFiles are different to normal storage entries
|
readStorageFile : (filename) => { // StorageFiles are different to normal storage entries
|
||||||
return new Promise((resolve,reject) => {
|
return new Promise((resolve,reject) => {
|
||||||
// Use "\xFF" to signal end of file (can't occur in files anyway)
|
// Use "\xFF" to signal end of file (can't occur in files anyway)
|
||||||
var fileContent = "";
|
var fileContent = "";
|
||||||
|
|
@ -261,5 +261,5 @@ readStorageFile : (filename) => { // StorageFiles are different to normal storag
|
||||||
console.log(`StorageFile read started...`);
|
console.log(`StorageFile read started...`);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue