Merge pull request #305 from Kyusung4698/develop

0.6.2 (2020-03-13)

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.6.2 (2020-03-13)
+
+- add periodic version check 
+- remove version popup
+- fix auto update not working
+
 ## 0.6.1 (2020-03-13)
 
 - add allow user to change install path (#296, #300)

electron-builder.json

@@ -22,7 +22,8 @@
         "target": [
             "nsis",
             "portable"
-        ]
+        ],
+        "publisherName": ["Nicklas Ronge"]
     },
     "linux": {
         "icon": "dist/favicon.png",

main.ts

@@ -1,5 +1,6 @@
 import AutoLaunch from 'auto-launch';
 import { app, BrowserWindow, Display, ipcMain, Menu, MenuItem, MenuItemConstructorOptions, screen, Tray } from 'electron';
+import * as log from 'electron-log';
 import { autoUpdater } from 'electron-updater';
 import * as path from 'path';
 import * as robot from 'robotjs';
@@ -15,6 +16,11 @@ app.allowRendererProcessReuse = true;
 app.commandLine.appendSwitch('high-dpi-support', 'true');
 app.commandLine.appendSwitch('force-device-scale-factor', '1');
 
+log.transports.file.level = 'info';
+log.info('App starting...');
+
+autoUpdater.logger = log;
+
 const args = process.argv.slice(1),
     serve = args.some(val => val === '--serve');
 
@@ -25,6 +31,7 @@ const launch = new AutoLaunch({
 let win: BrowserWindow = null;
 let tray: Tray = null;
 let menu: Menu = null;
+let downloadItem: MenuItem = null;
 
 const childs: {
     [key: string]: BrowserWindow
@@ -109,15 +116,17 @@ autoUpdater.on('update-available', () => {
         title: 'New update available',
         content: 'A new update is available. Will be automatically downloaded unless otherwise specified.',
     });
-    const item = new MenuItem({
-        label: 'Download Update',
-        type: 'normal',
-        click: () => {
-            autoUpdater.downloadUpdate();
-            item.enabled = false;
-        }
-    });
-    menu?.insert(2, item);
+    if (!downloadItem) {
+        downloadItem = new MenuItem({
+            label: 'Download Update',
+            type: 'normal',
+            click: () => {
+                autoUpdater.downloadUpdate();
+                downloadItem.enabled = false;
+            }
+        });
+        menu?.insert(2, downloadItem);
+    }
 });
 
 autoUpdater.on('update-downloaded', () => {
@@ -131,7 +140,10 @@ autoUpdater.on('update-downloaded', () => {
 
 ipcMain.on('app-download-init', (event, autoDownload) => {
     autoUpdater.autoDownload = autoDownload;
-    autoUpdater.checkForUpdatesAndNotify();
+    autoUpdater.checkForUpdates();
+    setInterval(() => {
+        autoUpdater.checkForUpdates();
+    }, 1000 * 60 * 5);
     event.returnValue = true;
 });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "poe-overlay",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "private": true,
   "description": "A Overlay for Path of Exile. Built with Electron and Angular.",
   "main": "main.js",
@@ -78,6 +78,7 @@
     "@swimlane/ngx-charts": "^13.0.2",
     "active-win": "git+https://github.com/Kyusung4698/active-win.git#f2292727f7e979d9fb5c6919e3742bf5d6140014",
     "auto-launch": "^5.0.5",
+    "electron-log": "^4.1.0",
     "electron-updater": "^4.2.5",
     "iohook": "^0.6.5",
     "localforage": "^1.7.3",

src/app/layout/page/overlay/overlay.component.ts

@@ -4,7 +4,6 @@ import { DialogRefService } from '@app/service/dialog';
 import { ShortcutService } from '@app/service/input';
 import { FEATURE_MODULES } from '@app/token';
 import { AppUpdateState, FeatureModule, VisibleFlag } from '@app/type';
-import { ReleasesHttpService } from '@data/github';
 import { TranslateService } from '@ngx-translate/core';
 import { SnackBarService } from '@shared/module/material/service';
 import { ContextService } from '@shared/module/poe/service';
@@ -29,7 +28,6 @@ export class OverlayComponent implements OnInit, OnDestroy {
   constructor(
     @Inject(FEATURE_MODULES)
     private readonly modules: FeatureModule[],
-    private readonly releasesHttpService: ReleasesHttpService,
     private readonly userSettingsService: UserSettingsService,
     private readonly context: ContextService,
     private readonly app: AppService,
@@ -49,29 +47,13 @@ export class OverlayComponent implements OnInit, OnDestroy {
   }
 
   public ngOnInit(): void {
-    this.checkVersion();
     this.initSettings();
   }
 
   public ngOnDestroy(): void {
     this.reset();
   }
 
-  // deprecated. will be removed with 0.6.1 - if the auto update works.
-  private checkVersion(): void {
-    this.version = this.app.version();
-
-    this.releasesHttpService.getLatestRelease().subscribe(release => {
-      if (release && release.tag_name.replace('v', '') !== this.version && release.assets && release.assets[0].browser_download_url) {
-        if (confirm(
-          `A new version: '${release.tag_name}' is available. Go to download Page?\n` +
-          `*** Deprecated. will be removed with 0.6.1`)) {
-          this.browser.open(release.html_url);
-        }
-      }
-    });
-  }
-
   private initSettings(): void {
     this.userSettingsService.init(this.modules).subscribe(settings => {
       this.translate.use(`${settings.language}`);