From 532fe0fe48a3b95545c192c1681e5acc9e6f3cbc Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Fri, 10 May 2019 14:28:09 -0400
Subject: [PATCH] convert some stuff to Promises; onunhandledrejection

---
 doc/notes.txt |  4 ++++
 index.html    |  1 +
 src/ui.ts     | 64 +++++++++++++++++++++------------------------------
 3 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/doc/notes.txt b/doc/notes.txt
index 9f90de7c..c417fb88 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -132,6 +132,7 @@ TODO:
   - allow "include graphics.asm" instead of "include project/graphics.asm"
 - chrome looks blurry on vcs
 - convert more stuff to Promises
+- target ES6
 - don't have to include bootstrap-tourist each time?
 - don't have to include firebase always?
 - Github
@@ -146,6 +147,9 @@ TODO:
   - CORS for some blobs?
   - confusing when examples load if file not found
   - don't import useless files
+  - support projects with subdirectories, file list?
+  - emulator needs reset shortcut for nes
+  - local/ files in repository?
 
 
 WEB WORKER FORMAT
diff --git a/index.html b/index.html
index 55bef9d4..570c31be 100644
--- a/index.html
+++ b/index.html
@@ -303,6 +303,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
       <div class="modal-body">
         <p>Enter the GitHub repository URL:</p>
         <p><input id="importGithubURL" size="60" placeholder="https://github.com/user/repo"></input></p>
+        <p>If the project is compatible with 8bitworkshop, it should build automatically.</p>
         <p><button type="button" class="btn btn-primary" id="importGithubButton">Import Project</button></p>
       </div>
       <div class="modal-footer">
diff --git a/src/ui.ts b/src/ui.ts
index 03e41afc..968a3452 100644
--- a/src/ui.ts
+++ b/src/ui.ts
@@ -265,15 +265,11 @@ function reloadProject(id:string) {
   gotoNewLocation();
 }
 
-function getSkeletonFile(fileid:string, callback) {
+function getSkeletonFile(fileid:string) : Promise<string> {
   var ext = platform.getToolForFilename(fileid);
   // TODO: .mame
-  $.get( "presets/"+getBasePlatform(platform_id)+"/skeleton."+ext, function( text ) {
-    callback(null, text);
-  }, 'text')
-  .fail(() => {
+  return $.get( "presets/"+getBasePlatform(platform_id)+"/skeleton."+ext, 'text').catch((e) => {
     alert("Could not load skeleton for " + platform_id + "/" + ext + "; using blank file");
-    callback(null, '\n');
   });
 }
 
@@ -294,15 +290,10 @@ function _createNewFile(e) {
       filename += platform.getDefaultExtension();
     }
     var path = "local/" + filename;
-    getSkeletonFile(path, function(err, result) {
-      if (result) {
-        store.setItem(path, result, function(err, result) {
-          if (err)
-            alert(err+"");
-          if (result != null)
-            reloadProject("local/" + filename);
-        });
-      }
+    getSkeletonFile(path).then( (result) => {
+      return store.setItem(path, result || "\n");
+    }).then(() => {
+      reloadProject("local/" + filename);
     });
   }
   return true;
@@ -639,9 +630,9 @@ function _deleteFile(e) {
   var wnd = projectWindows.getActive();
   if (wnd && wnd.getPath) {
     var fn = projectWindows.getActiveID();
-    if (fn.startsWith("local/") || fn.startsWith("shared/")) {
+    if (repo_id || fn.startsWith("local/") || fn.startsWith("shared/")) {
       if (confirm("Delete '" + fn + "'?")) {
-        store.removeItem(fn, () => {
+        store.removeItem(fn).then( () => {
           // if we delete what is selected
           if (qs['file'] == fn) {
             unsetLastPreset();
@@ -668,14 +659,14 @@ function _renameFile(e) {
     var data = current_project.getFile(wnd.getPath());
     if (newfn && data) {
       if (!checkEnteredFilename(newfn)) return;
-      store.removeItem(fn, () => {
-        store.setItem(newfn, data, () => {
-          alert("Renamed " + fn + " to " + newfn);
-          updateSelector();
-          if (fn == current_project.mainPath) {
-            reloadProject(newfn);
-          }
-        });
+      store.removeItem(fn).then( () => {
+        return store.setItem(newfn, data);
+      }).then( () => {
+        alert("Renamed " + fn + " to " + newfn);
+        updateSelector();
+        if (fn == current_project.mainPath) {
+          reloadProject(newfn);
+        }
       });
     }
   } else {
@@ -721,21 +712,17 @@ function _downloadProjectZipFile(e) {
 function _downloadAllFilesZipFile(e) {
   loadScript('lib/jszip.min.js', () => {
     var zip = new JSZip();
-    var count = 0;
     store.keys( (err, keys : string[]) => {
-      if (err) throw err;
-      keys.forEach((path) => {
-        // TODO: handle binary files
-        store.getItem(path, (err, text) => {
+      return Promise.all(keys.map( (path) => {
+        return store.getItem(path).then( (text) => {
           if (text) {
             zip.file(path, text);
           }
-          if (++count == keys.length) {
-            zip.generateAsync({type:"blob"}).then( (content) => {
-              saveAs(content, platform_id + "-all.zip");
-            });
-          }
         });
+      })).then(() => {
+        return zip.generateAsync({type:"blob"});
+      }).then( (content) => {
+        return saveAs(content, platform_id + "-all.zip");
       });
     });
   });
@@ -743,7 +730,7 @@ function _downloadAllFilesZipFile(e) {
 
 function populateExamples(sel) {
   // make sure to use callback so it follows other sections
-  store.length(function(err, len) {
+  store.length().then( (len) => {
     sel.append($("<option />").text("--------- Examples ---------").attr('disabled','true'));
     for (var i=0; i<PRESETS.length; i++) {
       var preset = PRESETS[i];
@@ -1484,7 +1471,7 @@ var qs = (function (a : string[]) {
 
 // catch errors
 function installErrorHandler() {
-  if (typeof window.onerror == "object") {
+    if (typeof window.onerror == "object") {
       window.onerror = function (msgevent, url, line, col, error) {
         var msgstr = msgevent+"";
         console.log(msgevent, url, line, col, error);
@@ -1499,7 +1486,8 @@ function installErrorHandler() {
         }
         _pause();
       };
-  }
+      window.onunhandledrejection = window.onerror;
+    }
 }
 
 function uninstallErrorHandler() {