Merge pull request #440 from jjavierdguezas/feature/windows-portable-…

…version Add windows portable version to electron-builder config
responsively-org · Aug 31, 2020 · ec18834 · ec18834
2 parents 4a434a0 + 0bc8d0e
commit ec18834
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 1 deletion.
diff --git a/desktop-app/app/app-updater.js b/desktop-app/app/app-updater.js
@@ -1,12 +1,15 @@
 import {autoUpdater} from 'electron-updater';
 import log from 'electron-log';
+import {pkg} from './utils/generalUtils';
+import {shell, Notification} from 'electron';
 
 const {EventEmitter} = require('events');
 
 const AppUpdaterStatus = {
   Idle: 'idle',
   Checking: 'checking',
   NoUpdate: 'noUpdate',
+  NewVersion: 'newVersion',
   Downloading: 'downloading',
   Downloaded: 'downloaded',
 };
@@ -18,10 +21,13 @@ class AppUpdater extends EventEmitter {
 
   timerId = null;
 
+  isPortableVersion = process.env.PORTABLE_EXECUTABLE_DIR != null && process.env.PORTABLE_EXECUTABLE_DIR.length !== 0;
+
   constructor() {
     super();
     log.transports.file.level = 'info';
     autoUpdater.logger = log;
+    autoUpdater.autoDownload = !this.isPortableVersion;
     this.status = AppUpdaterStatus.Idle;
 
     autoUpdater.on('checking-for-update', () =>
@@ -44,7 +50,27 @@ class AppUpdater extends EventEmitter {
 
   checkForUpdatesAndNotify() {
     if (this.status === AppUpdaterStatus.Idle)
+    {
+      if (this.isPortableVersion) {
+        return autoUpdater.checkForUpdates().then(r => {
+          if (r?.updateInfo?.version != null && r.updateInfo.version !== pkg.version) {
+            this.handleStatusChange(AppUpdaterStatus.NewVersion, true);
+            if (Notification.isSupported()) {
+              const notif = new Notification({
+                title: `New version ${r.updateInfo.version} available`,
+                body: 'You have an outdated version of Responsively. Click here to download the latest version'
+              });
+              notif.on('click', () => {
+                shell.openExternal('https://github.com/responsively-org/responsively-app/releases/latest');
+              });
+              notif.show();
+            }
+          }
+          return r;
+        });
+      }
       return autoUpdater.checkForUpdatesAndNotify();
+    }
   }
 
   handleStatusChange(nextStatus: string, backToIdle: boolean) {

diff --git a/desktop-app/app/components/StatusBar/index.js b/desktop-app/app/components/StatusBar/index.js
@@ -38,6 +38,9 @@ const AppUpdaterStatusInfoSection = () => {
     case 'downloaded':
       label = 'Update Info: Update Downloaded';
       break;
+    case 'newVersion':
+      label = 'Update Info: New version available!';
+      break;
     default:
       label = null;
       break;

diff --git a/desktop-app/app/menu.js b/desktop-app/app/menu.js
@@ -257,6 +257,10 @@ export default class MenuBuilder {
         label = 'Downloading Update...';
         enabled = false;
         break;
+      case AppUpdaterStatus.NewVersion:
+        label = 'New version available';
+        enabled = false;
+        break;
       case AppUpdaterStatus.Downloaded:
         label = 'Update Downloaded';
         enabled = false;

diff --git a/desktop-app/package.json b/desktop-app/package.json
@@ -124,7 +124,8 @@
     },
     "win": {
       "target": [
-        "nsis"
+        "nsis",
+        "portable"
       ],
       "fileAssociations": [
         {