From a30652151bf8ce907130a04c1e2db5646bc04988 Mon Sep 17 00:00:00 2001
From: Ilya Zelenko <iliyazelenkog@gmail.com>
Date: Wed, 12 Sep 2018 14:27:35 +0300
Subject: [PATCH] updater

---
 .gitignore                |  2 +-
 package.json              |  2 +-
 src/layouts/Main.vue      | 66 +++++++++++++++++++++++++++++++++++++--
 src/tools/Updater.js      | 55 ++++++++++++++++++++++++++------
 src/tools/events/ready.js |  3 +-
 src/views/Home.vue        |  2 +-
 6 files changed, 114 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5723861..71dc8e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,4 @@ yarn-error.log*
 
 #Electron-builder output
 /dist_electron
-
+electron-builder.env
diff --git a/package.json b/package.json
index 8f94c58..96a2c28 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-electron-images-uploader",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/src/layouts/Main.vue b/src/layouts/Main.vue
index 3396530..911b80b 100644
--- a/src/layouts/Main.vue
+++ b/src/layouts/Main.vue
@@ -3,6 +3,13 @@
     <!--<v-navigation-drawer app />-->
     <!--<v-toolbar app />-->
     <v-content>
+      <v-alert
+        :value="updateStatus"
+        :type="alertType"
+      >
+        {{ alertText }}
+      </v-alert>
+
       <v-container fluid>
         <div id="nav">
           <router-link to="/">
@@ -21,6 +28,10 @@
     </v-content>
     <v-footer>
       <span class="ml-3">Author: Ilya Zelenko</span>
+      <v-spacer/>
+
+      {{ releaseName ? `Realease: ${releaseName} (${releaseAt})` : '' }}
+
     </v-footer>
   </v-app>
 </template>
