diff --git a/scripts/download-packager.js b/scripts/download-packager.js index 9806864a..2ba32dee 100644 --- 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 index ca1af2f2..fd0e53a1 100644 --- 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" } \ No newline at end of file diff --git a/src-main/index.js b/src-main/index.js index 8fd5d2ed..7e54801b 100644 --- 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 index 022e9c68..2a15b104 100644 --- 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 index 58c1c256..d62aef4d 100644 --- 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 index c7dca2a3..f4abc4cf 100644 --- 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 index 64a2a9e8..8d30b146 100644 --- a/src-renderer-webpack/editor/gui/migrate-helper.html +++ b/src-renderer-webpack/editor/gui/migrate-helper.html @@ -5,13 +5,7 @@ diff --git a/src-renderer/migrate/check.svg b/src-renderer/migrate/check.svg new file mode 100644 index 00000000..0de2749f --- /dev/null +++ b/src-renderer/migrate/check.svg @@ -0,0 +1,47 @@ + + + + + + + + + + diff --git a/src-renderer/migrate/error.svg b/src-renderer/migrate/error.svg new file mode 100644 index 00000000..4b648ac1 --- /dev/null +++ b/src-renderer/migrate/error.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + diff --git a/src-renderer/migrate/loading.svg b/src-renderer/migrate/loading.svg new file mode 100644 index 00000000..b8ef3239 --- /dev/null +++ b/src-renderer/migrate/loading.svg @@ -0,0 +1,46 @@ + + + + + + + + + + diff --git a/src-renderer/migrate/migrate.html b/src-renderer/migrate/migrate.html index a26c385d..bb98ff14 100644 --- a/src-renderer/migrate/migrate.html +++ b/src-renderer/migrate/migrate.html @@ -3,11 +3,71 @@ -

Migrating...

+

Finishing updates...

+

This is a one-time process that may take a few moments.

+
+ diff --git a/src-renderer/packager/migrate-helper.html b/src-renderer/packager/migrate-helper.html index 96f5d2ed..25292f20 100644 --- a/src-renderer/packager/migrate-helper.html +++ b/src-renderer/packager/migrate-helper.html @@ -5,42 +5,40 @@