Merge branch 'dev'

Author: aaronjanse

src/index.js

@@ -1,9 +1,41 @@
 'use strict';
 const electron = require('electron');
+const { app, BrowserWindow, Menu, protocol, ipcMain, dialog } = require('electron');
 
-var fs = require('fs');
+const log = require('electron-log');
+const { autoUpdater } = require("electron-updater");
+
+autoUpdater.logger = log;
+autoUpdater.logger.transports.file.level = 'info';
+log.info('App starting...');
 
-const app = electron.app;
+function sendStatusToWindow(text) {
+	log.info(text);
+	mainWindow.webContents.send('message', text);
+}
+autoUpdater.on('checking-for-update', () => {
+	sendStatusToWindow('Checking for update...');
+})
+autoUpdater.on('update-available', (info) => {
+	sendStatusToWindow('Update available.');
+})
+autoUpdater.on('update-not-available', (info) => {
+	sendStatusToWindow('Update not available.');
+})
+autoUpdater.on('error', (err) => {
+	sendStatusToWindow('Error in auto-updater. ' + err);
+})
+autoUpdater.on('download-progress', (progressObj) => {
+	let log_message = "Download speed: " + progressObj.bytesPerSecond;
+	log_message = log_message + ' - Downloaded ' + progressObj.percent + '%';
+	log_message = log_message + ' (' + progressObj.transferred + "/" + progressObj.total + ')';
+	sendStatusToWindow(log_message);
+})
+autoUpdater.on('update-downloaded', (info) => {
+	sendStatusToWindow('Update downloaded');
+});
+
+var fs = require('fs');
 
 // adds debug features like hotkeys for triggering dev tools and reload
 require('electron-debug')();
@@ -43,20 +75,67 @@ app.on('activate', () => {
 
 app.on('ready', () => {
 	mainWindow = createMainWindow();
+	autoUpdater.checkForUpdatesAndNotify();
 });
 
-let ipc = require('electron').ipcMain;
+const ipc = require('electron').ipcMain;
+const path = require('path');
+
+const data_file_path = path.join(app.getPath('userData'), 'snippets.json');
 
 ipc.on('get_snippets', (event, arg) => {
-	fs.readFile('snippets.json', 'utf8', function(err, data) {
+	fs.readFile(data_file_path, 'utf8', function (err, data) {
 		if (err) {
-			return console.error();(err);
+			// try to recover existing snippet data from old version
+			fs.readFile('snippets.json', 'utf8', function (err_, data_) {
+				if (err_) {
+					// ask the user to manually select the old snippets.json
+					let is_new_user = dialog.showMessageBox(mainWindow, {
+						'type': 'question',
+						'buttons': ['Yes', 'No'],
+						'title': 'Have you created any snippets?',
+						'message': 'Have you created any snippets yet?\n\nIf so, they need to be migrated to the new storage location.'
+					})
+					if (is_new_user == 1) {
+						event.returnValue = null;
+						return;
+					}
+					dialog.showMessageBox(mainWindow, {
+						'type': 'info',
+						'message': 'You will be prompted to choose a file named snippets.json using the file chooser.\n\nLook in the repo\'s src/ directory.'
+					})
+					let old_snippets_path = dialog.showOpenDialog(mainWindow, {
+						'type': 'warning',
+						'title': 'Choose the snippets.json file from the local repo\'s src/ directory',
+						'message': 'Choose the snippets.json file from the local repo\'s src/ directory',
+						'filters': [
+							{
+								'name': 'JSON',
+								'extensions': ['json']
+							}
+						]
+					})[0]
+					fs.readFile(old_snippets_path, 'utf8', function (err, data) {
+						if (err) {
+							event.returnValue = null;
+							return console.error(); (err);
+						} else {
+							fs.writeFile(data_file_path, data, 'utf8', function () { });
+							event.returnValue = data;
+						}
+					})
+				} else {
+					fs.writeFile(data_file_path, data_, 'utf8', function () { });
+					event.returnValue = data_;
+				}
+			});
+		} else {
+			event.returnValue = data;
 		}
-    event.returnValue = data;
 	});
 });
 
 ipc.on('save_snippets', (event, snippets) => {
-	fs.writeFile('snippets.json', snippets, 'utf8', function(){});
+	fs.writeFile(data_file_path, snippets, 'utf8', function () { });
 	event.returnValue = 1; // Required for sendSync or it hangs forever! You can send back anything here.
 });

src/main.js

@@ -78,7 +78,7 @@ const app = new Moon({
 	hooks: {
 		init: function() {
 			this.callMethod('update_search_index')
-			this.set('snippets', JSON.parse(ipc.sendSync('get_snippets')))
+			this.set('snippets', JSON.parse(ipc.sendSync('get_snippets')) || this.get('snippets'))
 		},
 		mounted: function() {
 			$('#search').val('')