Merge pull request #97 from mtgto/updater_dialog

Show update notify and dialog + Linux icons

electron-builder.yml

@@ -28,3 +28,4 @@ linux:
   target:
     - AppImage
   category: Utility
+  icon: build/icon.icns

src/main/index.ts

@@ -1,10 +1,11 @@
 import electron from "electron";
+import path from "path";
 import { updater } from "./updater";
 import { initMenu } from "./menu";
 import logger from "./logger";
 
 const app = electron.app;
-let mainWindow: electron.BrowserWindow | null;
+export let mainWindow: electron.BrowserWindow | null;
 
 process.on("uncaughtException", err => {
   logger.error(err);
@@ -20,6 +21,7 @@ async function createWindow() {
     width: 1280,
     height: 780,
     title: "Bdash",
+    icon: path.join(__dirname, "..", "icon.png"),
     webPreferences: {
       nodeIntegration: true
     }

src/main/updater.ts

@@ -1,6 +1,8 @@
-import { autoUpdater, AppUpdater, UpdateCheckResult } from "electron-updater";
+import { dialog } from "electron";
+import { autoUpdater, AppUpdater, UpdateCheckResult, UpdateInfo } from "electron-updater";
 import isDev from "electron-is-dev";
 import logger from "./logger";
+import { mainWindow } from ".";
 
 autoUpdater.logger = logger;
 
@@ -17,14 +19,27 @@ export class Updater {
 
   constructor(autoUpdater: AppUpdater) {
     this.autoUpdater = autoUpdater;
-    this.autoUpdater.on("update-downloaded", () => {
+    this.autoUpdater.on("update-downloaded", (info: UpdateInfo) => {
       this.state = UpdateState.UpdateDownloaded;
+      if (mainWindow) {
+        dialog
+          .showMessageBox(mainWindow, {
+            type: "info",
+            buttons: ["Restart", "Later"],
+            title: "Bdash Update",
+            message: process.platform === "win32" ? (info.releaseNotes as string) : info.releaseName!,
+            detail: "A new version has been downloaded. Restart the application to apply the updates."
+          })
+          .then(returnValue => {
+            if (returnValue.response === 0) autoUpdater.quitAndInstall();
+          });
+      }
     });
   }
 
-  async check(): Promise<UpdateCheckResult | void> {
-    if (isDev) return Promise.resolve();
-    return this.autoUpdater.checkForUpdates();
+  async check(): Promise<UpdateCheckResult | null> {
+    if (isDev) return Promise.resolve(null);
+    return this.autoUpdater.checkForUpdatesAndNotify();
   }
 
   async watch(): Promise<void> {

webpack.config.js

@@ -15,6 +15,7 @@ module.exports = (env, argv) => {
     "static/index.js",
     "static/RictyDiminished-Regular.ttf",
     "static/scatter.svg",
+    "build/icon.png",
     "package.json",
     "yarn.lock"
   ];