Merge pull request #355 from buttercup/fix-windows-data-loss

Update the way state is saved, fix menubar autohide

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buttercup",
-  "version": "0.21.2",
+  "version": "0.21.3",
   "productName": "Buttercup",
   "main": "./dist/app.js",
   "description": "Free and Open Source password vault",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "buttercup",
   "productName": "Buttercup",
-  "version": "0.21.2",
+  "version": "0.21.3",
   "description": "Free and Open Source password vault",
   "main": "app/dist/app.js",
   "scripts": {
@@ -148,7 +148,7 @@
     "electron-debug": "^1.1.0",
     "electron-devtools-installer": "^2.2.0",
     "electron-installer-dmg": "^0.1.2",
-    "electron-json-storage": "^3.0.6",
+    "electron-json-storage": "^3.2.0",
     "electron-log": "^2.2.6",
     "electron-rpc": "^2.0.1",
     "electron-store": "^1.2.0",

src/main/app.js

@@ -1,7 +1,7 @@
 import { app, ipcMain as ipc } from 'electron';
 import pify from 'pify';
 import log from 'electron-log';
-import { throttle } from 'lodash';
+import debounce from 'lodash/debounce';
 import jsonStorage from 'electron-json-storage';
 import configureStore from '../shared/store/configure-store';
 import { setupMenu } from './menu';
@@ -23,7 +23,7 @@ const windowManager = getWindowManager();
 
 let appIsReady = false;
 let initialFile = null;
-let isSaving = false;
+let isSavingWorkspace = false;
 
 // Crash reporter for alpha and beta releases
 // After we come out of beta, we should be rolling our own
@@ -101,8 +101,10 @@ app.on('ready', async () => {
 
   // Persist Store to Disk
   store.subscribe(
-    throttle(() => {
-      storage.set('state', store.getState());
+    debounce(async () => {
+      log.info('Start Saving state');
+      await storage.set('state', store.getState());
+      log.info('Finish Saving state');
     }, 100)
   );
 
@@ -142,21 +144,21 @@ app.on('activate', () => {
 // Prevent quitting if a file is being saved
 // to prevent data loss
 ipc.on('workspace-save-started', () => {
-  isSaving = true;
+  isSavingWorkspace = true;
 });
 
 ipc.on('workspace-save-finished', () => {
-  isSaving = false;
+  isSavingWorkspace = false;
 });
 
 app.on('before-quit', e => {
   const mainWindow = getMainWindow();
   mainWindow.webContents.send('will-quit');
 
-  if (isSaving === true) {
+  if (isSavingWorkspace === true) {
     e.preventDefault();
     ipc.once('workspace-save-finished', () => {
-      isSaving = false;
+      isSavingWorkspace = false;
       app.quit();
     });
   }

src/main/menu.js

@@ -196,7 +196,7 @@ export function setupMenu(store) {
                 store.dispatch(setSetting('condencedSidebar', condenced));
               }
             },
-            ...(isOSX()
+            ...(!isOSX()
               ? [
                   {
                     label: 'Auto-hide Menubar',