get a lot more to work

TurboWarp · Aug 19, 2023 · 9b9c467 · 9b9c467
1 parent 2d7bf89
commit 9b9c467
Show file tree

Hide file tree

Showing 12 changed files with 449 additions and 199 deletions.
diff --git a/scripts/download-packager.js b/scripts/download-packager.js
@@ -4,7 +4,7 @@ const pathUtil = require('path');
 const {fetch} = require('./lib');
 const packagerInfo = require('./packager.json');
 
-const path = pathUtil.join(__dirname, '../src-packager/packager/standalone.html');
+const path = pathUtil.join(__dirname, '../src-renderer/packager/standalone.html');
 const sha256 = (buffer) => crypto.createHash('sha256').update(buffer).digest('hex');
 
 const isAlreadyDownloaded = () => {

diff --git a/scripts/packager.json b/scripts/packager.json
@@ -1,4 +1,4 @@
 {
-  "src": "https://github.com/TurboWarp/packager/releases/download/v1.8.0/turbowarp-packager-standalone-1.8.0.html",
-  "sha256": "aea16dcafdff7a3fea9f247e74d0df7971f1182544993c48d6456ed89d45a372"
+  "src": "https://github.com/TurboWarp/packager/releases/download/v1.9.0/turbowarp-packager-standalone-1.9.0.html",
+  "sha256": "f84439fe27f4f892efe6a4b8cc19738fee2d10aaabc5c077fec1847beb41890d"
 }
diff --git a/src-main/index.js b/src-main/index.js
@@ -73,6 +73,12 @@ app.on('session-created', (session) => {
     }
     window.onHeadersReceived(details, callback);
   });
+
+  session.on('will-download', (event, item, webContents) => {
+    item.setSaveDialogOptions({
+      title: item.getFilename()
+    });
+  });
 });
 
 app.on('web-contents-created', (event, webContents) => {

diff --git a/src-main/migrate.js b/src-main/migrate.js
@@ -3,14 +3,14 @@ const settings = require('./settings');
 const MigrateWindow = require('./windows/migrate');
 
 const migrate = async () => {
-  if (settings.migrated) {
+  if (settings.dataVersion === MigrateWindow.LATEST_VERSION) {
     return;
   }
 
-  // Detect fresh installs
+  // Don't need to migrate anything on a fresh install
   const cacheSize = await session.defaultSession.getCacheSize();
   if (cacheSize === 0) {
-    settings.migrated = true;
+    settings.dataVersion = MigrateWindow.LATEST_VERSION;
     await settings.save();
     return;
   }

diff --git a/src-main/settings.js b/src-main/settings.js
@@ -44,11 +44,11 @@ class Settings {
     await writeFileAtomic(PATH, JSON.stringify(serialized, null, 2));
   }
 
-  get migrated () {
-    return !!this.data.migrated;
+  get dataVersion () {
+    return this.data.dataVersion || 0;
   }
-  set migrated (migrated) {
-    this.data.migrated = true;
+  set dataVersion (dataVersion) {
+    this.data.dataVersion = dataVersion;
   }
 
   get updateChecker () {

diff --git a/src-main/windows/migrate.js b/src-main/windows/migrate.js
@@ -4,6 +4,8 @@ const {translate} = require('../l10n');
 const settings = require('../settings');
 
 class MigrateWindow extends BaseWindow {
+  static LATEST_VERSION = 2;
+
   constructor () {
     super();
 
@@ -24,7 +26,7 @@ class MigrateWindow extends BaseWindow {
     });
 
     ipc.handle('done', async () => {
-      settings.migrated = true;
+      settings.dataVersion = MigrateWindow.LATEST_VERSION;
       await settings.save();
       this.resolveCallback();
       this.window.close();
@@ -37,7 +39,7 @@ class MigrateWindow extends BaseWindow {
   }
 
   getDimensions () {
-    return [300, 300];
+    return [400, 400];
   }
 
   getPreload () {

diff --git a/src-renderer-webpack/editor/gui/migrate-helper.html b/src-renderer-webpack/editor/gui/migrate-helper.html
@@ -5,13 +5,7 @@
   </head>
   <body>
     <script>
-      window.addEventListener('message', async (e) => {
-        if (e.origin !== 'file://') {
-          return;
-        }
-
-        const data = e.data;
-
+      const importData = async (data) => {
         if (data.theme) {
           localStorage.setItem('tw:theme', data.theme);
         }
@@ -20,17 +14,16 @@
           localStorage.setItem('tw:addons', data.addons);
         }
 
-        if (data.backpack) {
+        if (data.backpack && data.backpack.length) {
           const items = data.backpack;
           const DATABASE_NAME = 'TW_Backpack';
           const DATABASE_VERSION = 1;
           const STORE_NAME = 'backpack';
 
-          await new Promise((resolve) => {
+          await new Promise((resolve, reject) => {
             const openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION);
-
             openRequest.onerror = () => {
-              // TODO
+              reject(new Error(`Error opening DB: ${openRequest.error}`));
             };
 
             openRequest.onupgradeneeded = (e) => {
@@ -44,12 +37,11 @@
             openRequest.onsuccess = () => {
               const db = openRequest.result;
               const transaction = db.transaction([STORE_NAME], 'readwrite');
-              const store = transaction.objectStore(STORE_NAME);
-
               transaction.onerror = () => {
-                // TODO
+                reject(new Error(`Transaction error: ${transaction.error}`));
               };
 
+              const store = transaction.objectStore(STORE_NAME);
               const putNext = () => {
                 const request = store.put(items.shift());
                 request.onsuccess = () => {
@@ -60,16 +52,32 @@
                   }
                 };
               };
-
               putNext();
             };
           });
         }
+      };
+
+      const PARENT_ORIGIN = 'file://';
+
+      window.addEventListener('message', async (e) => {
+        if (e.origin !== PARENT_ORIGIN) {
+          return;
+        }
 
-        window.parent.postMessage('finish-import', 'file://');
+        try {
+          await importData(e.data);
+          e.source.postMessage({ type: 'done' }, PARENT_ORIGIN);
+        } catch (error) {
+          console.error(error);
+          e.source.postMessage({
+            type: 'error',
+            error: `${error}`
+          }, PARENT_ORIGIN);
+        }
       });
 
-      window.parent.postMessage('start-import', 'file://');
+      window.parent.postMessage({ type: 'start' }, PARENT_ORIGIN);
     </script>
   </body>
 </html>
diff --git a/src-renderer/migrate/check.svg b/src-renderer/migrate/check.svg
diff --git a/src-renderer/migrate/error.svg b/src-renderer/migrate/error.svg
diff --git a/src-renderer/migrate/loading.svg b/src-renderer/migrate/loading.svg