Merge branch 'development' of https://github.com/whitewhidow/quest-si…

…denoder into main
whitewhidow · Dec 10, 2020 · 2a84ff1 · 2a84ff1
2 parents 0cca28b + 4ef600c
commit 2a84ff1
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/main.js b/main.js
@@ -18,6 +18,20 @@ global.installedApps = []
 const pkg = require('./package.json');
 global.version = pkg.version
 
+async function checkVersion() {
+    var fetch = require('node-fetch')
+    var compareVersions = require('compare-versions');
+    content = await fetch("https://api.github.com/repos/whitewhidow/quest-sidenoder/releases/latest")
+    remoteversion = JSON.parse(await content.text()).name;
+    console.log("Current version: "+pkg.version);
+    console.log("Github version: "+remoteversion);
+    if (compareVersions.compare(remoteversion, pkg.version, '=')) {
+        console.log("Using latest version");
+    } else {
+        console.log("requires update");
+        win.webContents.send('notify_update',{success:true, current: pkg.version, remote: remoteversion});
+    }
+}
 
 
 // if (pkg.version !== latestVersion) {
@@ -192,6 +206,7 @@ function createWindow () {
 
     //tools.checkUpdateAvailable()
 
+    setTimeout(function(){ checkVersion(); }, 2000);
     //
 
 }

diff --git a/package.json b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "sidenoder",
-  "version": "0.0.5-alpha",
+  "version": "0.0.6-alpha",
   "description": "SideNoder",
   "main": "main.js",
   "dependencies": {
     "adbkit": "^2.11.1",
     "command-exists": "^1.2.9",
+    "compare-versions": "^3.6.0",
     "electron-squirrel-startup": "^1.0.0",
     "electron-twig": "^1.1.1",
     "fix-path": "^3.0.0",

diff --git a/views/layout.twig b/views/layout.twig
@@ -29,6 +29,12 @@
   <script>
     const { ipcRenderer } = require('electron')
 
+    ipcRenderer.on('notify_update', (event, arg) => {
+      console.log("notify_update msg came ! ");
+      $('#updateModal').modal('show');
+      $("#updateModal > div > div > div.modal-body").html(`<b>sidenoder-${arg.remote}<b> is now available on github.<br><br>Please visit https://github.com/whitewhidow/quest-sidenoder/releases`)
+    });
+
     ipcRenderer.on('ask_sideload', (event, arg) => {
       console.log("ask_sideload msg came ! ");
       console.log(arg)
@@ -388,6 +394,26 @@
 </div>
 
 
+<div class="modal fade" id="updateModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"  data-backdrop="static" data-keyboard="false">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel"><i class="fa fa-upload" aria-hidden="true"></i>  Update available</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        An update is available on github.
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">I Understand</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+
 
 
 <!--