General Settings
+ <% if (updateReady && !canAutoUpdate) { %>
+
Update
+
+
+
+
+ <% } else if (updateManual) { %>
+
Update
+
New version has been released. It will check for updates and install them automatically
+ but auto-upgrading from your version is impossible.
+
+
+
+ <% } %>
Appearance
@@ -13,6 +27,25 @@
/>
+ <% if (canAutoUpdate && !updateManual) { %>
+
Function
+
+
+ <% if (updateInProgress) { %>
+
+ <% } else { %>
+
+ <% } %>
+ <% if (updateReady) { %>
+
+ <% } %>
+
+ <% } %>
<% if (devTools) { %>
Advanced
Show dev tools
diff --git a/electron/app.js b/electron/app.js
new file mode 100644
index 00000000..38be4f8b
--- /dev/null
+++ b/electron/app.js
@@ -0,0 +1,104 @@
+'use strict';
+
+/* jshint node:true */
+/* jshint browser:false */
+
+var app = require('app'),
+ BrowserWindow = require('browser-window'),
+ path = require('path'),
+ Menu = require('menu');
+
+var mainWindow = null,
+ openFile = process.argv.filter(function(arg) { return /\.kdbx$/i.test(arg); })[0],
+ ready = false,
+ restartPending = false,
+ htmlPath = path.join(__dirname, 'index.html');
+
+process.argv.forEach(function(arg) {
+ if (arg.lastIndexOf('--htmlpath=', 0) === 0) {
+ htmlPath = path.resolve(arg.replace('--htmlpath=', ''), 'index.html');
+ }
+});
+
+app.on('window-all-closed', function() {
+ app.quit();
+});
+app.on('ready', function() {
+ mainWindow = new BrowserWindow({
+ show: false,
+ width: 1000, height: 700, 'min-width': 600, 'min-height': 300,
+ icon: path.join(__dirname, 'icon.png')
+ });
+ setMenu();
+ mainWindow.loadUrl('file://' + htmlPath);
+ mainWindow.webContents.on('dom-ready', function() {
+ setTimeout(function() {
+ mainWindow.show();
+ ready = true;
+ notifyOpenFile();
+ }, 50);
+ });
+ mainWindow.on('closed', function() {
+ mainWindow = null;
+ });
+});
+app.on('open-file', function(e, path) {
+ e.preventDefault();
+ openFile = path;
+ notifyOpenFile();
+});
+app.on('quit', function() {
+ if (restartPending) {
+ require('child_process').exec(process.execPath);
+ }
+});
+app.quitAndRestart = function() {
+ restartPending = true;
+ app.quit();
+ setTimeout(function() { restartPending = false; }, 1000);
+};
+
+function setMenu() {
+ if (process.platform === 'darwin') {
+ var name = require('app').getName();
+ var template = [
+ {
+ label: name,
+ submenu: [
+ { label: 'About ' + name, role: 'about' },
+ { type: 'separator' },
+ { label: 'Services', role: 'services', submenu: [] },
+ { type: 'separator' },
+ { label: 'Hide ' + name, accelerator: 'Command+H', role: 'hide' },
+ { label: 'Hide Others', accelerator: 'Command+Shift+H', role: 'hideothers' },
+ { label: 'Show All', role: 'unhide' },
+ { type: 'separator' },
+ { label: 'Quit', accelerator: 'Command+Q', click: function() { app.quit(); } }
+ ]
+ },
+ {
+ label: 'Edit',
+ submenu: [
+ { label: 'Undo', accelerator: 'CmdOrCtrl+Z', role: 'undo' },
+ { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', role: 'redo' },
+ { type: 'separator' },
+ { label: 'Cut', accelerator: 'CmdOrCtrl+X', role: 'cut' },
+ { label: 'Copy', accelerator: 'CmdOrCtrl+C', role: 'copy' },
+ { label: 'Paste', accelerator: 'CmdOrCtrl+V', role: 'paste' },
+ { label: 'Select All', accelerator: 'CmdOrCtrl+A', role: 'selectall' }
+ ]
+ }
+ ];
+ var menu = Menu.buildFromTemplate(template);
+ Menu.setApplicationMenu(menu);
+ }
+}
+
+function notifyOpenFile() {
+ if (ready && openFile && mainWindow) {
+ openFile = openFile.replace(/"/g, '\\"').replace(/\\/g, '\\\\');
+ mainWindow.webContents.executeJavaScript('if (window.launcherOpen) { window.launcherOpen("' + openFile + '"); } ' +
+ ' else { window.launcherOpenedFile="' + openFile + '"; }');
+ openFile = null;
+ }
+}
diff --git a/electron/main.js b/electron/main.js
index c5151a1c..84015d2d 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -1,87 +1,43 @@
+// KeeWeb launcher script
+
+// This script is distributed with the app and is its entry point
+// It checks whether the app is available in userData folder and if its version is higher than local, launches it
+// This script is the only part which will be updated only with the app itself, auto-update will not change it
+
+// (C) Antelle 2015, MIT license https://github.com/antelle/keeweb
+
'use strict';
/* jshint node:true */
/* jshint browser:false */
var app = require('app'),
- BrowserWindow = require('browser-window'),
path = require('path'),
- fs = require('fs'),
- Menu = require('menu');
+ fs = require('fs');
-var mainWindow = null,
- openFile = process.argv.filter(function(arg) { return /\.kdbx$/i.test(arg); })[0],
- ready = false;
+var userDataDir = app.getPath('userData'),
+ appPathUserData = path.join(userDataDir, 'app.js'),
+ appPath = path.join(__dirname, 'app.js');
-app.on('window-all-closed', function() { app.quit(); });
-app.on('ready', function() {
- var htmlPath = path.join(app.getPath('userData'), 'index.html');
-
- mainWindow = new BrowserWindow({
- show: false,
- width: 1000, height: 700, 'min-width': 600, 'min-height': 300,
- icon: path.join(__dirname, 'icon.png')
- });
- setMenu();
- if (fs.existsSync(htmlPath)) {
- mainWindow.loadUrl('file://' + htmlPath);
- } else {
- mainWindow.loadUrl('https://antelle.github.io/keeweb/index.html');
- }
- mainWindow.webContents.on('dom-ready', function() {
- mainWindow.show();
- ready = true;
- notifyOpenFile();
- });
- mainWindow.on('closed', function() { mainWindow = null; });
-});
-app.on('open-file', function(e, path) {
- e.preventDefault();
- openFile = path;
- notifyOpenFile();
-});
-
-function setMenu() {
- if (process.platform === 'darwin') {
- var name = require('app').getName();
- var template = [
- {
- label: name,
- submenu: [
- { label: 'About ' + name, role: 'about' },
- { type: 'separator' },
- { label: 'Services', role: 'services', submenu: [] },
- { type: 'separator' },
- { label: 'Hide ' + name, accelerator: 'Command+H', role: 'hide' },
- { label: 'Hide Others', accelerator: 'Command+Shift+H', role: 'hideothers' },
- { label: 'Show All', role: 'unhide' },
- { type: 'separator' },
- { label: 'Quit', accelerator: 'Command+Q', click: function() { app.quit(); } }
- ]
- },
- {
- label: 'Edit',
- submenu: [
- { label: 'Undo', accelerator: 'CmdOrCtrl+Z', role: 'undo' },
- { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', role: 'redo' },
- { type: 'separator' },
- { label: 'Cut', accelerator: 'CmdOrCtrl+X', role: 'cut' },
- { label: 'Copy', accelerator: 'CmdOrCtrl+C', role: 'copy' },
- { label: 'Paste', accelerator: 'CmdOrCtrl+V', role: 'paste' },
- { label: 'Select All', accelerator: 'CmdOrCtrl+A', role: 'selectall' }
- ]
+if (fs.existsSync(appPathUserData)) {
+ var versionLocal = require('./package.json').version;
+ try {
+ var versionUserData = require(path.join(userDataDir, 'package.json')).version;
+ versionLocal = versionLocal.split('.');
+ versionUserData = versionUserData.split('.');
+ for (var i = 0; i < versionLocal.length; i++) {
+ if (+versionUserData[i] > +versionLocal[i]) {
+ appPath = appPathUserData;
+ break;
}
- ];
- var menu = Menu.buildFromTemplate(template);
- Menu.setApplicationMenu(menu);
+ if (+versionUserData[i] < +versionLocal[i]) {
+ break;
+ }
+ }
+ }
+ catch (e) {
+ console.error('Error reading user file version', e);
}
}
-function notifyOpenFile() {
- if (ready && openFile && mainWindow) {
- openFile = openFile.replace(/"/g, '\\"').replace(/\\/g, '\\\\');
- mainWindow.webContents.executeJavaScript('if (window.launcherOpen) { window.launcherOpen("' + openFile + '"); } ' +
- ' else { window.launcherOpenedFile="' + openFile + '"; }');
- openFile = null;
- }
-}
+require(appPath);
diff --git a/electron/package.json b/electron/package.json
index 32c4c597..e5e7b1e9 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,5 +1,13 @@
{
"name": "KeeWeb",
"version": "0.2.1",
- "main": "main.js"
+ "description": "KeePass web app",
+ "main": "main.js",
+ "repository": "https://github.com/antelle/keeweb",
+ "author": "Antelle",
+ "license": "MIT",
+ "readme": "../README.md",
+ "dependencies": {
+ "node-stream-zip": "^1.2.1"
+ }
}
diff --git a/grunt/tasks/grunt-validate-desktop-update.js b/grunt/tasks/grunt-validate-desktop-update.js
new file mode 100644
index 00000000..17246313
--- /dev/null
+++ b/grunt/tasks/grunt-validate-desktop-update.js
@@ -0,0 +1,31 @@
+'use strict';
+
+module.exports = function (grunt) {
+ grunt.registerMultiTask('validate-desktop-update', 'Validates desktop update package', function () {
+ var path = require('path');
+ var done = this.async();
+ var StreamZip = require(path.resolve(__dirname, '../../electron/node_modules/node-stream-zip'));
+ var zip = new StreamZip({ file: this.options().file, storeEntries: true });
+ var expFiles = this.options().expected;
+ zip.on('error', function(err) {
+ grunt.warn(err);
+ });
+ zip.on('ready', function() {
+ var valid = true;
+ expFiles.forEach(function(entry) {
+ try {
+ if (!zip.entryDataSync(entry)) {
+ grunt.warn('Corrupted entry in desktop update archive: ' + entry);
+ valid = false;
+ }
+ } catch (e) {
+ grunt.warn('Entry not found in desktop update archive: ' + entry);
+ valid = false;
+ }
+ });
+ if (valid) {
+ done();
+ }
+ });
+ });
+};
diff --git a/package.json b/package.json
index 8fd3fcef..0b9b8bf7 100644
--- a/package.json
+++ b/package.json
@@ -32,12 +32,14 @@
"time-grunt": "^1.2.1",
"uglify-loader": "^1.2.0",
"webpack": "^1.11.0",
- "webpack-dev-server": "^1.10.1"
+ "webpack-dev-server": "^1.12.1"
},
"scripts": {
"start": "grunt",
- "test": "grunt test"
+ "test": "grunt test",
+ "postinstall": "npm install --prefix electron"
},
"author": "Antelle",
- "license": "MIT"
+ "license": "MIT",
+ "readme": "README.md"
}