@@ -37,10 +48,59 @@
 
 <script>
 export default {
+  data: () => ({
+    updateStatus: null,
+    alertType: null,
+    alertText: null,
+    releaseName: null,
+    releaseDate: null
+  }),
+  computed: {
+    releaseAt () {
+      return new Date(this.releaseDate).toLocaleDateString()
+    }
+  },
   created () {
-    console.log(123)
-    this.$electron.ipcRenderer.on('updater-message', (event, message) => {
-      console.log(event, message)
+    // this.$electron.remote.dialog.showMessageBox({
+    //   type: 'question',
+    //   buttons: ['Install and Relaunch', 'Later'],
+    //   defaultId: 0,
+    //   message: 'A new version of has been downloaded',
+    //   detail: 'Привте'
+    // }, response => {
+    //   console.log(response)
+    // })
+
+    // this.$electron.remote.dialog.showOpenDialog(
+    //   this.$electron.remote.getCurrentWindow(),
+    //   {
+    //     defaultPath: 'c:/',
+    //     filters: [
+    //       { name: 'All Files', extensions: ['*'] },
+    //       { name: 'Images', extensions: ['jpg13232', 'png', 'gif'] },
+    //       { name: 'Movies', extensions: ['mkv', 'avi', 'mp4'] }
+    //     ],
+    //     properties: ['openFile']
+    //   }
+    // )
+
+    const alerts = {
+      notAvailable: { type: 'info', msg: 'Update not available.' },
+      available: { type: 'success', msg: 'Update available.' }
+    }
+    this.$electron.ipcRenderer.on('updater-message', (event, { status, info }) => {
+      const { type: alertType, msg: alertText } = alerts[status]
+
+      this.alertType = alertType
+      this.alertText = alertText
+      this.updateStatus = status
+
+      if (status === 'notAvailable') {
+        this.releaseName = info.releaseName
+        this.releaseDate = info.releaseDate
+      }
+
+      console.log(status, info)
     })
   }
 }
diff --git a/src/tools/Updater.js b/src/tools/Updater.js
index 5961d94..2dd11ca 100644
--- a/src/tools/Updater.js
+++ b/src/tools/Updater.js
@@ -1,3 +1,4 @@
+import { app, dialog } from 'electron'
 import { autoUpdater } from 'electron-updater'
 import log from 'electron-log'
 import * as path from 'path'
@@ -8,8 +9,7 @@ export default function (globalWindow) {
   window = globalWindow
 
   // if (isDev) {
-  console.log(path.join(__dirname, '../', 'app-update.yml'))
-  autoUpdater.updateConfigPath = path.join(__dirname, '../', 'app-update.yml')
+  autoUpdater.updateConfigPath = path.join(__dirname, '../app-update.yml')
   // }
 
   autoUpdater.logger = log
@@ -17,22 +17,59 @@ export default function (globalWindow) {
   log.info('App starting...')
 
   autoUpdater.on('checking-for-update', () => {
-    sendStatusToWindow('Checking for update...')
+    // sendStatusToWindow('Checking for update...')
   })
   autoUpdater.on('update-available', (info) => {
-    sendStatusToWindow('Update available.')
+    sendStatusToWindow('available', info)
   })
   autoUpdater.on('update-not-available', (info) => {
-    sendStatusToWindow('Update not available.')
+    // console.log(info)
+    sendStatusToWindow('notAvailable', info)
   })
   autoUpdater.on('error', (err) => {
-    sendStatusToWindow('Error in auto-updater: ' + err)
+    dialog.showErrorBox('Error: ', err === null ? 'unknown' : (err.stack || err).toString())
+    // sendStatusToWindow('error', err)
   })
 
-  function sendStatusToWindow (msg) {
-    console.log(msg)
-    window.webContents.send('updater-message', msg)
+  function sendStatusToWindow (status, info = null) {
+    window.webContents.send('updater-message', { status, info })
   }
 
   autoUpdater.checkForUpdates() // checkForUpdatesAndNotify()
 }
+
+autoUpdater.on('update-available', () => {
+  dialog.showMessageBox({
+    type: 'info',
+    title: 'Found Updates',
+    message: 'Found updates, do you want update now?',
+    buttons: ['Sure', 'No']
+  }, (buttonIndex) => {
+    if (buttonIndex === 0) {
+      autoUpdater.downloadUpdate()
+    }
+  })
+})
+
+autoUpdater.on('update-downloaded', (event, releaseNotes, releaseName) => {
+  let message = app.getName() + ' ' + releaseName + ' is now available. It will be installed the next time you restart the application.'
+  if (releaseNotes) {
+    const splitNotes = releaseNotes.split(/[^\r]\n/)
+    message += '\n\nRelease notes:\n'
+    splitNotes.forEach(notes => {
+      message += notes + '\n\n'
+    })
+  }
+  // Ask user to update the app
+  dialog.showMessageBox({
+    type: 'question',
+    buttons: ['Install and Relaunch', 'Later'],
+    defaultId: 0,
+    message: 'A new version of ' + app.getName() + ' has been downloaded',
+    detail: message
+  }, response => {
+    if (response === 0) {
+      setTimeout(() => autoUpdater.quitAndInstall(), 1)
+    }
+  })
+})
diff --git a/src/tools/events/ready.js b/src/tools/events/ready.js
index 7a2dfaa..56b44a9 100644
--- a/src/tools/events/ready.js
+++ b/src/tools/events/ready.js
@@ -37,7 +37,8 @@ function shortcut () {
   //   // window.webContents.send('ping', 'whoooooooh1!')
   // })
 
-  globalShortcut.register('Alt+PrintScreen', () => {
+  // 'Alt+PrintScreen'
+  globalShortcut.register('CommandOrControl+Q', () => {
     trayWindow.webContents.send('print-screen')
     showTrayWindow()
   })
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 34cbad8..534c7b3 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <v-alert
-      type="info"
       :value="!images.length"
+      type="info"
     >
       Here you will see the downloaded pictures.
     </v-alert>