Changes for #69

Author: gfwilliams

js/comms.js

@@ -246,7 +246,7 @@ const Comms = {
      } */
   uploadApp : (app,options) => {
     options = options||{};
-    Progress.show({title:`Uploading ${app.name}`,sticky:true});
+    Progress.show({title:`Uploading ${Utils.formatAppName(app)}`,sticky:true});
     return AppInfo.getFiles(app, {
       fileGetter : httpGet,
       settings : SETTINGS,
@@ -317,7 +317,7 @@ const Comms = {
 
         // Start the upload
         function doUpload() {
-          Comms.showMessage(`Uploading\n${app.id}...`).
+          Comms.showMessage(`Installing\n${app.id}...`).
             then(() => Comms.write("\x10"+Comms.getProgressCmd()+"\n")).
             then(() => {
               doUploadFiles();
@@ -496,7 +496,7 @@ const Comms = {
   if options.noFinish is true, showUploadFinished isn't called (displaying the reboot message)   */
   removeApp : (app, options) => {
     options = options||{};
-    Progress.show({title:`Removing ${app.id}`,sticky:true});
+    Progress.show({title:`Removing ${Utils.formatAppName(app)}`,sticky:true});
     /* App Info now doesn't contain .files, so to erase, we need to
     read the info file ourselves. */
     return (options.noReset ? Promise.resolve() : Comms.reset()).

js/index.js

@@ -841,38 +841,30 @@ function uploadApp(app, options) {
         if (appJSON) {
           device.appsInstalled.push(appJSON);
         }
-        showToast(formatAppName(app)+ ' Uploaded!', 'success');
+        showToast(`${Utils.formatAppName(app)} Uploaded!`, 'success');
       }).catch(err => {
-        showToast("Upload of" +formatAppName(app)+" failed",  + err, 'error');
+        showToast(`Upload of ${Utils.formatAppName(app)} failed`,  + err, 'error');
       });
   }));
 }
-/** Format app name into a string like App Name (AppID)*/
-function formatAppName(app){
-  //check if id is the same as the name, in which case we can just return the name...
-  if(app.name.trim().toLowerCase()===app.id.trim().toLowerCase()){
-    return app.name;
-  }else{
-    return formatAppName(app);
-  }
-}
+
 /** Prompt user and then remove app from the device */
 function removeApp(app) {
-  return showPrompt("Delete", "Are you sure you want to delete "+formatAppName(app)+"?")
+  return showPrompt("Delete", `Are you sure you want to delete ${Utils.formatAppName(app)}?`)
     .then(() => startOperation({ name: "Remove App" }, () => getInstalledApps()
       .then(()=> Comms.removeApp(device.appsInstalled.find(a => a.id === app.id))) // a = from appid.info, app = from apps.json
       .then(()=>{
         device.appsInstalled = device.appsInstalled.filter(a=>a.id!=app.id);
-        showToast(formatAppName(app)+" removed successfully","success");
+        showToast(`${Utils.formatAppName(app)} removed successfully`,"success");
       }, err=>{
-        showToast("Removal of "+formatAppName(app)+" failed, "+err,"error");
+        showToast(`Removal of ${Utils.formatAppName(app)} failed, ${err}`,"error");
       })));
 }
 
 /** Show window for a new app and finally upload it */
 function customApp(app) {
   return handleCustomApp(app).then(() => {
-    showToast(formatAppName()+" Uploaded!", "success");
+    showToast(`${Utils.formatAppName()} Uploaded!`, "success");
     refreshMyApps();
     refreshLibrary();
   }).catch(err => {
@@ -960,13 +952,13 @@ function updateApp(app, options) {
     remove.data = AppInfo.makeDataString(data)
     return Comms.removeApp(remove, {containsFileList:true, noReset:options.noReset, noFinish:options.noFinish});
   }).then(()=>{
-    showToast("Updating "+formatAppName(app)+"...");
+    showToast(`Updating ${Utils.formatAppName(app)}...`);
     device.appsInstalled = device.appsInstalled.filter(a=>a.id!=app.id);
     return checkDependencies(app,{checkForClashes:false});
   }).then(()=>Comms.uploadApp(app,{device:device,language:LANGUAGE,noReset:options.noReset, noFinish:options.noFinish})
   ).then((appJSON) => {
     if (appJSON) device.appsInstalled.push(appJSON);
-    showToast(formatAppName(app)+" Updated!", "success");
+    showToast(`${Utils.formatAppName(app)} Updated!`, "success");
   }));
 }
 

js/utils.js

@@ -515,6 +515,17 @@ function parseRJSON(str) {
   return json;
 }
 
+/** Format app name into a string like "App Name (AppID)" */
+function formatAppName(app){
+  if (!app.name) return app.id; // just in case we don't have name (eg when removing)
+  // check if id is the same as the name, in which case we can just return the name...
+  if(app.name.trim().toLowerCase()===app.id.trim().toLowerCase()){
+    return app.name;
+  }else{
+    return `${app.name} (${app.id})`;
+  }
+}
+
 let Utils = {
   Const : Const,
   DEVICEINFO : DEVICEINFO,
@@ -534,7 +545,8 @@ let Utils = {
   versionLess : versionLess,
   debounce : debounce,
   atobSafe : atobSafe,    // version of 'window.atob' that doesn't fail on 'not correctly encoded' strings
-  parseRJSON : parseRJSON // parse relaxed JSON which Espruino's writeJSON uses for settings/etc (returns undefined on failure)
+  parseRJSON : parseRJSON, // parse relaxed JSON which Espruino's writeJSON uses for settings/etc (returns undefined on failure)
+  formatAppName : formatAppName // Format app name into a string like "App Name (AppID)"
 };
 
 if ("undefined"!=typeof module)